diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2018-12-26 15:34:20 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-12-27 09:27:59 +0100 |
| commit | 31680c54e1efc73791376e09ef31290adf2c7da1 (patch) | |
| tree | c1768e710e75fcf0ad70d2deeb160e3c49d33f51 /pkgs/development/interpreters/python/cpython | |
| parent | 9f2f78b7e25cbeca82f6e4f42c93bb9f859c6249 (diff) | |
| download | nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.tar nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.tar.gz nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.tar.bz2 nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.tar.lz nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.tar.xz nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.tar.zst nixlib-31680c54e1efc73791376e09ef31290adf2c7da1.zip | |
python36: fix darwin build
Remove issue24658 patch because is already fixed and backported to Python 3.6 https://github.com/python/cpython/commit/a5ebc205beea2bf1501e4ac33ed6e81732dd0604
Diffstat (limited to 'pkgs/development/interpreters/python/cpython')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.6/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 15a62b42959c..cad35cac53a8 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -69,12 +69,6 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch - ] ++ optionals stdenv.isDarwin [ - # Fix for https://bugs.python.org/issue24658 - (fetchpatch { - url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; - sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals hasDistutilsCxxPatch [ @@ -83,8 +77,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; }) ]; |