diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-04-12 09:25:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 09:25:24 -0400 |
| commit | 67d52461f987f806d992c57a0c9b8611715c7776 (patch) | |
| tree | 44ec72d174279adfc38c63ae3c30dd9d51469532 | |
| parent | f10c28182e49191987e32a1ffac146af7cb8f00b (diff) | |
| parent | b701934eaaa6adbd6821f68a90ba96cb769e6233 (diff) | |
Merge pull request #303152 from yu-re-ka/garage-1-0
garage: 0.9.4 -> 1.0.0
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2405.section.md | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/garage/default.nix | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 7b315157494fe..8ee89e357cac5 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -462,6 +462,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0. +- Garage has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade. + - The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. - The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`: diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index b0cf599ea4f1b..311661a804e3c 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -49,7 +49,7 @@ let buildFeatures = [ "kubernetes-discovery" "bundled-libs" - "sled" + ] ++ lib.optional (lib.versionOlder version "1.0") "sled" ++ [ "metrics" "k2v" "telemetry-otlp" @@ -65,7 +65,7 @@ let "k2v" "kubernetes-discovery" "bundled-libs" - "sled" + ] ++ lib.optional (lib.versionOlder version "1.0") "sled" ++ [ "lmdb" "sqlite" ]; @@ -110,7 +110,16 @@ rec { broken = stdenv.isDarwin; }; + garage_1_0_0 = generic { + version = "1.0.0"; + sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; + cargoSha256 = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0="; + broken = stdenv.isDarwin; + }; + garage_0_9 = garage_0_9_4; - garage = garage_0_9; + garage_1_x = garage_1_0_0; + + garage = garage_1_x; } |