diff options
author | Maxine E. Aubrey <maxeaubrey@gmail.com> | 2020-08-12 23:58:18 +0200 |
---|---|---|
committer | Maxine E. Aubrey <maxeaubrey@gmail.com> | 2020-08-12 23:58:18 +0200 |
commit | 3fa125ba769be3e071a5b30c83c0999dcf698793 (patch) | |
tree | 3d1a7318f977f931d318b0443b31020940eb9c61 /pkgs | |
parent | f0ba8274d4bf00e59d1b06c97afdfb1c55a1fcd5 (diff) |
nomad: restructure to use multiple files
as per request in PR comments, used generic.nix with version files
Diffstat (limited to 'pkgs')
-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) | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 15 insertions, 18 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 0000000000000..9d0f2248ddc5a --- /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 0000000000000..ae131702df6ef --- /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 1d3b8e32ba3fd..0bfdb0b27f6e6 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,19 +1,4 @@ -{ 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}; +{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }: buildGoPackage rec { pname = "nomad"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b58f7864b7537..854aca3a622c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5609,8 +5609,8 @@ in noip = callPackage ../tools/networking/noip { }; 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"; }; + 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 { }; |