Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python35: remove #95305

Merged
merged 2 commits into from
Aug 15, 2020
Merged

python35: remove #95305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bec61
python35: remove
jonringer Aug 13, 2020
8c7d49b
docs: update python interpreter versions
jonringer Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions doc/languages-frameworks/python.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,8 @@ and in this case the `python38` interpreter is automatically used.

### Interpreters

Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
respectively `python27`, `python35`, `python36`, `python37` and `python38`. The
Versions 2.7, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
respectively `python27`, `python36`, `python37` and `python38`. The
aliases `python2` and `python3` correspond to respectively `python27` and
`python38`. The default interpreter, `python`, maps to `python2`. The PyPy
interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
Expand Down Expand Up @@ -689,15 +689,16 @@ attribute set is created for each available Python interpreter. The available
sets are

* `pkgs.python27Packages`
* `pkgs.python35Packages`
* `pkgs.python36Packages`
* `pkgs.python37Packages`
* `pkgs.python38Packages`
* `pkgs.python39Packages`
* `pkgs.pypyPackages`

and the aliases

* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python37Packages`
* `pkgs.python3Packages` pointing to `pkgs.python38Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`

#### `buildPythonPackage` function
Expand Down
13 changes: 0 additions & 13 deletions pkgs/development/interpreters/python/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,6 @@ in {
inherit passthruFun;
};

python35 = callPackage ./cpython {
self = python35;
sourceVersion = {
major = "3";
minor = "5";
patch = "9";
suffix = "";
};
sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2";
inherit (darwin) configd;
inherit passthruFun;
};

python36 = callPackage ./cpython {
self = python36;
sourceVersion = {
Expand Down
69 changes: 0 additions & 69 deletions pkgs/development/python-modules/ipython/7.9.nix
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9901,7 +9901,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;};
Expand All @@ -9913,11 +9912,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;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4411,8 +4411,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 { };

Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/static.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down