1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00

Python 3 is now an alias of 3.6 instead of 3.5

This commit is contained in:
Frederik Rietdijk 2017-04-18 14:58:58 +02:00
parent 9860e77f79
commit 66f7398e4a

View file

@ -6070,7 +6070,7 @@ with pkgs;
# available as `pythonPackages.tkinter` and can be used as any other Python package.
python = python2;
python2 = python27;
python3 = python35;
python3 = python36;
# Python interpreter that is build with all modules, including tkinter.
# These are for compatibility and should not be used inside Nixpkgs.
@ -6084,9 +6084,9 @@ with pkgs;
python36Full = python36.override{x11Support=true;};
# pythonPackages further below, but assigned here because they need to be in sync
pythonPackages = python2Packages;
python2Packages = python27Packages;
python3Packages = python35Packages;
pythonPackages = python.pkgs;
python2Packages = python2.pkgs;
python3Packages = python3.pkgs;
python27 = callPackage ../development/interpreters/python/cpython/2.7 {
self = python27;
@ -6096,14 +6096,14 @@ with pkgs;
self = python33;
inherit (darwin) CF configd;
};
python34 = hiPrio (callPackage ../development/interpreters/python/cpython/3.4 {
python34 = callPackage ../development/interpreters/python/cpython/3.4 {
inherit (darwin) CF configd;
self = python34;
});
python35 = hiPrio (callPackage ../development/interpreters/python/cpython/3.5 {
};
python35 = callPackage ../development/interpreters/python/cpython/3.5 {
inherit (darwin) CF configd;
self = python35;
});
};
python36 = callPackage ../development/interpreters/python/cpython/3.6 {
inherit (darwin) CF configd;
self = python36;
@ -10556,9 +10556,9 @@ with pkgs;
python34Packages = python34.pkgs;
python35Packages = recurseIntoAttrs python35.pkgs;
python35Packages = python35.pkgs;
python36Packages = python36.pkgs;
python36Packages = recurseIntoAttrs python36.pkgs;
pypyPackages = pypy.pkgs;