Skip to content

Commit 93f86b0

Browse files
committed
kanata: useFetchCargoVendor
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. Being optimistic that fetchCargoVendor will have resolved the case-insensitivity issues.
1 parent c48916c commit 93f86b0

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

pkgs/by-name/ka/kanata/package.nix

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,8 @@ rustPlatform.buildRustPackage rec {
2222
sha256 = "sha256-cG9so0x0y8CbTxLOxSQwn5vG72KxHJzzTIH4lQA4MvE=";
2323
};
2424

25-
cargoHash = "sha256-QQrFUJ24Qnrx8+7+h9riycXZSQUdH1sXMhpDzU9AXiI=";
26-
27-
# the dependency native-windows-gui contains both README.md and readme.md,
28-
# which causes a hash mismatch on systems with a case-insensitive filesystem
29-
# this removes the readme files and updates cargo's checksum file accordingly
30-
depsExtraArgs = {
31-
nativeBuildInputs = [
32-
jq
33-
moreutils
34-
];
35-
36-
postBuild = ''
37-
pushd $name/native-windows-gui
38-
39-
rm --force --verbose README.md readme.md
40-
jq 'del(.files."README.md") | del(.files."readme.md")' \
41-
.cargo-checksum.json -c \
42-
| sponge .cargo-checksum.json
43-
44-
popd
45-
'';
46-
};
25+
useFetchCargoVendor = true;
26+
cargoHash = "sha256-VKvle1hQae+0Vbvd7Epq3cDqG8OV5J2mowF5lue59oc=";
4727

4828
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
4929

0 commit comments

Comments
 (0)