diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-07-09 12:35:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-07-09 12:35:01 +0200 |
| commit | 323fe3a305f64bb23e6ea75105654d307a1fa9e9 (patch) | |
| tree | 52af5cbb8a87e654c53876f21c899be96a11c025 /pkgs | |
| parent | 07933800fb807b5f995f42ae80ad48b7f2e7d1bf (diff) | |
| download | nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.tar nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.tar.gz nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.tar.bz2 nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.tar.lz nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.tar.xz nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.tar.zst nixlib-323fe3a305f64bb23e6ea75105654d307a1fa9e9.zip | |
rustc: Disable tests for now
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 5c2bd6291b36..d368c977f8f8 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -36,7 +36,10 @@ in rec { # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 # So we do the same. # 2. Tests run out of memory for i686 - doCheck = !stdenv.isAarch64 && !stdenv.isi686; + #doCheck = !stdenv.isAarch64 && !stdenv.isi686; + + # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598. + doCheck = false; }; cargo = callPackage ./cargo.nix rec { diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d3dcc8e2f6c9..b0dae9d2042a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; - # The boostrap.py will generated a Makefile that then executes the build. + # The bootstrap.py will generated a Makefile that then executes the build. # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass # to the bootstrap builder. postConfigure = '' |