diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-05 13:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 13:02:05 +0000 |
| commit | e3e7a85fbd2f33b1693d7a13008bb9e7c1511fee (patch) | |
| tree | c2ca7d754fc67d4aa36b7b99f6855753efb059d2 /pkgs/development | |
| parent | e821a5d59a8b264245054966c59184887c8af05b (diff) | |
| parent | b0ac5300077ee8ad1486be004d8575b51004f12f (diff) | |
Merge pull request #209090 from thiagokokada/bump-python2
python27: 2.7.18.5 -> 2.7.18.6
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 4052281b0f0df..a702f9fd3f353 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -128,13 +128,6 @@ let # Backport from CPython 3.8 of a good list of tests to run for PGO. ./profile-task.patch - # remove once 2.7.18.6 is released - (fetchpatch { - name = "CVE-2021-3733.patch"; - url = "https://github.com/ActiveState/cpython/commit/eeb7fe50450f08a782921f3229abed2f23e7b2d7.patch"; - sha256 = "sha256-ch4cMoFythDmyvlVxOAVw3Ow4PPWVDq5o9c1qox2824="; - }) - # The workaround is for unittests on Win64, which we don't support. # It does break aarch64-darwin, which we do support. See: # * https://bugs.python.org/issue35523 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 18282bc6d26c5..b323ec2607c4c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -144,9 +144,9 @@ in { major = "2"; minor = "7"; patch = "18"; - suffix = ".5"; # ActiveState's Python 2 extended support + suffix = ".6"; # ActiveState's Python 2 extended support }; - sha256 = "sha256-f5A0go0mUEv8cXuXo0ZRNfGwNPjnDhP7KqhkETOoqsw="; + sha256 = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY="; inherit (darwin) configd; inherit passthruFun; }; |