From 61baca011c1523b596f965df7cb73fa521d178b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 13 Mar 2024 10:52:15 +0100 Subject: [PATCH] python27: 2.7.18.7 -> 2.7.18.8 Diff: https://github.com/ActiveState/cpython/compare/v2.7.18.7...v2.7.18.8 --- .../development/interpreters/python/cpython/2.7/default.nix | 6 ++++++ pkgs/development/interpreters/python/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index a77206ae3852..dda254fca389 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -131,6 +131,12 @@ let # * https://github.com/python/cpython/commit/e6b247c8e524 ../3.7/no-win64-workaround.patch + # fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip + (fetchpatch { + url = "https://github.com/ActiveState/cpython/pull/35/commits/20ea5b46aaf1e7bdf9d6905ba8bece2cc73b05b0.patch"; + revert = true; + hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw="; + }) ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 12050f319fc0..81e1dd49c513 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -35,9 +35,9 @@ in { major = "2"; minor = "7"; patch = "18"; - suffix = ".7"; # ActiveState's Python 2 extended support + suffix = ".8"; # ActiveState's Python 2 extended support }; - hash = "sha256-zcjAoSq6491ePiDySBCKrLIyYoO/5fdH6aBTNg/NH8s="; + hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI="; inherit (darwin) configd; inherit passthruFun; };