Merge pull request #269862 from zopieux/master

python/hooks: use python.pythonVersion in catchConflicts to support other Pythons
This commit is contained in:
Martin Weinelt 2023-11-25 17:37:39 +01:00 committed by GitHub
commit 71e21a7234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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