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

Merge pull request #269939 from NixOS/backport-269862-to-release-23.11 

[Backport release-23.11] python/hooks: use python.pythonVersion in catchConflicts to support other Pythons
parents 21af6ad5 998b1e6c

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