diff options
author | Alexandre Macabies <web+oss@zopieux.com> | 2023-11-25 13:38:39 +0100 |
---|---|---|
committer | Alexandre Macabies <web+oss@zopieux.com> | 2023-11-25 13:38:39 +0100 |
commit | fc235bb0fcb324cbce510f4cf1e1e51a6615a195 (patch) | |
tree | e9a602c8a3d129432834800e8a5e02708e78c46e /pkgs/development/interpreters/python | |
parent | 55103bf2a827e34e82ca105864a2cf52ac29b0a4 (diff) | |
download | nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.tar nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.tar.gz nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.tar.bz2 nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.tar.lz nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.tar.xz nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.tar.zst nixlib-fc235bb0fcb324cbce510f4cf1e1e51a6615a195.zip |
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 <delroth@gmail.com>
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/hooks/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |