diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6d3c677397d2..cc35fbc5804e 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -257,9 +257,10 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "5"; + patch = "9"; }; - sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; + + sha256 = "sha256-ObCXKVb2VIzlgoAZ264SUDwy1svpGivs+I0+QsxSGXs="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.python27; @@ -268,25 +269,32 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy38 = callPackage ./pypy { - self = __splicedPackages.pypy38; + pypy39 = callPackage ./pypy { + self = __splicedPackages.pypy39; sourceVersion = { major = "7"; minor = "3"; - patch = "7"; + patch = "9"; }; - sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY="; - pythonVersion = "3.8"; + + sha256 = "sha256-Krqh6f4ewOIzyfvDd6DI6aBjQICo9PMOtomDAfZhjBI="; + pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.python27; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; }; - pypy37 = __splicedPackages.pypy38.override { + + pypy38 = __splicedPackages.pypy39.override { + self = __splicedPackages.pythonInterpreters.pypy38; + pythonVersion = "3.8"; + sha256 = "sha256-W12dklbxKhKa+DhOL1gb36s7wPu+OgpIDZwdLpVJDrE="; + }; + pypy37 = __splicedPackages.pypy39.override { self = __splicedPackages.pythonInterpreters.pypy37; pythonVersion = "3.7"; - sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc="; + sha256 = "sha256-cEJhY7GU7kYAmYbuptlCYJij/7VS2c29PfqmSkc3P0k="; }; pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { @@ -295,23 +303,24 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "8"; + patch = "9"; }; - sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64 + + sha256 = "sha256-FyqSiwCWp+ALfVj1I/VzAMNcPef4IkkeKnvIRTdcI/g="; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; - pypy38_prebuilt = callPackage ./pypy/prebuilt.nix { + pypy39_prebuilt = callPackage ./pypy/prebuilt.nix { # Not included at top-level self = __splicedPackages.pythonInterpreters.pypy38_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "7"; + patch = "9"; }; - sha256 = "sha256-Xe43x8PLixYAKPveOlkBxoBD36VFoWeUUCuJfUvEDX4="; # linux64 - pythonVersion = "3.8"; + sha256 = "sha256-RoGMs9dLlrNHh1SDQ9Jm4lYrUx3brzMDg7qTD/GTDtU="; # linux64 + pythonVersion = "3.9"; inherit passthruFun; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bbd7b64d18b..6cfebee28232 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15554,7 +15554,7 @@ with pkgs; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy38; + pypy3 = pypy39; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -15600,7 +15600,7 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 pypy37 rustpython; + inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; @@ -15617,6 +15617,7 @@ with pkgs; pypy3Packages = pypy3.pkgs; pypy37Packages = pypy37.pkgs; pypy38Packages = pypy38.pkgs; + pypy39Packages = pypy39.pkgs; py3c = callPackage ../development/libraries/py3c { };