diff options
| author | Maxine E. Aubrey <maxeaubrey@gmail.com> | 2020-08-12 21:46:32 +0200 |
|---|---|---|
| committer | Maxine E. Aubrey <maxeaubrey@gmail.com> | 2020-08-12 21:46:32 +0200 |
| commit | f0ba8274d4bf00e59d1b06c97afdfb1c55a1fcd5 (patch) | |
| tree | 41885bd20e320d973a78a73c8a4543cf86274221 /pkgs | |
| parent | 6fffd50623b6d6e707bbe3dd83be498a0963946a (diff) | |
nomad: 0.11.3 -> 0.11.4, 0.12.2
adds multiversion support, defaults to 0.11
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/nomad/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 990679a86688e..1d3b8e32ba3fd 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,8 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, majorVersion ? "0.11" }: + +let + versionMap = { + "0.11" = { + version = "0.11.4"; + sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; + }; + "0.12" = { + version = "0.12.2"; + sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; + }; + }; +in + +with versionMap.${majorVersion}; buildGoPackage rec { pname = "nomad"; - version = "0.11.3"; + inherit version; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -11,8 +26,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev; - sha256 = "1p7g7x2gl77h1w7aip3xji3s530fj46gspargz4j3i6h4wkyvafb"; + inherit rev sha256; }; # ui: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 878615936ce57..b58f7864b7537 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5608,7 +5608,9 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = nomad_0_11; + nomad_0_11 = callPackage ../applications/networking/cluster/nomad { majorVersion = "0.11"; }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad { majorVersion = "0.12"; }; notable = callPackage ../applications/misc/notable { }; |