From 6ae570f76b959a7467983cb99a4f7fffe33d155d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 25 Sep 2023 11:50:03 +0100 Subject: [PATCH 1/6] pythonInterpreters.pypy27_prebuilt: 3.7.11 -> 3.7.12 --- pkgs/development/interpreters/python/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 902015ecfb62..760769b4360b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -181,14 +181,14 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; hash = { - aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo="; - x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0="; - aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E="; - x86_64-darwin = "sha256-Vt7unCJkD1aGw1udZP2xzjq9BEWD5AePCxccov0qGY4="; + aarch64-linux = "sha256-4E3LYoantHJOw/DlDTzBuoWDMB3RZYwG1/N1meQgHFk="; + x86_64-linux = "sha256-GmGiV0t5Rm9gYBDymZormVvZbNCF+Rp46909XCxA6B0="; + aarch64-darwin = "sha256-a3R6oHauhZfklgPF3sTKWTWhoKEy10BKVZvpaiYNm/c="; + x86_64-darwin = "sha256-bon/3RVTfOT/zjFFtl7lfC6clSiSvZW5NAEtLwCfUDs="; }.${stdenv.system}; pythonVersion = "2.7"; inherit passthruFun; From 9b15be3aa95477afa6088dabd1d106e2c8be462a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 25 Sep 2023 12:03:19 +0100 Subject: [PATCH 2/6] pythonInterpreters.pypy39_prebuilt: 7.3.11 -> 7.3.12 --- pkgs/development/interpreters/python/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 760769b4360b..60e41445233c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -200,13 +200,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; hash = { - aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk="; - x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; - aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4="; - x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0="; + aarch64-linux = "sha256-6TJ/ue2vKtkZNdW4Vj7F/yQZO92xdcGsqvdywCWvGCQ="; + x86_64-linux = "sha256-hMiblm+rK1j0UaSC7jDKf+wzUENb0LlhRhXGHcbaI5A="; + aarch64-darwin = "sha256-DooaNGi5eQxzSsaY9bAMwD/BaJnMxs6HZGX6wLg5gOM="; + x86_64-darwin = "sha256-ZPAI/6BwxAfl70bIJWsuAU3nGW6l2Fg4WGElTnlZ9Os="; }.${stdenv.system}; pythonVersion = "3.9"; inherit passthruFun; From e0874acbdd225736634dd352e9939da093dfaa4e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 25 Sep 2023 12:03:58 +0100 Subject: [PATCH 3/6] pypy27: 7.3.11 -> 7.3.12 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 60e41445233c..560c222d39bb 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -138,10 +138,10 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; - hash = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; + hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; From 2b0c3f0001b0c8ac7932d5cb780b842c35e7e75c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 25 Sep 2023 12:07:50 +0100 Subject: [PATCH 4/6] pypy39: 3.7.11 -> 3.7.12 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 560c222d39bb..31e916b6e8ff 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -155,10 +155,10 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; - hash = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; + hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo="; pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.pypy27; From 795e0c0851dd6fb1e22fabdd62c75a7d7cd37940 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 25 Sep 2023 12:08:04 +0100 Subject: [PATCH 5/6] pypy310: init at 3.7.12 --- pkgs/development/interpreters/python/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 31e916b6e8ff..c850a3ed6424 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -167,14 +167,12 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy38 = __splicedPackages.pypy39.override { - self = __splicedPackages.pythonInterpreters.pypy38; - pythonVersion = "3.8"; - hash = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; + pypy310 = __splicedPackages.pypy39.override { + self = __splicedPackages.pythonInterpreters.pypy310; + pythonVersion = "3.10"; + hash = "sha256-huTk6sw2BGxhgvQwGHllN/4zpg4dKizGuOf5Gl3LPkI="; }; - pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04 - pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { # Not included at top-level self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ea466165bea..8b42d11e4371 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18093,7 +18093,7 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; + inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; @@ -18108,9 +18108,8 @@ with pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; pypy3Packages = pypy3.pkgs; - pypy37Packages = pypy37.pkgs; - pypy38Packages = pypy38.pkgs; pypy39Packages = pypy39.pkgs; + pypy310Packages = pypy310.pkgs; py3c = callPackage ../development/libraries/py3c { }; From d72b2ed9acc6d66be266bc21b9f8462c45841832 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 25 Sep 2023 14:51:43 +0100 Subject: [PATCH 6/6] python27: disable tests that expect Python 3+ --- pkgs/development/interpreters/python/tests.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index d2bab1b0c8d3..67670ceb6546 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -8,7 +8,6 @@ { stdenv , python , runCommand -, substituteAll , lib , callPackage , pkgs @@ -60,7 +59,7 @@ let is_nixenv = "True"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) { # Venv built using plain Python # Python 2 does not support venv # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. @@ -109,7 +108,7 @@ let cpython-gdb = callPackage ./tests/test_cpython_gdb { interpreter = python; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.7") rec { + } // lib.optionalAttrs (python.pythonAtLeast "3.7") { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { interpreter = python; @@ -126,7 +125,7 @@ let extension = self: super: { foobar = super.numpy; }; - in { + in lib.optionalAttrs (python.isPy3k) ({ test-packageOverrides = let myPython = let self = python.override { @@ -150,7 +149,7 @@ let ]; }); in pkgs_.${python.pythonAttr}.pkgs.foo; - }; + }); condaTests = let requests = callPackage ({ @@ -178,7 +177,7 @@ let } ) {}; pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); - in lib.optionalAttrs stdenv.isLinux + in lib.optionalAttrs (python.isPy3k && stdenv.isLinux) { condaExamplePackage = runCommand "import-requests" {} '' ${pythonWithRequests.interpreter} -c "import requests" > $out