Merge 'staging' into closure-size

This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
parent 056b5a1a5f c55cfe0cb3
commit d1df28f8e5
89 changed files with 1475 additions and 397 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
  };
 }