From a9ca3264166311726f8ae26c206fb83418c3d9e2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 30 Jan 2025 16:23:05 +0100 Subject: [PATCH] sile: 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. The dontConfigure line can be removed in staging, as it's the default there. --- pkgs/by-name/si/sile/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 307df39ca282..b2b1d7a27871 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+9pZUDszPYJmFgHbZH0aKtZ6qLcJjh73jG2CFoRKxWc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; + dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-qw5XvXFhYLQJalk3fQwKakgBwfWMjhJzHKbqjchE2V0="; + hash = "sha256-FdUrivumG5R69CwZedpkBzds5PcZr4zSsA6QW/+rDBM="; }; nativeBuildInputs = [