git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95305 from jonringer/remove-py35

python35: remove

commit49f4475307505514e7cc28b03b41ab928f508cb7 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateSat 15 Aug 2020, 09:08 (6 years ago) parenta0c7ccf8c7d49b
6 files changed+6−92
doc/languages-frameworks/python.section.md+5−4 pkgs/development/interpreters/python/default.nix−13 pkgs/development/python-modules/ipython/7.9.nix−69 pkgs/top-level/all-packages.nix+1−3 pkgs/top-level/python-packages.nix−2 pkgs/top-level/static.nix−1
doc/languages-frameworks/python.section.md+5−4
@@ -640,8 +640,8 @@ and in this case the `python38` interpreter is automatically used.
640640
641641### Interpreters
642642
643−Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
644−respectively `python27`, `python35`, `python36`, `python37` and `python38`. The
643+Versions 2.7, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
644+respectively `python27`, `python36`, `python37` and `python38`. The
645645aliases `python2` and `python3` correspond to respectively `python27` and
646646`python38`. The default interpreter, `python`, maps to `python2`. The PyPy
647647interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
@@ -689,15 +689,16 @@ attribute set is created for each available Python interpreter. The available
689689sets are
690690
691691* `pkgs.python27Packages`
692−* `pkgs.python35Packages`
693692* `pkgs.python36Packages`
694693* `pkgs.python37Packages`
694+* `pkgs.python38Packages`
695+* `pkgs.python39Packages`
695696* `pkgs.pypyPackages`
696697
697698and the aliases
698699
699700* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
700−* `pkgs.python3Packages` pointing to `pkgs.python37Packages`
701+* `pkgs.python3Packages` pointing to `pkgs.python38Packages`
701702* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
702703
703704#### `buildPythonPackage` function
pkgs/development/interpreters/python/default.nix−13
@@ -63,19 +63,6 @@ in {
6363 inherit passthruFun;
6464 };
6565
66− python35 = callPackage ./cpython {
67− self = python35;
68− sourceVersion = {
69− major = "3";
70− minor = "5";
71− patch = "9";
72− suffix = "";
73− };
74− sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2";
75− inherit (darwin) configd;
76− inherit passthruFun;
77− };
78−
7966 python36 = callPackage ./cpython {
8067 self = python36;
8168 sourceVersion = {
pkgs/development/python-modules/ipython/7.9.nixdeleted−69
@@ -1,69 +0,0 @@
1−{ lib
2−, stdenv
3−, buildPythonPackage
4−, fetchPypi
5−, pythonOlder
6−# Build dependencies
7−, glibcLocales
8−# Test dependencies
9−, nose
10−, pygments
11−# Runtime dependencies
12−, jedi
13−, decorator
14−, pickleshare
15−, traitlets
16−, prompt_toolkit
17−, pexpect
18−, appnope
19−, backcall
20−, fetchpatch
21−}:
22−
23−buildPythonPackage rec {
24− pname = "ipython";
25− version = "7.9.0";
26−
27− src = fetchPypi {
28− inherit pname version;
29− sha256 = "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz";
30− };
31−
32− prePatch = lib.optionalString stdenv.isDarwin ''
33− substituteInPlace setup.py --replace "'gnureadline'" " "
34− '';
35−
36− buildInputs = [ glibcLocales ];
37−
38− checkInputs = [ nose pygments ];
39−
40− propagatedBuildInputs = [
41− jedi
42− decorator
43− pickleshare
44− traitlets
45− prompt_toolkit
46− pygments
47− pexpect
48− backcall
49− ] ++ lib.optionals stdenv.isDarwin [appnope];
50−
51− LC_ALL="en_US.UTF-8";
52−
53− doCheck = false; # Circular dependency with ipykernel
54−
55− checkPhase = ''
56− nosetests
57− '';
58−
59− pythonImportsCheck = [
60− "IPython"
61− ];
62−
63− meta = with lib; {
64− description = "IPython: Productive Interactive Computing";
65− homepage = "http://ipython.org/";
66− license = licenses.bsd3;
67− maintainers = with maintainers; [ bjornfor ];
68− };
69−}
pkgs/top-level/all-packages.nix+1−3
@@ -9896,7 +9896,6 @@ in
98969896 python2Full = python2.override{x11Support=true;};
98979897 python27Full = python27.override{x11Support=true;};
98989898 python3Full = python3.override{x11Support=true;};
9899− python35Full = python35.override{x11Support=true;};
99009899 python36Full = python36.override{x11Support=true;};
99019900 python37Full = python37.override{x11Support=true;};
99029901 python38Full = python38.override{x11Support=true;};
@@ -9908,11 +9907,10 @@ in
99089907 python3Packages = python3.pkgs;
99099908
99109909 pythonInterpreters = callPackage ./../development/interpreters/python {};
9911− inherit (pythonInterpreters) python27 python35 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
9910+ inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
99129911
99139912 # Python package sets.
99149913 python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
9915− python35Packages = python35.pkgs;
99169914 python36Packages = python36.pkgs;
99179915 python37Packages = recurseIntoAttrs python37.pkgs;
99189916 python38Packages = recurseIntoAttrs python38.pkgs;
pkgs/top-level/python-packages.nix−2
@@ -4424,8 +4424,6 @@ in {
44244424
44254425 ipython = if isPy27 then
44264426 callPackage ../development/python-modules/ipython/5.nix { }
4427− else if isPy35 then
4428− callPackage ../development/python-modules/ipython/7.9.nix { }
44294427 else
44304428 callPackage ../development/python-modules/ipython { };
44314429
pkgs/top-level/static.nix−1
@@ -269,7 +269,6 @@ in {
269269 ) super.ocaml-ng;
270270
271271 python27 = super.python27.override { static = true; };
272− python35 = super.python35.override { static = true; };
273272 python36 = super.python36.override { static = true; };
274273 python37 = super.python37.override { static = true; };
275274 python38 = super.python38.override { static = true; };