From 02e3a73813a7389708ac5138fb4f229f506ac647 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 05:00:44 +0200 Subject: [PATCH 1/9] python38: 3.8.9 -> 3.8.10 (cherry picked from commit 3898eb189762f5e83ed4b617c58711ceae29e9fa) --- 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 328ed715bae..d013f1323fa 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -120,10 +120,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "8"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "XjkfPsRdopVEGcqwvq79i+OIlepc4zV3w+wUlAxLlXI="; + sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka"; }; }; From d8fa6239c76fdafcbe4b9c04812e21c060babb27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 05:01:07 +0200 Subject: [PATCH 2/9] python39: 3.9.4 -> 3.9.5 (cherry picked from commit 7ca18ab93f802dead800d76e3913eda1a8bbc705) --- 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 d013f1323fa..35872de2dcf 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -179,10 +179,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "4"; + patch = "5"; suffix = ""; }; - sha256 = "Sw5mRKdvjfhkriSsUApRu/aL0Jj2oXPifTthzcqaoTQ="; + sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc"; inherit (darwin) configd; inherit passthruFun; }; From ec7dfbf84ba483a1c7f1dbbb43549f238c822b8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Jun 2021 05:01:49 +0200 Subject: [PATCH 3/9] python310: 3.10.0a5 -> 3.10.0b3 (cherry picked from commit bb696403b0334d1fd3dee195751f99f9e2b0270f) --- 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 35872de2dcf..6f2866e8039 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -193,9 +193,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "a5"; + suffix = "b3"; }; - sha256 = "BBjlfnA24hnx5rYwOyHnEfZM/Q/dsIlNjxnzev/8XU0="; + sha256 = "05fc4mp2ysb372bzkwbn1b1z01bfldnaqig6rxmif58hs3aawrr2"; inherit (darwin) configd; inherit passthruFun; }; From 4c5903aabe68f51a4cbefe8604d6e517610016ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:01:20 +0200 Subject: [PATCH 4/9] python38: 3.8.10 -> 3.8.11 (cherry picked from commit 250f0514f2cfbf1c4f099870c329eb6ecc6a0115) --- 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 6f2866e8039..83ccbc26d00 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -120,10 +120,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "8"; - patch = "10"; + patch = "11"; suffix = ""; }; - sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka"; + sha256 = "1chg8b0m1yrz50lizid20zha0dmj40z0iih3jqcrg7pyxca126pv"; }; }; From de46e983af73fb08903332be39f2a1bdcd9ede59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:01:41 +0200 Subject: [PATCH 5/9] python39: 3.9.5 -> 3.9.6 (cherry picked from commit 360c50f11d675f0a19e2245e3ebfa1179ff28360) --- 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 83ccbc26d00..a575675684f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -179,10 +179,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "5"; + patch = "6"; suffix = ""; }; - sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc"; + sha256 = "12hhw2685i68pwfx5hdkqngzhbji4ccyjmqb5rzvkigg6fpj0y9r"; inherit (darwin) configd; inherit passthruFun; }; From d7b9ef367f788a7f122e08da0446242f8151cbea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:01:56 +0200 Subject: [PATCH 6/9] python36: 3.6.13 -> 3.6.14 (cherry picked from commit e1e245f203e2d1b568b730eb363026ea81fdfc1e) --- 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 a575675684f..3d3d546a2de 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -147,10 +147,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "13"; + patch = "14"; suffix = ""; }; - sha256 = "pHpDpTq7QihqLBGWU0P/VnEbnmTo0RvyxnAaT7jOGg8="; + sha256 = "1bnm0bx7xf1jpfm0bmzlq19vwm0bvcbl7klx4rvgq05xryhafqr6"; inherit (darwin) configd; inherit passthruFun; }; From 98163bd246eb16da70546c0745eccab413547dc6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Jul 2021 00:02:07 +0200 Subject: [PATCH 7/9] python37: 3.7.10 -> 3.7.11 (cherry picked from commit b322c5ecaab811090690b026e1db857de6523e64) --- 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 3d3d546a2de..9dc48060163 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -160,10 +160,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "10"; + patch = "11"; suffix = ""; }; - sha256 = "+NgudXLIbsnVXIYnquUEAST9IgOvQAw4PIIbmAMG7ms="; + sha256 = "0d57b5a47wapzpkkq5rbvvi4caylc35j5910b64rxxn4nmm1kd6x"; inherit (darwin) configd; inherit passthruFun; }; From d1a75c3c1de15227da4e0379a2f1067f1e1acb94 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 02:34:24 +0200 Subject: [PATCH 8/9] python310: 3.10.0b3 -> 3.10.0rc1 (cherry picked from commit ebc4dae8cb65706c5d91afe3dc39d1f6c0f17e5e) --- 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 9dc48060163..a952e6f06d6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -193,9 +193,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "b3"; + suffix = "rc1"; }; - sha256 = "05fc4mp2ysb372bzkwbn1b1z01bfldnaqig6rxmif58hs3aawrr2"; + sha256 = "0f76q6rsvbvrzcnsp0k7sp555krrgvjpcd09l1rybl4249ln2w3r"; inherit (darwin) configd; inherit passthruFun; }; From eb3091ac76f1500ced6fc8951242a05a98ed774c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Jun 2021 03:08:21 +0200 Subject: [PATCH 9/9] cpython: fix permissions on venv activation scripts Previously these ended up without u+w permissions which meant they could not be regenerated, which was hugely annoying when these venvs were for example created and recreated in a nix-shell. (cherry picked from commit 4fa69858d951409426c5b080fbdaf342fe790877) --- .../interpreters/python/cpython/default.nix | 4 ++++ .../python/cpython/virtualenv-permissions.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 39f2ae0c3e4..1fe0bf4fa37 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -193,6 +193,10 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + # Make sure that the virtualenv activation scripts are + # owner-writable, so venvs can be recreated without permission + # errors. + ./virtualenv-permissions.patch ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch diff --git a/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch b/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch new file mode 100644 index 00000000000..c686f21bfbb --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch @@ -0,0 +1,13 @@ +diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py +index caa7285..ad666ac 100644 +--- a/Lib/venv/__init__.py ++++ b/Lib/venv/__init__.py +@@ -379,7 +379,7 @@ class EnvBuilder: + if data is not None: + with open(dstfile, 'wb') as f: + f.write(data) +- shutil.copymode(srcfile, dstfile) ++ os.chmod(dstfile, 0o644) + + + def create(env_dir, system_site_packages=False, clear=False,