From 2b90c413dfb68283e7be8bf00fe3b04cad524d3e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 23 Jun 2025 17:44:40 -0400
Subject: [PATCH] garage_1_x: rename to garage_1

---
 nixos/modules/services/web-servers/garage.md | 9 +++------
 pkgs/tools/filesystems/garage/default.nix    | 5 ++---
 pkgs/top-level/aliases.nix                   | 1 +
 pkgs/top-level/all-packages.nix              | 1 -
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/web-servers/garage.md b/nixos/modules/services/web-servers/garage.md
index 5fdd9e82a52c..c51e4b060147 100644
--- a/nixos/modules/services/web-servers/garage.md
+++ b/nixos/modules/services/web-servers/garage.md
@@ -7,9 +7,6 @@ The server setup can be automated using
  client configured to your local Garage instance is available in
  the global environment as `garage-manage`.
 
-The current default by NixOS is `garage_0_8` which is also the latest
-major version available.
-
 ## General considerations on upgrades {#module-services-garage-upgrade-scenarios}
 
 Garage provides a cookbook documentation on how to upgrade:
@@ -45,7 +42,7 @@ Here are some baseline instructions to handle advanced upgrades in Garage, when
   - Run `systemctl stop garage` to stop the actual Garage version.
   - Backup the metadata folder of ALL your nodes, e.g. for a metadata directory (the default one) in `/var/lib/garage/meta`,
     you can run `pushd /var/lib/garage; tar -acf meta-v0.7.tar.zst meta/; popd`.
-  - Run the offline migration: `nix-shell -p garage_0_8 --run "garage offline-repair --yes"`, this can take some time depending on how many objects are stored in your cluster.
+  - Run the offline migration: `nix-shell -p garage_1 --run "garage offline-repair --yes"`, this can take some time depending on how many objects are stored in your cluster.
   - Bump Garage version in your NixOS configuration, either by changing [stateVersion](#opt-system.stateVersion) or bumping [services.garage.package](#opt-services.garage.package), this should restart Garage automatically.
   - Perform `garage-manage repair --all-nodes --yes tables` and `garage-manage repair --all-nodes --yes blocks`.
   - Wait for a full table sync to run.
@@ -77,8 +74,8 @@ packages, but mark them as insecure in an expression like this (in
 ```nix
 /* ... */
 {
-  garage_0_7_3 = generic {
-    version = "0.7.3";
+  garage_1_2_0 = generic {
+    version = "1.2.0";
     sha256 = "0000000000000000000000000000000000000000000000000000";
     eol = true;
   };
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 04e2a15999e3..b325748cc6fa 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -133,10 +133,9 @@ rec {
 
   garage_0_9 = garage_0_9_4;
 
-  garage_1_x = garage_1_2_0;
-  garage_1 = garage_1_x;
+  garage_1 = garage_1_2_0;
 
   garage_2 = garage_2_0_0;
 
-  garage = garage_1_x;
+  garage = garage_1;
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 952ff0a9f558..c2c103d78c2a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -731,6 +731,7 @@ 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_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
   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 1f9e4560b9b4..f7c18a08b1f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3029,7 +3029,6 @@ with pkgs;
     garage_0_9_4
 
     garage_1_2_0
-    garage_1_x
     garage_1
 
     garage_2_0_0