From fd3338c8bef5f7f9c2004e37cf784210605c641b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 28 Jan 2025 10:39:28 +0100 Subject: [PATCH] mdbook: use 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/by-name/md/mdbook/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 52fa8ca72ca1..fff84963849e 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -11,7 +11,7 @@ let version = "0.4.43"; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { inherit version; pname = "mdbook"; @@ -22,7 +22,11 @@ rustPlatform.buildRustPackage { hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI="; }; - cargoHash = "sha256-8K72sJywMKxX/31SJuCEoacWvHrpkuwGGLXJ9MsDkTE="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + allowGitDependencies = false; + hash = "sha256-W5hg6ECNQRIh07ogZkXTn51el2YltutY86aJBYFDTP4="; + }; nativeBuildInputs = [ installShellFiles ];