From 4d47e0592a4a69eb5843e2b33988627564974905 Mon Sep 17 00:00:00 2001 From: Cottand Date: Wed, 16 Oct 2024 22:52:51 +0100 Subject: [PATCH 1/3] nomad_1_9: init at 1.9.0 --- .../networking/cluster/nomad/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index fae25a6ec623..b5718f766369 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , buildGo122Module +, buildGo123Module , fetchFromGitHub , nixosTests , installShellFiles @@ -85,4 +86,16 @@ rec { export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; + + nomad_1_9 = generic { + buildGoModule = buildGo123Module; + version = "1.9.0"; + sha256 = "sha256-MJNPYSH3KsRmGQeOcWw4VvDeFGinfsyGSo4q3OdOZo8="; + vendorHash = "sha256-Ss/qwQ14VUu40nXaIgTfNuj95ekTTVrY+zcStFDSCyI="; + license = lib.licenses.bsl11; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da091b43dd45..279c6ac2f8de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10375,6 +10375,7 @@ with pkgs; nomad_1_6 nomad_1_7 nomad_1_8 + nomad_1_9 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; From 5336a876984c63b10411cf9d151ec00442dc0b0d Mon Sep 17 00:00:00 2001 From: Cottand Date: Wed, 16 Oct 2024 22:53:36 +0100 Subject: [PATCH 2/3] nomad: nomad_1_7 -> nomad_1_8 --- pkgs/applications/networking/cluster/nomad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index b5718f766369..a0998eb6fa36 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -55,7 +55,7 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_7; + nomad = nomad_1_8; nomad_1_4 = throwUnsupportaed "nomad_1_4"; From 41bf8eb2e89e7c0314bac9df6847e3c7b8c7c78a Mon Sep 17 00:00:00 2001 From: Cottand Date: Wed, 16 Oct 2024 23:05:56 +0100 Subject: [PATCH 3/3] add changelog notes for breaking nomad changes --- nixos/doc/manual/release-notes/rl-2411.section.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 3815475f9f70..55dc92dcbc9d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -389,7 +389,9 @@ before changing the package to `pkgs.stalwart-mail` in [`services.stalwart-mail.package`](#opt-services.stalwart-mail.package). -- 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. +- 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. + +- 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) - `androidndkPkgs` has been updated to `androidndkPkgs_26`.