diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-03-13 15:31:22 +0100 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-07-05 12:34:02 -0700 |
commit | 94cd70bae26efc34350d53894992fbaf1b1f3c6f (patch) | |
tree | a9ad374a440122d5e15945c4c90530ed5647216b | |
parent | a28ba52cac42222d03de69308787fb767e64cfb8 (diff) | |
download | nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.tar nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.tar.gz nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.tar.bz2 nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.tar.lz nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.tar.xz nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.tar.zst nixpkgs-94cd70bae26efc34350d53894992fbaf1b1f3c6f.zip |
python3: 3.8 -> 3.9
-rw-r--r-- | doc/languages-frameworks/python.section.md | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 847a41cf23c..cd34fb38ce0 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -8,7 +8,7 @@ Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default -interpreter, which is currently CPython 3.8. The attribute `python` refers to +interpreter, which is currently CPython 3.9. The attribute `python` refers to CPython 2.7 for backwards-compatibility. It is also possible to refer to specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to the default PyPy interpreter. diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 507ad8d36cf..176f8db4bff 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -118,7 +118,7 @@ with pkgs; }; sources = { - "python38" = { + python38 = { sourceVersion = { major = "3"; minor = "8"; @@ -127,6 +127,15 @@ with pkgs; }; sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka"; }; + python39 = { + sourceVersion = { + major = "3"; + minor = "9"; + patch = "5"; + suffix = ""; + }; + sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc"; + }; }; in { @@ -176,18 +185,11 @@ in { inherit passthruFun; } // sources.python38); - python39 = callPackage ./cpython { + python39 = callPackage ./cpython ({ self = python39; - sourceVersion = { - major = "3"; - minor = "9"; - patch = "5"; - suffix = ""; - }; - sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc"; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python39); python310 = callPackage ./cpython { self = python310; @@ -224,7 +226,7 @@ in { includeSiteCustomize = false; enableOptimizations = false; mimetypesSupport = false; - } // sources.python38)).overrideAttrs(old: { + } // sources.python39)).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { maintainers = []; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c728c453b43..340a475cdb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12500,7 +12500,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python38; + python3 = python39; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy36; |