summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster/nomad/default.nix
diff options
context:
space:
mode:
authorDanielle Lancashire <dani@builds.terrible.systems>2019-08-31 10:45:48 +0200
committerDanielle Lancashire <dani@builds.terrible.systems>2019-08-31 22:08:57 +0200
commitf6c47d01a4900312ac5b84f1ccc0010bed29bfd2 (patch)
tree9e5959b5f332f5d37497f1cadee35bc36496a012 /pkgs/applications/networking/cluster/nomad/default.nix
parente0795aa5e8c759bca435270facb5f90fefaa909a (diff)
downloadnixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.tar
nixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.tar.gz
nixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.tar.bz2
nixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.tar.lz
nixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.tar.xz
nixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.tar.zst
nixpkgs-f6c47d01a4900312ac5b84f1ccc0010bed29bfd2.zip
nomad: 0.9.4 -> 0.9.5
This commit updates nomad from 0.9.4 to 0.9.5.

It also introduces the 'ui' build tag as it is incredibly useful when
working in development and production environments - and the assets are
included in release commits.
Diffstat (limited to 'pkgs/applications/networking/cluster/nomad/default.nix')
-rw-r--r--pkgs/applications/networking/cluster/nomad/default.nix24
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ce7b9beb4f8..a4236a9408c 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "nomad";
-  version = "0.9.4";
+  version = "0.9.5";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -10,14 +10,26 @@ buildGoPackage rec {
 
   src = fetchFromGitHub {
     owner = "hashicorp";
-    repo = "nomad";
+    repo = pname;
     inherit rev;
-    sha256 = "1jgvnmmrz7ffpm6aamdrvklj94n7b43swk9cycqhlfbnzijianpn";
+    sha256 = "01491470idb11z0ab4anb5caw46vy9s94a17l92j0z2f3f4k6xfl";
   };
 
-  # We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
-  # Ref: https://github.com/hashicorp/nomad/issues/5535
-  buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia";
+  # ui:
+  #  Nomad release commits include the compiled version of the UI, but the file
+  #  is only included if we build with the ui tag.
+  # nonvidia:
+  #  We disable Nvidia GPU scheduling on Linux, as it doesn't work there:
+  #  Ref: https://github.com/hashicorp/nomad/issues/5535
+  preBuild = let
+    tags = ["ui"]
+      ++ stdenv.lib.optional stdenv.isLinux "nonvidia";
+    tagsString = stdenv.lib.concatStringsSep " " tags;
+  in ''
+    export buildFlagsArray=(
+      -tags="${tagsString}"
+    )
+ '';
 
   meta = with stdenv.lib; {
     homepage = https://www.nomadproject.io/;