From 68d15236990e1698355e4afced968aa1c97b0cb5 Mon Sep 17 00:00:00 2001 From: Cottand Date: Tue, 25 Nov 2025 20:21:57 +0000 Subject: [PATCH 1/2] nomad_1_11: init at 1.11.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 c21adc70c2b7..ad8b43fa8ab0 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,6 +2,7 @@ lib, buildGoModule, buildGo124Module, + buildGo125Module, fetchFromGitHub, nixosTests, installShellFiles, @@ -88,6 +89,18 @@ rec { nomad = nomad_1_10; + nomad_1_11 = generic { + buildGoModule = buildGo125Module; + version = "1.11.0"; + hash = "sha256-ETC9zJVup/BLivsBWVez5/OLpl7cjdlIRACVK9ga3Io="; + vendorHash = "sha256-WqGWEjaPicpmkARSEQ/bqw8+GSemh1fcM3pb4BGjZpU="; + license = lib.licenses.bsl11; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + }; + nomad_1_10 = generic { buildGoModule = buildGo124Module; version = "1.10.5"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbbb70b760a7..e99ea3023865 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3462,6 +3462,7 @@ with pkgs; nomad nomad_1_9 nomad_1_10 + nomad_1_11 ; nth = with python3Packages; toPythonApplication name-that-hash; From ea80c95461ac13f42c8a1caff491796fb7def352 Mon Sep 17 00:00:00 2001 From: Cottand Date: Tue, 25 Nov 2025 20:22:16 +0000 Subject: [PATCH 2/2] nomad_1_11, nomad_1_10, nomad_1_9: remove obsolete go.mod patch --- pkgs/applications/networking/cluster/nomad/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index ad8b43fa8ab0..9d2070ca82b1 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -41,12 +41,6 @@ let inherit hash; }; - # Nomad requires Go 1.24.6, but nixpkgs doesn't have it in unstable yet. - postPatch = '' - substituteInPlace go.mod \ - --replace-warn "go 1.24.6" "go 1.24.5" - ''; - nativeBuildInputs = [ installShellFiles ]; ldflags = [