From 2a566731ea7e446d9449f8b0f4fe7518dda46785 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 27 Mar 2025 23:02:19 +0100 Subject: [PATCH] nomad_1_{7,8}: remove The Go toolchain needed to build these is EOL, and comment says it doesn't want to be build with a newer toolchain, so removing these. Signed-off-by: Paul Meyer --- .../networking/cluster/nomad/default.nix | 25 ------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 6beedfbbfe44..c48a154d39e0 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, - buildGo122Module, buildGo124Module, fetchFromGitHub, nixosTests, @@ -84,30 +83,6 @@ rec { nomad = nomad_1_9; - nomad_1_7 = generic { - buildGoModule = buildGo122Module; - version = "1.7.7"; - sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; - vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; - license = lib.licenses.bsl11; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; - - nomad_1_8 = generic { - buildGoModule = buildGo122Module; - version = "1.8.4"; - sha256 = "sha256-BzLvALD65VqWNB9gx4BgI/mYWLNeHzp6WSXD/1Xf0Wk="; - vendorHash = "sha256-0mnhZeiCLAWvwAoNBJtwss85vhYCrf/5I1AhyXTFnWk="; - license = lib.licenses.bsl11; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; - nomad_1_9 = generic { buildGoModule = buildGo124Module; version = "1.9.7"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7fa0cbcbc0af..b546ef4dd0e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1230,6 +1230,8 @@ mapAliases { nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 + nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27 + nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27 noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2abb8a327f4..97a319d1245f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4544,8 +4544,6 @@ with pkgs; inherit (callPackages ../applications/networking/cluster/nomad { }) nomad - nomad_1_7 - nomad_1_8 nomad_1_9 ;