From f3e2270660940b07aa378d1a6c56adf70957b288 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:33:19 +0100 Subject: [PATCH] clickhouse: fetchCargoTarball -> fetchCargoVendor 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/clickhouse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index a7837947852e..b65285ef7133 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -120,21 +120,21 @@ mkDerivation rec { null; corrosionDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { src = corrosionSrc; name = "corrosion-deps"; preBuild = "cd generator"; - hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8="; + hash = "sha256-ok1QLobiGBccmbEEWQxHz3ivvuT6FrOgG6wLK4gIbgU="; } else null; rustDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { inherit src; name = "rust-deps"; preBuild = "cd rust"; - hash = "sha256-rbEfCRB2QAZ2WBgSLYYUqeYtI4Y5d9oQ2G8/mPirIp4="; + hash = "sha256-nX5wBM8rVMbaf/IrPsqkdT2KQklQbBIGomeWSTjclR4="; } else null;