From 924f85ec5bb2abff9bc0a8060ce628b92ee25584 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:09:13 +0100 Subject: [PATCH] kdePackages.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 cargoHash 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/kde/gear/angelfish/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 991196cb0cb1..3d6a8ae1ae44 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -7,8 +7,6 @@ rustPlatform, cargo, rustc, - # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-Q8cKnW4IpcpNrECXtgkPX8TdYqC5Fo4oXm1lB8RULRo=", qcoro, }: mkKdeDerivation rec { @@ -19,7 +17,7 @@ mkKdeDerivation rec { # include version in the name so we invalidate the FOD name = "${pname}-${version}"; src = sources.${pname}; - hash = cargoHash; + hash = "sha256-offD53HaPG0GQk+aPjRzhhc8d8wfHYmdaJ0X8NtluMU="; }; extraNativeBuildInputs = [