Skip to content

Commit 5154fd6

Browse files
committed
gg-jj: 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.
1 parent b19c3c8 commit 5154fd6

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pkgs/by-name/gg/gg-jj/package.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
3737
buildAndTestSubdir = "src-tauri";
3838

3939
# FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed
40-
cargoDeps = rustPlatform.fetchCargoTarball {
41-
inherit (finalAttrs) pname version src patches;
40+
cargoDeps = rustPlatform.fetchCargoVendor {
41+
inherit (finalAttrs)
42+
pname
43+
version
44+
src
45+
patches
46+
;
4247
# Tries to apply patches inside cargoRoot.
4348
prePatch = "pushd ..";
4449
postPatch = "popd";
4550
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
46-
hash = "sha256-inwETdMRKmJklkdjkcGuJuHaXwa5GyJEk7zo2r2li+M=";
51+
hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM=";
4752
};
4853

4954
npmDeps = fetchNpmDeps {

0 commit comments

Comments
 (0)