Skip to content

Commit

Permalink
python3 is now python37 instead of python36
Browse files Browse the repository at this point in the history
With Python 3.7 now at 3.7.1, and Python 3.6 at it's final maintenance
mode release, it is time to move on to 3.7 as the default interpreter.
  • Loading branch information
FRidh committed Oct 21, 2018
1 parent c1272a9 commit a47479e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions doc/languages-frameworks/python.section.md
Expand Up @@ -484,9 +484,9 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters

Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
respectively `python27`, `python34`, `python35`, `python36` and `python37`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
`python35`. The default interpreter, `python`, maps to `python2`.
`python37`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
`pkgs/development/interpreters/python`.

Expand Down Expand Up @@ -538,7 +538,7 @@ sets are
and the aliases

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

#### `buildPythonPackage` function
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-1903.xml
Expand Up @@ -19,6 +19,8 @@

<itemizedlist>
<listitem>
<para>
The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
<para />
</listitem>
</itemizedlist>
Expand Down
8 changes: 4 additions & 4 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -7743,7 +7743,7 @@ with pkgs;
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
python = python2;
python2 = python27;
python3 = python36;
python3 = python37;
pypy = pypy27;

# Python interpreter that is build with all modules, including tkinter.
Expand Down Expand Up @@ -7793,8 +7793,8 @@ with pkgs;
python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
python34Packages = python34.pkgs;
python35Packages = python35.pkgs;
python36Packages = recurseIntoAttrs python36.pkgs;
python37Packages = python37.pkgs;
python36Packages = python36.pkgs;
python37Packages = recurseIntoAttrs python37.pkgs;
pypyPackages = pypy.pkgs;

# Should eventually be moved inside Python interpreters.
Expand Down Expand Up @@ -18593,7 +18593,7 @@ with pkgs;
rclone = callPackage ../applications/networking/sync/rclone { };

rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };

rcs = callPackage ../applications/version-management/rcs { };

rdesktop = callPackage ../applications/networking/remote/rdesktop { };
Expand Down

0 comments on commit a47479e

Please sign in to comment.