diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:42:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:52:04 +0100 |
| commit | f48c1fda6b457520c1214b29992af0c0c9872b6c (patch) | |
| tree | 1bb43ae46bf2c035c48361c764ad4c5995881a10 /pkgs/development/interpreters | |
| parent | 415d23fb4d2b2823a87d410da9beef8332d82d7b (diff) | |
| parent | aa6313a23d749f0d73f91af35a2fe15e74501451 (diff) | |
| download | nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.gz nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.bz2 nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.lz nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.xz nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.tar.zst nixlib-f48c1fda6b457520c1214b29992af0c0c9872b6c.zip | |
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix required manual adjustments. The fetched patch is already in src. I checked that libvirt builds.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6bee51f64232..608486c3aa1e 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -282,9 +282,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "6"; + patch = "8"; }; - sha256 = "sha256-ghJ/Q/rmznXUfWxFOfjB6jcunC2/pA+ui1g1HVInk6Q="; # linux64 + sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 460af1cc67b4..877a00efa483 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -7,7 +7,6 @@ # Dependencies , bzip2 , zlib -, openssl_1_0_2 , expat , ncurses6 , tcl-8_5 @@ -50,7 +49,6 @@ let deps = [ bzip2 zlib - openssl_1_0_2 expat ncurses6 tcl-8_5 |