From 2752c62485ff33d6c3ddd759e80adc1f457133af Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:38:18 +0100 Subject: [PATCH 1/2] nextcloud-notify_push: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/nextcloud/notify_push.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index b4996cfb7fde..98a99b69f7eb 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA="; }; - cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE="; + useFetchCargoVendor = true; + cargoHash = "sha256-bO3KN+ynxNdbnFv1ZHJSSPWd4SxWQGIis3O3Gfba8jw="; passthru = rec { test_client = rustPlatform.buildRustPackage { From b0cc9f5a8bc59dd02af19cc5e8c85a314136ed76 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 28 Jan 2025 11:45:15 +0100 Subject: [PATCH 2/2] nextcloud-notify_push.test_client: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/nextcloud/notify_push.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 98a99b69f7eb..821e7be598c8 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-SBEuFOTgqNjPtKx0PFDA5Gkiksn3cZEmYcs2shAo2Po="; + useFetchCargoVendor = true; + cargoHash = "sha256-bO3KN+ynxNdbnFv1ZHJSSPWd4SxWQGIis3O3Gfba8jw="; meta = meta // { mainProgram = "test_client";