diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
| commit | 1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f (patch) | |
| tree | 313bc0caa017c3e41a961bf63c7b70aac8bc6334 /pkgs/development/interpreters/python | |
| parent | 525c54c7ef4ac6bc86e1a9f84cff72af43884d2a (diff) | |
| parent | ab0a828662c4c6a8535b630081a67c20286099ab (diff) | |
| download | nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.gz nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.bz2 nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.lz nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.xz nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.zst nixlib-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 15 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 09c324716bda..43d2d159e36a 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -17,6 +17,7 @@ # For the Python package set , packageOverrides ? (self: super: {}) , buildPackages +, pythonForBuild ? buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"} , sourceVersion , sha256 , passthruFun @@ -63,7 +64,7 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; + inherit pythonForBuild; pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f5f4dce68b42..3be722cd1561 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -46,7 +46,7 @@ with pkgs; inherit hasDistutilsCxxPatch pythonForBuild; }; -in { +in rec { python27 = callPackage ./cpython/2.7 { self = python27; @@ -127,18 +127,9 @@ in { }; # Minimal versions of Python (built without optional dependencies) - python3Minimal = (callPackage ./cpython { + python3Minimal = (python37.override { self = python3Minimal; - sourceVersion = { - major = "3"; - minor = "7"; - patch = "4"; - suffix = ""; - }; - sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv"; - inherit (darwin) CF configd; - inherit passthruFun; - + pythonForBuild = pkgs.buildPackages.python3Minimal; # strip down that python version as much as possible openssl = null; readline = null; |