diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 12:01:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-17 12:01:22 +0000 |
commit | 4ee4d805d29afac902a3c631ab13ad08fbe1e84d (patch) | |
tree | f1db5e5b43a05a76c50c83f52c266ac39c128beb /pkgs/top-level | |
parent | a57e9fc6c0ae4c349ff0e8c57e1bd56d958ac664 (diff) | |
parent | 1ae6c6e92104ae774c5d7fb763001ea3d470748e (diff) | |
download | nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.gz nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.bz2 nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.lz nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.xz nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.tar.zst nixpkgs-4ee4d805d29afac902a3c631ab13ad08fbe1e84d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2483dd0bcd7..721ff73356d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12577,7 +12577,7 @@ in python3 = python39; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy36; + pypy3 = pypy37; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -12633,7 +12633,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy37; # Python package sets. python27Packages = python27.pkgs; |