Merge remote-tracking branch 'upstream/master' into staging

Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
parent ce018be2d6 780592ca6e
commit 6b6a575748
63 changed files with 1206 additions and 218 deletions
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -325,6 +325,7 @@ stdenv.mkDerivation ({
      "--with-gnu-as" "--without-gnu-ld"
    ]
    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
  ;

  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;