From 21727dbda0e8ccdde140d38902e7274d2e5e77cb Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Jan 2024 10:20:44 -0500 Subject: [PATCH 1/4] garage_0_8: 0.8.4 -> 0.8.5 https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v0.8.5 --- 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 894840d2dd04..0ba3cc7090cd 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -82,13 +82,13 @@ rec { # we have to keep all the numbers in the version to handle major/minor/patch level. # for <1.0. - garage_0_8_4 = generic { - version = "0.8.4"; - sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; - cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; + garage_0_8_5 = generic { + version = "0.8.5"; + sha256 = "sha256-YRxkjETSmI1dcHP9qTPLcOMqXx9B2uplVR3bBjJWn3I="; + cargoSha256 = "sha256-VOcymlvqqQRdT1MFzRcMuD+Xo3fc3XTuRA12tW7ZjdI="; }; - garage_0_8 = garage_0_8_4; + garage_0_8 = garage_0_8_5; garage_0_9_0 = (generic { version = "0.9.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f18b99caaed..c10d8fc71bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8474,7 +8474,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_4 garage_0_9_0; + garage_0_8_5 garage_0_9_0; garmintools = callPackage ../development/libraries/garmintools { }; From e8f1c9b2fb4ee502871157c4fcae4e2700fdbb46 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Jan 2024 10:21:47 -0500 Subject: [PATCH 2/4] garage_0_9: 0.9.0 -> 0.9.1 https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v0.9.1 Due to a recent change in the build system, we have to remove actively a file (`.cargo/config.toml`) to avoid the mold linker to leak during the linkage phase. Not sure if we should have more sophisticated ways to ignore this. --- pkgs/tools/filesystems/garage/default.nix | 25 +++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 0ba3cc7090cd..10735cea7ce3 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -24,6 +24,12 @@ let inherit sha256; }; + 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 cargoSha256; nativeBuildInputs = [ protobuf pkg-config ]; @@ -90,20 +96,13 @@ rec { garage_0_8 = garage_0_8_5; - garage_0_9_0 = (generic { - version = "0.9.0"; - sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8="; - cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o="; - }).overrideAttrs (oldAttrs: { - patches = oldAttrs.patches or [ ] ++ [ - (fetchpatch { - url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4.patch"; - sha256 = "sha256-q7E6gtPjnj5O/K837LMP6LPEFcgdkifxRFrYzBuqkk0="; - }) - ]; - }); + garage_0_9_1 = generic { + version = "0.9.1"; + sha256 = "sha256-AXLaifVmZU4j5D/wKn/0TzhjHZBzZW1+tMyhsAo2eBU="; + cargoSha256 = "sha256-4/+OsM73TroBB1TGqare2xASO5KhqVyNkkss0Y0JZXg="; + }; - garage_0_9 = garage_0_9_0; + garage_0_9 = garage_0_9_1; garage = garage_0_9; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c10d8fc71bdb..5ff775714606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8474,7 +8474,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_5 garage_0_9_0; + garage_0_8_5 garage_0_9_1; garmintools = callPackage ../development/libraries/garmintools { }; From 1c1f1d2f9b7e6ff5c2dfd0bd4b5773fd31a2818f Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Jan 2024 10:27:41 -0500 Subject: [PATCH 3/4] garage: add changelog meta attribute --- 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 10735cea7ce3..4e7c91971b89 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -74,6 +74,7 @@ let meta = { description = "S3-compatible object store for small self-hosted geo-distributed deployments"; + changelog = "https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v${version}"; homepage = "https://garagehq.deuxfleurs.fr"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ nickcao _0x4A6F teutat3s raitobezarius ]; From 5a930581457ee924d82142a993127d696694aef6 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 17 Jan 2024 22:05:06 -0500 Subject: [PATCH 4/4] garage_0_8: mark broken on darwin upstream did not backport fixes for darwin build failures to 0.8. users should be encouraged to upgrade. --- 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 4e7c91971b89..e34822845b40 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -93,6 +93,7 @@ rec { version = "0.8.5"; sha256 = "sha256-YRxkjETSmI1dcHP9qTPLcOMqXx9B2uplVR3bBjJWn3I="; cargoSha256 = "sha256-VOcymlvqqQRdT1MFzRcMuD+Xo3fc3XTuRA12tW7ZjdI="; + broken = stdenv.isDarwin; }; garage_0_8 = garage_0_8_5;