diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
| commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
| tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs/pkgs/development/libraries/elpa | |
| parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
| parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
| download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip | |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/elpa')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/elpa/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index 810e04d3a377..0967ba113f8d 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !enableCuda; nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' |