colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303057 from mweinelt/python-3.12.3_3.11.9 

python312: 3.12.2 -> 3.12.3; python311: 3.11.8 -> 3.11.9
This commit is contained in:
Martin Weinelt 2024-04-11 09:15:22 +02:00 committed by GitHub
parent ddefcf284c e05a3ec1ce
commit 9f67702776
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/python/default.nix
View File

@ -20,10 +20,10 @@
sourceVersion = {
major = "3";
minor = "11";
patch = "8";
patch = "9";
suffix = "";
};
hash = "sha256-ngYAjIkBkkOVvB2jA+rFZ6cprgErqhgqs5Jp9lA4O7M=";
hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c=";
};
};
@ -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;
};

8
pkgs/development/interpreters/python/tests.nix
View File

@ -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