Merge branch 'master' into staging-next

Hydra: ?compare=1468896
2018-07-14 18:12:49 +02:00
parent 4bd4e3ef5c 6d0578934f
commit 0f01215203
721 changed files with 20508 additions and 20874 deletions
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -65,6 +65,11 @@ in stdenv.mkDerivation {

  patches = [
    ./no-ldconfig.patch
+    # Fix darwin build https://bugs.python.org/issue34027
+    (fetchpatch {
+      url = https://bugs.python.org/file47666/darwin-libutil.patch;
+      sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa";
+    })
  ] ++ optionals hasDistutilsCxxPatch [
    # Fix for http://bugs.python.org/issue1222585
    # Upstream distutils is calling C compiler to compile C++ code, which