git.iko.soy/typeable/nixpkgs
on master help sign in
python36: fix darwin build

Remove issue24658 patch because is already fixed and backported to Python 3.6 https://github.com/python/cpython/commit/a5ebc205beea2bf1501e4ac33ed6e81732dd0604

commit31680c54e1efc73791376e09ef31290adf2c7da1 authorMario Rodas <marsam@users.noreply.github.com> dateWed 26 Dec 2018, 15:34 (8 years ago) parent9f2f78b
1 file changed+2−8
pkgs/development/interpreters/python/cpython/3.6/default.nix+2−8
pkgs/development/interpreters/python/cpython/3.6/default.nix+2−8
@@ -69,12 +69,6 @@ in stdenv.mkDerivation {
6969
7070 patches = [
7171 ./no-ldconfig.patch
72− ] ++ optionals stdenv.isDarwin [
73− # Fix for https://bugs.python.org/issue24658
74− (fetchpatch {
75− url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
76− sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
77− })
7872 ] ++ optionals (x11Support && stdenv.isDarwin) [
7973 ./use-correct-tcl-tk-on-darwin.patch
8074 ] ++ optionals hasDistutilsCxxPatch [
@@ -83,8 +77,8 @@ in stdenv.mkDerivation {
8377 # only works for GCC and Apple Clang. This makes distutils to call C++
8478 # compiler when needed.
8579 (fetchpatch {
86− url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
87− sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
80+ url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
81+ sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
8882 })
8983 ];
9084