From fc235bb0fcb324cbce510f4cf1e1e51a6615a195 Mon Sep 17 00:00:00 2001 From: Alexandre Macabies Date: Sat, 25 Nov 2023 13:38:39 +0100 Subject: [PATCH] python/hooks: use python.pythonVersion to support PyPy f292ef4 introduced a check for the Python version but uses `.version`, which isn't friendly to other Pythons like PyPy which use versions strings like 7.3, failing the >=3.10 check. Using `.pythonVersion` fixes this check. Co-authored-by: Pierre Bourdon --- pkgs/development/interpreters/python/hooks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 0a4600b9d6c3..35116b38f810 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -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