summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-06-04 18:03:57 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-06-04 18:08:29 +0200
commitb7ff7465401257e9b0814bb68937a494c58de538 (patch)
treec3cceedc4627f2524ffe199ca951293d39cb5b74
parent7d5751412795e3a58cad82ac945eaa30377df746 (diff)
downloadnixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.tar
nixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.tar.gz
nixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.tar.bz2
nixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.tar.lz
nixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.tar.xz
nixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.tar.zst
nixpkgs-b7ff7465401257e9b0814bb68937a494c58de538.zip
python3: now points to python38
Note this also means python3Minimal is now also Python 3.8.

This reverts commit eb1369670b5a4e616ff0cf4100616479b1fa3064 and adds more.
-rw-r--r--doc/languages-frameworks/python.section.md2
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml5
-rw-r--r--pkgs/development/interpreters/python/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 8 insertions, 3 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 838426afa04..7da839ee482 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -643,7 +643,7 @@ and in this case the `python38` interpreter is automatically used.
 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
 aliases `python2` and `python3` correspond to respectively `python27` and
-`python37`. The default interpreter, `python`, maps to `python2`. The PyPy
+`python38`. The default interpreter, `python`, maps to `python2`. The PyPy
 interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
 `pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`.
 The Nix expressions for the interpreters can be found in
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 9ac5a347de8..428aeec2341 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -44,6 +44,11 @@
    </listitem>
    <listitem>
     <para>
+     Python 3 now defaults to Python 3.8 instead of 3.7.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
      Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
      and <link linkend="opt-services.openssh.authorizedKeysCommandUser">authorizedKeysCommandUser</link>, have
      been added to the <literal>openssh</literal> module. If you have <literal>AuthorizedKeysCommand</literal>
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index a3ba72a27b2..6da7abc876e 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -129,7 +129,7 @@ in {
   };
 
   # Minimal versions of Python (built without optional dependencies)
-  python3Minimal = (python37.override {
+  python3Minimal = (python3.override {
     self = python3Minimal;
     pythonForBuild = pkgs.buildPackages.python3Minimal;
     # strip down that python version as much as possible
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662feb6d396..f017003a93a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9646,7 +9646,7 @@ in
   # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
   python = python2;
   python2 = python27;
-  python3 = python37;
+  python3 = python38;
   pypy = pypy2;
   pypy2 = pypy27;
   pypy3 = pypy36;