summary refs log tree commit diff
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2022-01-09 18:19:39 +0000
committerGitHub <noreply@github.com>2022-01-09 18:19:39 +0000
commitf7fba6ae71166c812ea88c1ed72bcd16b95ee231 (patch)
tree2fcd2796e2d6e9079920a8680c408ad0f63de0b5
parent5d3c9ddee10930727dc5d1ddd0aae7d77dec667c (diff)
parent4c6570f29cdce7977d13b61786a79efa76a3d504 (diff)
downloadnixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.tar
nixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.tar.gz
nixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.tar.bz2
nixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.tar.lz
nixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.tar.xz
nixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.tar.zst
nixpkgs-f7fba6ae71166c812ea88c1ed72bcd16b95ee231.zip
Merge pull request #153533 from techknowlogick/update-nomad
nomad: 1.1.8 -> 1.2.3
-rw-r--r--pkgs/applications/networking/cluster/nomad/1.2.nix12
-rw-r--r--pkgs/applications/networking/cluster/nomad/generic.nix2
-rw-r--r--pkgs/top-level/all-packages.nix7
3 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix
new file mode 100644
index 00000000000..1bf38a8457b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad/1.2.nix
@@ -0,0 +1,12 @@
+{ callPackage
+, buildGoModule
+, nvidia_x11
+, nvidiaGpuSupport
+}:
+
+callPackage ./genericModule.nix {
+  inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
+  version = "1.2.3";
+  sha256 = "0qjj1pnq2yv4r8dv03m08ii4118drjnswf4n1r95dqh8j3bymv5i";
+  vendorSha256 = "0djh2184yg4b656wbhzxg1q1hsdnbrwsk79vc0426d0mqbzyy7dx";
+}
diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix
index 586308dd424..c028e476020 100644
--- a/pkgs/applications/networking/cluster/nomad/generic.nix
+++ b/pkgs/applications/networking/cluster/nomad/generic.nix
@@ -44,6 +44,6 @@ buildGoPackage rec {
     description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
     platforms = platforms.unix;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
+    maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 091c201bf55..698b50eefdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8074,7 +8074,7 @@ with pkgs;
 
   noip = callPackage ../tools/networking/noip { };
 
-  nomad = nomad_1_1;
+  nomad = nomad_1_2;
 
   # Nomad never updates major go versions within a release series and is unsupported
   # on Go versions that it did not ship with. Due to historic bugs when compiled
@@ -8091,6 +8091,11 @@ with pkgs;
     inherit (linuxPackages) nvidia_x11;
     nvidiaGpuSupport = config.cudaSupport or false;
   };
+  nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix {
+    buildGoModule = buildGo117Module;
+    inherit (linuxPackages) nvidia_x11;
+    nvidiaGpuSupport = config.cudaSupport or false;
+  };
 
   nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };