about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-01-03 11:18:51 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-01-03 11:19:28 +0100
commit6c9b5071e4d645c8d6757175f398c52d4883eb30 (patch)
treeac8bd9d3c3b2d90399e17a038e90116a265c0b5c /pkgs/top-level
parent20489e31cd2cada27690612689a3bf5e608c5109 (diff)
Revert "Merge pull request #107030 from cpcloud/nomad-nvml"
This broke eval.

https://github.com/NixOS/nixpkgs/pull/107030#issuecomment-753591854

This reverts commit 20489e31cd2cada27690612689a3bf5e608c5109, reversing
changes made to 590feeecfbbe947d8f85a335c48846b5af0bdd35.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed519b867c87e..0321d183b91ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6129,13 +6129,9 @@ in
   # with different versions we pin Go for all versions.
   nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix {
     buildGoPackage = buildGo114Package;
-    inherit (linuxPackages) nvidia_x11;
-    nvidiaGpuSupport = config.cudaSupport or (!stdenv.isLinux);
   };
   nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix {
     buildGoPackage = buildGo114Package;
-    inherit (linuxPackages) nvidia_x11;
-    nvidiaGpuSupport = config.cudaSupport or (!stdenv.isLinux);
   };
   nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix {
     buildGoPackage = buildGo115Package;