From 74bcd02646fd569eddaec5d312a966de00a3deff Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 16 Sep 2025 08:34:41 -0400 Subject: [PATCH] garage: remove 0.9 and minor versions for 1.2 and 2.0 --- pkgs/tools/filesystems/garage/default.nix | 17 ----------------- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 36bb29194912..f28fb6b9cf9d 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitea, openssl, @@ -59,9 +58,6 @@ let buildFeatures = [ "kubernetes-discovery" "bundled-libs" - ] - ++ lib.optional (lib.versionOlder version "1.0") "sled" - ++ [ "metrics" "k2v" "telemetry-otlp" @@ -77,9 +73,6 @@ let "k2v" "kubernetes-discovery" "bundled-libs" - ] - ++ lib.optional (lib.versionOlder version "1.0") "sled" - ++ [ "lmdb" "sqlite" ]; @@ -111,14 +104,6 @@ let }; in rec { - garage_0_9_4 = generic { - version = "0.9.4"; - hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; - cargoHash = "sha256-ittesFz1GUGipQecsmMA+GEaVoUY+C9DtEvsO0HFNCc="; - cargoPatches = [ ./update-time.patch ]; - eol = true; - }; - garage_1_2_0 = generic { version = "1.2.0"; hash = "sha256-JoOwCbChSL7mjegnLHOH2Abfmsnw9BwNsjFj7nqBN6o="; @@ -131,8 +116,6 @@ rec { cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc="; }; - garage_0_9 = garage_0_9_4; - garage_1 = garage_1_2_0; garage_2 = garage_2_0_0; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2a0713973f0e..663793162bb7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -946,7 +946,11 @@ mapAliases { gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23 garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23 + garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16 + garage_0_9_4 = throw "'garage_0_9_4' has been removed as it is unmaintained upstream"; # Added 2025-09-16 + garage_1_2_0 = throw "'garage_1_2_0' has been removed. Use 'garage_1' instead."; # Added 2025-09-16 garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23 + garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16 gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26 gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bfacedd9336..27d9527d8172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2881,13 +2881,7 @@ with pkgs; inherit (callPackages ../tools/filesystems/garage { }) garage - garage_0_9 - garage_0_9_4 - - garage_1_2_0 garage_1 - - garage_2_0_0 garage_2 ;