garage_1: 1.2.0 -> 1.3.0, garage_2: 2.0.0 -> 2.1.0, garage_0_9: remove (#443428)

pkgs/tools/filesystems/garage/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitea,
   openssl,
@@ -31,12 +30,6 @@ let
         inherit hash;
       };
 
-      postPatch = ''
-        # Starting in 0.9.x series, Garage is using mold in local development
-        # and this leaks in this packaging, we remove it to use the default linker.
-        rm .cargo/config.toml || true
-      '';
-
       inherit cargoHash cargoPatches;
 
       nativeBuildInputs = [
@@ -54,44 +47,23 @@ let
 
       OPENSSL_NO_VENDOR = true;
 
-      # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198
+      # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.1.0/nix/compile.nix#L71-L78
       # on version changes for checking if changes are required here
       buildFeatures = [
-        "kubernetes-discovery"
         "bundled-libs"
-      ]
-      ++ lib.optional (lib.versionOlder version "1.0") "sled"
-      ++ [
-        "metrics"
-        "k2v"
-        "telemetry-otlp"
-        "lmdb"
-        "sqlite"
         "consul-discovery"
-      ];
-
-      # To make integration tests pass, we include the optional k2v feature here,
-      # but in buildFeatures only for version 0.8+, where it's enabled by default.
-      # See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
-      checkFeatures = [
+        "fjall"
+        "journald"
         "k2v"
         "kubernetes-discovery"
-        "bundled-libs"
-      ]
-      ++ lib.optional (lib.versionOlder version "1.0") "sled"
-      ++ [
         "lmdb"
+        "metrics"
         "sqlite"
+        "syslog"
+        "telemetry-otlp"
       ];
 
-      disabledTests = [
-        # Upstream told us this test is flakey.
-        "k2v::poll::test_poll_item"
-      ];
-
-      passthru.tests =
-        lib.optionalAttrs (lib.versionAtLeast version "1")
-          nixosTests."garage_${lib.versions.major version}";
+      passthru.tests = nixosTests."garage_${lib.versions.major version}";
 
       meta = {
         description = "S3-compatible object store for small self-hosted geo-distributed deployments";
@@ -111,31 +83,17 @@ 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 = generic {
+    version = "1.3.0";
+    hash = "sha256-6w+jun0UmQHmoXcokGpPM95BbQyOKefTeAelAFKxNCM=";
+    cargoHash = "sha256-mWLsOTWxzMdDfzEDu+WHJ12SVscEVfBVuOTVFbfnk0g=";
   };
 
-  garage_1_2_0 = generic {
-    version = "1.2.0";
-    hash = "sha256-JoOwCbChSL7mjegnLHOH2Abfmsnw9BwNsjFj7nqBN6o=";
-    cargoHash = "sha256-vcvD0Fn/etnAuXrM3+rj16cqpEmW2nzRmrjXsftKTFE=";
+  garage_2 = generic {
+    version = "2.1.0";
+    hash = "sha256-GGwF6kVIJ7MPvO6VRj2ebquJEjJQBwpW18P6L2sGVDs=";
+    cargoHash = "sha256-0pT2fqseN1numJZdC0FFg1JXbDq1YmlmBPQVbOpxtkw=";
   };
 
-  garage_2_0_0 = generic {
-    version = "2.0.0";
-    hash = "sha256-dn7FoouF+5qmW6fcC20bKQSc6D2G9yrWdBK3uN3bF58=";
-    cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc=";
-  };
-
-  garage_0_9 = garage_0_9_4;
-
-  garage_1 = garage_1_2_0;
-
-  garage_2 = garage_2_0_0;
-
   garage = garage_1;
 }

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

pkgs/top-level/all-packages.nix

@@ -2879,13 +2879,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
     ;