diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-12-12 14:13:07 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-12-12 14:13:07 +0100 |
commit | e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986 (patch) | |
tree | 55dc535219143a2baacdd71941ee17d0917da93b /pkgs/development/interpreters/python | |
parent | 14b1b887952e70c12c6b8fc4ee9c1e22ec32faa6 (diff) | |
parent | 2525630f4bf6285a6031ad6785da6a3f8e323dd7 (diff) | |
download | nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.tar nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.tar.gz nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.tar.bz2 nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.tar.lz nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.tar.xz nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.tar.zst nixlib-e8dd1cf066d9e605f72e4ce2dd6c4bef1ac76986.zip |
Merge remote-tracking branch 'origin/staging-next' into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/python-packages-base.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index b5afaf34ce61..2126b796ca9d 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -47,9 +47,6 @@ let toPythonModule = x: x; # Application does not provide modules. })); - # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg lib self; - # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -92,13 +89,11 @@ let disabledIf = x: drv: if x then disabled drv else drv; in { - inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; - inherit buildSetupcfg; python = toPythonModule python; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions |