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.
This commit is contained in:
@@ -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 = [
|
||||
|
||||
Reference in New Issue
Block a user