summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/default.nix
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-04-16 12:28:04 +0100
committerJörg Thalheim <joerg@thalheim.io>2018-04-16 12:28:04 +0100
commitdee60d8e2cbd001d2f8e1982e09f654c3a172abb (patch)
treefa783e9b4ac5de51a044912933dce2fe12da566a /pkgs/development/compilers/rust/default.nix
parentbd4ad008dd2bfe60f7473cbf652ed3c1b11f4955 (diff)
downloadnixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.tar
nixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.tar.gz
nixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.tar.bz2
nixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.tar.lz
nixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.tar.xz
nixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.tar.zst
nixlib-dee60d8e2cbd001d2f8e1982e09f654c3a172abb.zip
rustc: disable tests for aarch64
upstream is doing the same
Diffstat (limited to 'pkgs/development/compilers/rust/default.nix')
-rw-r--r--pkgs/development/compilers/rust/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index d9a36273ce1d..f47c1f753ee1 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -20,11 +20,14 @@ in rec {
 
     configureFlags = [ "--release-channel=stable" ];
 
+    # Upstream is not running tests on aarch64:
+    # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
+    # So we do the same.
+    doCheck = !stdenv.isAarch64;
+
     patches = [
       ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch
-      # https://github.com/rust-lang/rust/issues/45410
-      ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
   };