From eec28b8cfd7923a876fb47af8a0459c1a550fd97 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sun, 5 Dec 2021 12:21:35 -0700 Subject: [PATCH] pypy3: 7.3.5 -> 7.3.7 (#147875) This adds support for Python 3.8. https://www.pypy.org/posts/2021/10/pypy-v737-release.html --- pkgs/development/interpreters/python/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 471320ee2c11..7937fe171a06 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -238,15 +238,15 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy37 = callPackage ./pypy { - self = pypy37; + pypy38 = callPackage ./pypy { + self = pypy38; sourceVersion = { major = "7"; minor = "3"; - patch = "5"; + patch = "7"; }; - sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI="; - pythonVersion = "3.7"; + sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY="; + pythonVersion = "3.8"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; inherit passthruFun; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c559034c9ef2..74ef1eb14072 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13501,7 +13501,7 @@ with pkgs; python3 = python39; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy37; + pypy3 = pypy38; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -13551,7 +13551,7 @@ with pkgs; python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python37 python38 python39 python310 python3Minimal pypy27 pypy37; + inherit (pythonInterpreters) python27 python37 python38 python39 python310 python3Minimal pypy27 pypy38; # Python package sets. python27Packages = python27.pkgs;