Merge remote-tracking branch 'origin/master' into gcc-6

pkgs/development/interpreters/guile/default.nix

@@ -1,5 +1,5 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }:
+, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }:
 
 # Do either a coverage analysis build or a standard build.
 (if coverageAnalysis != null
@@ -53,7 +53,8 @@
   '';
 
   # make check doesn't work on darwin
-  doCheck = !stdenv.isDarwin;
+  # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
+  doCheck = false;
 
   setupHook = ./setup-hook-2.0.sh;