diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-08-01 15:08:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-01 15:08:20 +0200 |
commit | c74ad2ee2363f0e59a531cc37a0642d28d735d19 (patch) | |
tree | 1313a91f8d6d0ef1c44060898288f5330c291916 /pkgs/top-level | |
parent | 52b787b0cd779f1f0da379127fa4e8db0b927551 (diff) | |
parent | 1da6775775e3695ff206bdcd3fca945bf5331101 (diff) | |
download | nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.gz nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.bz2 nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.lz nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.xz nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.zst nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.zip |
Merge pull request #17339 from FRidh/rename
Python: move interpreters
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 d72a5574fe82..9b0c9e6ce6b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5887,31 +5887,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; @@ -5927,7 +5930,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; }; |