Merge branch 'master' into staging

2018-04-10 09:13:36 +02:00
parent 0aa59a08d6 c4f555a505
commit 80fc5f2a24
61 changed files with 1226 additions and 141 deletions
@@ -100,8 +100,10 @@ stdenv.mkDerivation {

    # Useful debugging parameter
    # export VERBOSE=1
-  ''
-  + optionalString stdenv.isDarwin ''
+  '' + optionalString stdenv.isAarch64 ''
+    # https://github.com/rust-lang/rust/issues/49807
+    rm -vr src/test/debuginfo/by-value-self-argument-in-trait-impl.rs
+  '' + optionalString stdenv.isDarwin ''
    # Disable all lldb tests.
    # error: Can't run LLDB test because LLDB's python path is not set
    rm -vr src/test/debuginfo/*