From 19bfc60e9f564194ad00508c578c7e1a329056f5 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 1 Mar 2024 18:02:23 +0100 Subject: [PATCH 1/3] garage_0_8: 0.8.5 -> 0.8.6 https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v0.8.6 Signed-off-by: Raito Bezarius --- pkgs/tools/filesystems/garage/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index e34822845b40..ade94f1d1ed6 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -89,14 +89,14 @@ rec { # we have to keep all the numbers in the version to handle major/minor/patch level. # for <1.0. - garage_0_8_5 = generic { - version = "0.8.5"; - sha256 = "sha256-YRxkjETSmI1dcHP9qTPLcOMqXx9B2uplVR3bBjJWn3I="; - cargoSha256 = "sha256-VOcymlvqqQRdT1MFzRcMuD+Xo3fc3XTuRA12tW7ZjdI="; + garage_0_8_6 = generic { + version = "0.8.6"; + sha256 = "sha256-N0AOcwpuBHwTZtHcz6a2d9GOimHevhohEOzVkIt0RDE="; + cargoSha256 = "sha256-e72FQKL77CZOi/pa+hE7PCyc1+HSJgEsKGgWlfVw51k="; broken = stdenv.isDarwin; }; - garage_0_8 = garage_0_8_5; + garage_0_8 = garage_0_8_6; garage_0_9_1 = generic { version = "0.9.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a5e69c07568..e669441041ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8405,7 +8405,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_5 garage_0_9_1; + garage_0_8_6 garage_0_9_1; garmintools = callPackage ../development/libraries/garmintools { }; From b041481ef31d70e2728fa4c97a80ec6ae131ca19 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 1 Mar 2024 18:02:38 +0100 Subject: [PATCH 2/3] garage: 0.9.1 -> 0.9.2 https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v0.9.2 Signed-off-by: Raito Bezarius --- pkgs/tools/filesystems/garage/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index ade94f1d1ed6..c24194f40e32 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -70,6 +70,11 @@ let "sqlite" ]; + disabledTests = [ + # Upstream told us this test is flakey. + "k2v::poll::test_poll_item" + ]; + passthru.tests = nixosTests.garage; meta = { @@ -98,13 +103,13 @@ rec { garage_0_8 = garage_0_8_6; - garage_0_9_1 = generic { - version = "0.9.1"; - sha256 = "sha256-AXLaifVmZU4j5D/wKn/0TzhjHZBzZW1+tMyhsAo2eBU="; - cargoSha256 = "sha256-4/+OsM73TroBB1TGqare2xASO5KhqVyNkkss0Y0JZXg="; + garage_0_9_2 = generic { + version = "0.9.2"; + sha256 = "sha256-6a400/wOZunVH+LAByd6BEA0gs56Rxyh+gvM4hUO4Y8="; + cargoSha256 = "sha256-1p6bB2gMOCHDdILEwgoJ1EqvgGhLPcThNkwaz6NMZhQ="; }; - garage_0_9 = garage_0_9_1; + garage_0_9 = garage_0_9_2; garage = garage_0_9; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e669441041ab..b60f2f4c6a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8405,7 +8405,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_6 garage_0_9_1; + garage_0_8_6 garage_0_9_2; garmintools = callPackage ../development/libraries/garmintools { }; From 4ffb9ba70757d3ba610129ed4d5ba449883bdc4c Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 1 Mar 2024 19:35:03 +0100 Subject: [PATCH 3/3] garage: mark broken on Darwin It broke again because of some linker error. ``` garage-aarch64-darwin> warning: use of deprecated associated function `garage_db::sled_adapter::SledDb::init`: The Sled database is now deprecated and will be removed in Garage v1.0. Please migrate to LMDB or Sqlite as soon as possible. garage-aarch64-darwin> --> src/model/garage.rs:134:31 garage-aarch64-darwin> | garage-aarch64-darwin> 134 | db::sled_adapter::SledDb::init(db) garage-aarch64-darwin> | ^^^^ garage-aarch64-darwin> | garage-aarch64-darwin> = note: `#[warn(deprecated)]` on by default garage-aarch64-darwin> garage-aarch64-darwin> Compiling garage_api v0.9.2 (/private/tmp/nix-build-garage-0.9.2.drv-0/source/src/api) garage-aarch64-darwin> Compiling garage_web v0.9.2 (/private/tmp/nix-build-garage-0.9.2.drv-0/source/src/web) garage-aarch64-darwin> warning: `garage_model` (lib) generated 1 warning garage-aarch64-darwin> Compiling garage v0.9.2 (/private/tmp/nix-build-garage-0.9.2.drv-0/source/src/garage) garage-aarch64-darwin> warning: use of deprecated associated function `garage_db::sled_adapter::SledDb::init`: The Sled database is now deprecated and will be removed in Garage v1.0. Please migrate to LMDB or Sqlite as soon as possible. garage-aarch64-darwin> --> src/garage/cli/convert_db.rs:65:29 garage-aarch64-darwin> | garage-aarch64-darwin> 65 | Ok(sled_adapter::SledDb::init(db)) garage-aarch64-darwin> | ^^^^ garage-aarch64-darwin> | garage-aarch64-darwin> = note: `#[warn(deprecated)]` on by default garage-aarch64-darwin> garage-aarch64-darwin> error: linker `/nix/store/6kpjydf9x7zqa1xq2qipnwr32ki3fs2n-clang-wrapper-16.0.6/bin/cc` not found garage-aarch64-darwin> | garage-aarch64-darwin> = note: No such file or directory (os error 2) ``` Signed-off-by: Raito Bezarius --- pkgs/tools/filesystems/garage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index c24194f40e32..b374618037bd 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -107,6 +107,7 @@ rec { version = "0.9.2"; sha256 = "sha256-6a400/wOZunVH+LAByd6BEA0gs56Rxyh+gvM4hUO4Y8="; cargoSha256 = "sha256-1p6bB2gMOCHDdILEwgoJ1EqvgGhLPcThNkwaz6NMZhQ="; + broken = stdenv.isDarwin; }; garage_0_9 = garage_0_9_2;