Skip to content

Commit ec5b873

Browse files
authored
nomad: nomad_1_7 -> nomad_1_8, nomad_1_9: init at 1.9.0 (#349151)
2 parents 9c85f9a + 41bf8eb commit ec5b873

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

nixos/doc/manual/release-notes/rl-2411.section.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,9 @@
448448
before changing the package to `pkgs.stalwart-mail` in
449449
[`services.stalwart-mail.package`](#opt-services.stalwart-mail.package).
450450

451-
- The `nomad_1_5` package was dropped, as [it has reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating it will throw an error.
451+
- The `nomad_1_5` and `nomad_1_6` package were dropped, as [they have reached end-of-life upstream](https://support.hashicorp.com/hc/en-us/articles/360021185113-Support-Period-and-End-of-Life-EOL-Policy). Evaluating them will throw an error.
452+
453+
- The default `nomad` package has been updated to 1.8.x. For more information, see [breaking changes for Nomad 1.8](https://developer.hashicorp.com/nomad/docs/upgrade/upgrade-specific#nomad-1-8-0)
452454

453455
- `androidndkPkgs` has been updated to `androidndkPkgs_26`.
454456

pkgs/applications/networking/cluster/nomad/default.nix

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ lib
22
, buildGoModule
33
, buildGo122Module
4+
, buildGo123Module
45
, fetchFromGitHub
56
, nixosTests
67
, installShellFiles
@@ -54,7 +55,7 @@ rec {
5455
# Upstream partially documents used Go versions here
5556
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
5657

57-
nomad = nomad_1_7;
58+
nomad = nomad_1_8;
5859

5960
nomad_1_4 = throwUnsupportaed "nomad_1_4";
6061

@@ -85,4 +86,16 @@ rec {
8586
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
8687
'';
8788
};
89+
90+
nomad_1_9 = generic {
91+
buildGoModule = buildGo123Module;
92+
version = "1.9.0";
93+
sha256 = "sha256-MJNPYSH3KsRmGQeOcWw4VvDeFGinfsyGSo4q3OdOZo8=";
94+
vendorHash = "sha256-Ss/qwQ14VUu40nXaIgTfNuj95ekTTVrY+zcStFDSCyI=";
95+
license = lib.licenses.bsl11;
96+
passthru.tests.nomad = nixosTests.nomad;
97+
preCheck = ''
98+
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
99+
'';
100+
};
88101
}

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10262,6 +10262,7 @@ with pkgs;
1026210262
nomad_1_6
1026310263
nomad_1_7
1026410264
nomad_1_8
10265+
nomad_1_9
1026510266
;
1026610267

1026710268
nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };

0 commit comments

Comments
 (0)