Merge older staging

Hydra looks OK; not finished yet but already has more successes than on master.
2017-09-24 20:56:11 +02:00
parent 2a1c656c54 73282c8cc2
commit cb9a846762
16 changed files with 86 additions and 92 deletions
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -221,8 +221,7 @@ stdenv.mkDerivation ({
    inherit sha256;
  };

-  # FIXME stackprotector needs gcc 4.9 in bootstrap tools
-  hardeningDisable = [ "stackprotector" "format" ];
+  hardeningDisable = [ "format" ];

  inherit patches;