Merge pull request #295562 from SuperSandro2000/python27
python27: 2.7.18.7 -> 2.7.18.8
This commit is contained in:
commit
24fd994fc4
|
@ -131,6 +131,12 @@ let
|
||||||
# * https://github.com/python/cpython/commit/e6b247c8e524
|
# * https://github.com/python/cpython/commit/e6b247c8e524
|
||||||
../3.7/no-win64-workaround.patch
|
../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) [
|
] ++ lib.optionals (x11Support && stdenv.isDarwin) [
|
||||||
./use-correct-tcl-tk-on-darwin.patch
|
./use-correct-tcl-tk-on-darwin.patch
|
||||||
|
|
||||||
|
|
|
@ -35,9 +35,9 @@ in {
|
||||||
major = "2";
|
major = "2";
|
||||||
minor = "7";
|
minor = "7";
|
||||||
patch = "18";
|
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 (darwin) configd;
|
||||||
inherit passthruFun;
|
inherit passthruFun;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user