diff options
author | Luiz Aoqui <luiz@hashicorp.com> | 2022-06-20 17:22:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 07:22:24 +1000 |
commit | bbb4e423e476622c47a55db710887b010a79bd8b (patch) | |
tree | 648c50cb2e48289f7ef11b0fd108fcc373305706 /pkgs/applications/networking | |
parent | 1938f36f03d6c4fed0487e2787ee57d77cc0706a (diff) | |
download | nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.tar nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.tar.gz nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.tar.bz2 nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.tar.lz nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.tar.xz nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.tar.zst nixpkgs-bbb4e423e476622c47a55db710887b010a79bd8b.zip |
nomad: remove dependency on Nvidia (#178287)
Nomad 1.2.0 externalized[1] the Nvidia device driver out of the main codebase and into a separate plugin[2], so there is no need to load the Nvidia libraries anymore when building Nomad itself. [1]: https://github.com/hashicorp/nomad/blob/main/CHANGELOG.md#120-november-15-2021 [2]: https://github.com/hashicorp/nomad-device-nvidia
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/1.2.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/1.3.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/generic.nix | 17 |
3 files changed, 3 insertions, 22 deletions
diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index c888581ae4d..5df87528448 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -1,11 +1,9 @@ { callPackage , buildGoModule -, nvidia_x11 -, nvidiaGpuSupport }: callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + inherit buildGoModule; version = "1.2.8"; sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8"; vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5"; diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 6670b35f67e..0145a5b1090 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -1,11 +1,9 @@ { callPackage , buildGoModule -, nvidia_x11 -, nvidiaGpuSupport }: callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + inherit buildGoModule; version = "1.3.1"; sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7"; vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh"; diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index 180cf48e3fb..c5d92eaf1f7 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -4,9 +4,6 @@ , version , sha256 , vendorSha256 -, nvidiaGpuSupport -, patchelf -, nvidia_x11 , nixosTests }: @@ -25,22 +22,10 @@ buildGoModule rec { inherit vendorSha256; - nativeBuildInputs = lib.optionals nvidiaGpuSupport [ - patchelf - ]; - # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - - # The dependency on NVML isn't explicit. We have to make it so otherwise the - # binary will not know where to look for the relevant symbols. - postFixup = lib.optionalString nvidiaGpuSupport '' - for bin in $out/bin/*; do - patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" - done - ''; + tags = [ "ui" ]; passthru.tests.nomad = nixosTests.nomad; |