From e8eb0ced9f4d8c424d0b854b55fbdb2ecc60d201 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Apr 2024 10:28:07 +0200 Subject: [PATCH 1/3] python312: 3.12.2 -> 3.12.3 https://docs.python.org/release/3.12.3/whatsnew/changelog.html --- 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 03147bc4c5f3..a4364b77c1f5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -79,10 +79,10 @@ in { sourceVersion = { major = "3"; minor = "12"; - patch = "2"; + patch = "3"; suffix = ""; }; - hash = "sha256-vigRLayBPSBTVFwUvxOhZAGiGHfxpp626l2ExKDz2HA="; + hash = "sha256-Vr/vH9/BIhzmcg5DpmHj60F4XdkUzplpjYx4lq9L2qE="; inherit (darwin) configd; inherit passthruFun; }; From 3546ac22408d77035879f442a3a36249fced598c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Apr 2024 10:38:02 +0200 Subject: [PATCH 2/3] python311: 3.11.8 -> 3.11.9 https://docs.python.org/release/3.11.9/whatsnew/changelog.html --- 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 a4364b77c1f5..ad187c91e9f4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "8"; + patch = "9"; suffix = ""; }; - hash = "sha256-ngYAjIkBkkOVvB2jA+rFZ6cprgErqhgqs5Jp9lA4O7M="; + hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c="; }; }; From e05a3ec1ce20846f4520433b15b61814ae61ec19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Apr 2024 17:59:34 +0200 Subject: [PATCH 3/3] cpython: disable failing passthru tests on darwin ```` usage: virtualenv [--version] [--with-traceback] [-v | -q] [--read-only-app-data] [--app-data APP_DATA] [--reset-app-data] [--upgrade-embed-wheels] [--discovery {builtin}] [-p py] [--try-first-with py_exe] [--creator {builtin,cpython3-posix,venv}] [--seeder {app-data,pip}] [--no-seed] [--activators comma_sep_list] [--clear] [--no-vcs-ignore] [--system-site-packages] [--symlinks | --copies] [--no-download | --download] [--extra-search-dir d [d ...]] [--pip version] [--setuptools version] [--wheel version] [--no-pip] [--no-setuptools] [--no-wheel] [--no-periodic-update] [--symlink-app-data] [--prompt prompt] [-h] dest virtualenv: error: argument dest: the destination . is not write-able at /nix/store SystemExit: 2 ```` --- pkgs/development/interpreters/python/tests.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 0251a903a7ae..e989c92d5110 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -38,8 +38,10 @@ let is_nixenv = "False"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (!python.isPyPy) { + } // lib.optionalAttrs (!python.isPyPy && !stdenv.isDarwin) { # Use virtualenv with symlinks from a Nix env. + # Fails on darwin with + # virtualenv: error: argument dest: the destination . is not write-able at /nix/store nixenv-virtualenv-links = rec { env = runCommand "${python.name}-virtualenv-links" {} '' ${pythonVirtualEnv.interpreter} -m virtualenv --system-site-packages --symlinks --no-seed $out @@ -49,8 +51,10 @@ let is_nixenv = "True"; is_virtualenv = "True"; }; - } // lib.optionalAttrs (!python.isPyPy) { + } // lib.optionalAttrs (!python.isPyPy && !stdenv.isDarwin) { # Use virtualenv with copies from a Nix env. + # Fails on darwin with + # virtualenv: error: argument dest: the destination . is not write-able at /nix/store nixenv-virtualenv-copies = rec { env = runCommand "${python.name}-virtualenv-copies" {} '' ${pythonVirtualEnv.interpreter} -m virtualenv --system-site-packages --copies --no-seed $out