diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-15 14:44:01 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-18 12:57:18 +0100 |
commit | f292ef4958bf9e1de18c62a315ed09f95954473a (patch) | |
tree | fcade2ca62b6c844e846f09e7c54081e63d63c4d /pkgs/development/interpreters/python | |
parent | b3e8dae766a3db1f0845a598f71e1267292a470a (diff) | |
download | nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.tar nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.tar.gz nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.tar.bz2 nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.tar.lz nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.tar.xz nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.tar.zst nixlib-f292ef4958bf9e1de18c62a315ed09f95954473a.zip |
python/hooks: restore catchConflictHook for python<3.10
By restoring and diverting to the old version. Previously the newer language features and use of more modern stdlib imports broke the hook on Python<3.10.
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py | 30 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/hooks/default.nix | 11 |
2 files changed, 39 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py new file mode 100644 index 000000000000..bb82900c65a9 --- /dev/null +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py @@ -0,0 +1,30 @@ +import pkg_resources +import collections +import sys + +do_abort = False +packages = collections.defaultdict(list) + +for f in sys.path: + for req in pkg_resources.find_distributions(f): + if req not in packages[req.project_name]: + # some exceptions inside buildPythonPackage + if req.project_name in ['setuptools', 'pip', 'wheel']: + continue + packages[req.project_name].append(req) + + +for name, duplicates in packages.items(): + if len(duplicates) > 1: + do_abort = True + print("Found duplicated packages in closure for dependency '{}': ".format(name)) + for dup in duplicates: + print(" " + repr(dup)) + +if do_abort: + print("") + print( + 'Package duplicates found in closure, see above. Usually this ' + 'happens if two packages depend on different version ' + 'of the same dependency.') + sys.exit(1) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index f7cc10274ae3..0a4600b9d6c3 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -106,9 +106,16 @@ in { pythonCatchConflictsHook = callPackage ({ makePythonHook, setuptools }: makePythonHook { name = "python-catch-conflicts-hook"; - substitutions = { + substitutions = let + useLegacyHook = lib.versionOlder python.version "3.10"; + in { inherit pythonInterpreter pythonSitePackages; - catchConflicts=../catch_conflicts/catch_conflicts.py; + catchConflicts = if useLegacyHook then + ../catch_conflicts/catch_conflicts_py2.py + else + ../catch_conflicts/catch_conflicts.py; + } // lib.optionalAttrs useLegacyHook { + inherit setuptools; }; } ./python-catch-conflicts-hook.sh) {}; |