Merge pull request #95305 from jonringer/remove-py35

python35: remove
This commit is contained in:
Frederik Rietdijk
2020-08-15 09:08:47 +02:00
committed by GitHub
6 changed files with 6 additions and 92 deletions
+1 -3
View File
@@ -9896,7 +9896,6 @@ in
python2Full = python2.override{x11Support=true;};
python27Full = python27.override{x11Support=true;};
python3Full = python3.override{x11Support=true;};
python35Full = python35.override{x11Support=true;};
python36Full = python36.override{x11Support=true;};
python37Full = python37.override{x11Support=true;};
python38Full = python38.override{x11Support=true;};
@@ -9908,11 +9907,10 @@ in
python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python {};
inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
# Python package sets.
python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
python35Packages = python35.pkgs;
python36Packages = python36.pkgs;
python37Packages = recurseIntoAttrs python37.pkgs;
python38Packages = recurseIntoAttrs python38.pkgs;
-2
View File
@@ -4424,8 +4424,6 @@ in {
ipython = if isPy27 then
callPackage ../development/python-modules/ipython/5.nix { }
else if isPy35 then
callPackage ../development/python-modules/ipython/7.9.nix { }
else
callPackage ../development/python-modules/ipython { };
-1
View File
@@ -269,7 +269,6 @@ in {
) super.ocaml-ng;
python27 = super.python27.override { static = true; };
python35 = super.python35.override { static = true; };
python36 = super.python36.override { static = true; };
python37 = super.python37.override { static = true; };
python38 = super.python38.override { static = true; };