diff options
author | Daniƫl de Kok <me@danieldk.eu> | 2020-08-13 07:58:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-13 07:58:03 +0200 |
commit | d0dd12cc140fbd10c227bc03019b460a9c331524 (patch) | |
tree | 52d2c8c60f158309e8347d9b100c76a5dc50931e | |
parent | 0f2ee10cbfd698a8c7fd19dae2f09bb95c7fb079 (diff) | |
parent | 3fa125ba769be3e071a5b30c83c0999dcf698793 (diff) | |
download | nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.tar nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.tar.gz nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.tar.bz2 nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.tar.lz nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.tar.xz nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.tar.zst nixpkgs-d0dd12cc140fbd10c227bc03019b460a9c331524.zip |
Merge pull request #93197 from endocrimes/dani/nomad-multiversoin
nomad: add 0.12, multi-version support
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/0.11.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/0.12.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/nomad/generic.nix (renamed from pkgs/applications/networking/cluster/nomad/default.nix) | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix new file mode 100644 index 00000000000..9d0f2248ddc --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "0.11.4"; + sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; +} diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix new file mode 100644 index 00000000000..ae131702df6 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "0.12.2"; + sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; +} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index 990679a8668..0bfdb0b27f6 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }: buildGoPackage rec { pname = "nomad"; - version = "0.11.3"; + inherit version; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -11,8 +11,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 d7b35bf2b84..79a8951e8ab 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/0.11.nix { }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { }; notable = callPackage ../applications/misc/notable { }; |