Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-03-30 09:01:20 +00:00
parent 9c3518bd6d 070b123d4b
commit a4e65c3639
88 changed files with 7161 additions and 1851 deletions
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
    platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
    inherit (ghc.meta) license;
+    broken = true; # broken by gcc 5.x: http://hydra.nixos.org/build/33627548
  };
 }