From 9ece6360742f4bd42e8f79196fdde6fb3a2f23b3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 15:34:21 +0100 Subject: [PATCH] plasma5Packages.angelfish: 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. Taking a cargoSha256 parameter isn't a good idea, because it will produce a silently broken FOD if we change the hashing scheme, like we're doing here. Overlays should provide a full cargoDeps object, which wouldn't have that problem, because the overlay would be responsible for the whole FOD. --- pkgs/applications/kde/angelfish.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 22b24f112ce9..43f1241c66ad 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -24,9 +24,6 @@ rustPlatform, rustc, srcs, - - # provided as callPackage input to enable easier overrides through overlays - cargoSha256 ? "sha256-PSrTo7nGgH0KxA82RlBEwtOu80WMCBeaCxHj3n7SgEE=", }: mkDerivation rec { @@ -40,11 +37,11 @@ mkDerivation rec { }) ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { # include version in the name so we invalidate the FOD name = "${pname}-${srcs.angelfish.version}"; inherit (srcs.angelfish) src; - sha256 = cargoSha256; + hash = "sha256-M3CtP7eWqOxMvnak6K3QvB/diu4jAfMmlsa6ySFIHCU="; }; nativeBuildInputs = [