diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-07-07 14:05:05 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-07-28 17:10:15 +0200 |
commit | 1da6775775e3695ff206bdcd3fca945bf5331101 (patch) | |
tree | 9da34dc021261438f4bd6603ea0980a9bbb75c9f /pkgs/top-level | |
parent | 86393cfc205c4f8d474b928878b45b118f2c7b16 (diff) | |
download | nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.gz nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.bz2 nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.lz nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.xz nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.zst nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.zip |
Python: move interpreters
Move Python interpreters (CPython, PyPy) to same folder and share layout.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd5c55414629..b78dfb4bc265 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5879,31 +5879,34 @@ in python2Packages = python27Packages; python3Packages = python35Packages; - python26 = callPackage ../development/interpreters/python/2.6 { + python26 = callPackage ../development/interpreters/python/cpython/2.6 { db = db47; self = python26; }; - python27 = callPackage ../development/interpreters/python/2.7 { + python27 = callPackage ../development/interpreters/python/cpython/2.7 { self = python27; inherit (darwin) CF configd; }; - python33 = callPackage ../development/interpreters/python/3.3 { + python33 = callPackage ../development/interpreters/python/cpython/3.3 { self = python33; }; - python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { + python34 = hiPrio (callPackage ../development/interpreters/python/cpython/3.4 { inherit (darwin) CF configd; self = python34; }); - python35 = hiPrio (callPackage ../development/interpreters/python/3.5 { + python35 = hiPrio (callPackage ../development/interpreters/python/cpython/3.5 { inherit (darwin) CF configd; self = python35; }); - python36 = callPackage ../development/interpreters/python/3.6 { + python36 = callPackage ../development/interpreters/python/cpython/3.6 { inherit (darwin) CF configd; self = python36; }; - pypy = callPackage ../development/interpreters/pypy { - self = pypy; + + pypy = pypy27; + + pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { + self = pypy27; }; pythonFull = python2Full; @@ -5919,7 +5922,7 @@ in python2nix = callPackage ../tools/package-management/python2nix { }; - pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/docs {}); + pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; }; |