Skip to content

Commit

Permalink
luaPackages: fetchCargoTarball -> fetchCargoVendor
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
alyssais committed Jan 30, 2025
1 parent 4abf4c9 commit 9691082
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkgs/development/lua-modules/overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -505,9 +505,9 @@ in

lua-rtoml = prev.lua-rtoml.overrideAttrs (oa: {

cargoDeps = rustPlatform.fetchCargoTarball {
cargoDeps = rustPlatform.fetchCargoVendor {
src = oa.src;
hash = "sha256-EcP4eYsuOVeEol+kMqzsVHd8F2KoBdLzf6K0KsYToUY=";
hash = "sha256-7mFn4dLgaxfAxtPFCc3VzcBx2HuywcZTYqCGTbaGS0k=";
};

propagatedBuildInputs = oa.propagatedBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
Expand Down Expand Up @@ -831,9 +831,9 @@ in
});

tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: {
cargoDeps = rustPlatform.fetchCargoTarball {
cargoDeps = rustPlatform.fetchCargoVendor {
src = oa.src;
hash = "sha256-pKqG8aiV8BvvDO6RE6J3HEA/S4E4QunbO4WBpV5jUYk=";
hash = "sha256-sO2q4cmkJc6T4iyJUWpBfr2ISycS1cXAIO0ibMfzyIE=";
};
nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
});
Expand All @@ -846,9 +846,9 @@ in

toml-edit = prev.toml-edit.overrideAttrs (oa: {

cargoDeps = rustPlatform.fetchCargoTarball {
cargoDeps = rustPlatform.fetchCargoVendor {
src = oa.src;
hash = "sha256-lguGj8fDqztrvqvEYVcJLmiuxPDaCpXU8aztInKjF+E=";
hash = "sha256-ow0zefFFrU91Q2PJww2jtd6nqUjwXUtfQzjkzl/AXuo=";
};

NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin
Expand Down

0 comments on commit 9691082

Please sign in to comment.