From 6b80d2f0042fd0acc5a601cf824b3edfea408803 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 28 Jan 2025 13:58:06 +0100 Subject: [PATCH] polaris: 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. We've checked that fetchCargoVendor produces the same hash on Darwin (with case-insensitive filesystem) and Linux. --- pkgs/servers/polaris/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index ee8ea856c939..0746ab26bca4 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -30,9 +30,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = if stdenv.buildPlatform.isDarwin - then "sha256-HTqsghjfSjwOaN/ApPFvWVEoquZzE3MYzULkhUOXIWI" - else "sha256-Z3AbYtdNAyKT5EuGtCktEg0fxs/gpKdsrttRkxZhLAU"; + useFetchCargoVendor = true; + cargoHash = "sha256-bVXz/rSfkmdQlAa3B4zamZebpRBOkch6zNOFiyEQBbY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security