Unverified Commit 71e21a72 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #269862 from zopieux/master 

python/hooks: use python.pythonVersion in catchConflicts to support other Pythons
parents b9ff1de1 fc235bb0

pkgs/development/interpreters/python/hooks/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ in { 
    makePythonHook {

      name = "python-catch-conflicts-hook";

      substitutions = let

        useLegacyHook = lib.versionOlder python.version "3.10";

        useLegacyHook = lib.versionOlder python.pythonVersion "3.10";

      in {

        inherit pythonInterpreter pythonSitePackages;

        catchConflicts = if useLegacyHook then