Merge pull request #93197 from endocrimes/dani/nomad-multiversoin

nomad: add 0.12, multi-version support
This commit is contained in:
Daniël de Kok 2020-08-13 07:58:03 +02:00 committed by GitHub
commit d0dd12cc14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions

View File

@ -0,0 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "0.11.4";
sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb";
}

View File

@ -0,0 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "0.12.2";
sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404";
}

View File

@ -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:

View File

@ -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 { };