Merge remote-tracking branch 'upstream/staging' into gcc-7

Conflicts: pkgs/development/libraries/libidn/default.nix pkgs/top-level/all-packages.nix
2018-02-15 15:45:37 +02:00
parent 0a941e0b66 79e7f7af9a
commit b1916b45a3
906 changed files with 20608 additions and 10078 deletions
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  outputs = [ "bin" "dev" "out" "info" "devdoc" ];

  # broken with gcc-7
-  #doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin;
+  #doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl;

  hardeningDisable = [ "format" ];