Commit a104720c authored by FliegendeWurst's avatar FliegendeWurst
Browse files

pypy310: 7.3.12 -> 7.3.17

parent 98f7e5a8
Loading
Loading
Loading
Loading
+15 −19
Original line number Diff line number Diff line
@@ -149,27 +149,21 @@ in {
    inherit passthruFun;
  };

  pypy39 = callPackage ./pypy {
    self = __splicedPackages.pypy39;
  pypy310 = callPackage ./pypy {
    self = __splicedPackages.pypy310;
    sourceVersion = {
      major = "7";
      minor = "3";
      patch = "12";
      patch = "17";
    };

    hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo=";
    pythonVersion = "3.9";
    hash = "sha256-atdLxXjpxtOoocUVAzEwWOPFjDXfhvdIVFPEvmqyS/c=";
    pythonVersion = "3.10";
    db = db.override { dbmSupport = !stdenv.hostPlatform.isDarwin; };
    python = __splicedPackages.pypy27;
    inherit passthruFun;
  };

  pypy310 = __splicedPackages.pypy39.override {
    self = __splicedPackages.pythonInterpreters.pypy310;
    pythonVersion = "3.10";
    hash = "sha256-huTk6sw2BGxhgvQwGHllN/4zpg4dKizGuOf5Gl3LPkI=";
  };

  pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
    # Not included at top-level
    self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
@@ -189,21 +183,23 @@ in {
    inherit passthruFun;
  };

  pypy39_prebuilt = callPackage ./pypy/prebuilt.nix {
  pypy39_prebuilt = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03

  pypy310_prebuilt = callPackage ./pypy/prebuilt.nix {
    # Not included at top-level
    self = __splicedPackages.pythonInterpreters.pypy39_prebuilt;
    self = __splicedPackages.pythonInterpreters.pypy310_prebuilt;
    sourceVersion = {
      major = "7";
      minor = "3";
      patch = "12";
      patch = "17";
    };
    hash = {
      aarch64-linux = "sha256-6TJ/ue2vKtkZNdW4Vj7F/yQZO92xdcGsqvdywCWvGCQ=";
      x86_64-linux = "sha256-hMiblm+rK1j0UaSC7jDKf+wzUENb0LlhRhXGHcbaI5A=";
      aarch64-darwin = "sha256-DooaNGi5eQxzSsaY9bAMwD/BaJnMxs6HZGX6wLg5gOM=";
      x86_64-darwin = "sha256-ZPAI/6BwxAfl70bIJWsuAU3nGW6l2Fg4WGElTnlZ9Os=";
      aarch64-linux = "sha256-v79JVJirwv53G2C/ZOXDwHLgr7z8pprHKCxP9Dd/9BY=";
      x86_64-linux = "sha256-NA2kGWYGsiRQmhuLMa/SAYE/CCYB3xicE46QXB1g4K8=";
      aarch64-darwin = "sha256-KPKf/JxcyQbo6QgT/BRPA34js4TwUuGE4kIzL3tgqwY=";
      x86_64-darwin = "sha256-I/8mS3PlvFt8OhufrHdosj35bH1mDLZBLxxSNSGjNL8=";
    }.${stdenv.system};
    pythonVersion = "3.9";
    pythonVersion = "3.10";
    inherit passthruFun;
  };
})
+1 −0
Original line number Diff line number Diff line
@@ -1113,6 +1113,7 @@ mapAliases {
  python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
  pythonFull = python2Full; # Added 2022-01-11
  pythonPackages = python.pkgs; # Added 2022-01-11
  pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03

  ### Q ###

+2 −3
Original line number Diff line number Diff line
@@ -7327,7 +7327,7 @@ with pkgs;
  pypy = pypy2;
  pypy2 = pypy27;
  pypy3 = pypy39;
  pypy3 = pypy310;
  # Python interpreter that is build with all modules, including tkinter.
  # These are for compatibility and should not be used inside Nixpkgs.
@@ -7395,7 +7395,7 @@ with pkgs;
  };
  pythonInterpreters = callPackage ./../development/interpreters/python { };
  inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310 pypy39;
  inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310;
  # List of extensions with overrides to apply to all Python package sets.
  pythonPackagesExtensions = [ ];
@@ -7412,7 +7412,6 @@ with pkgs;
  pypy2Packages = pypy2.pkgs;
  pypy27Packages = pypy27.pkgs;
  pypy3Packages = pypy3.pkgs;
  pypy39Packages = pypy39.pkgs;
  pypy310Packages = pypy310.pkgs;
  pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };