From feb6df150f04fd097ebe698729bdeaed216ca990 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:35:52 +0100 Subject: [PATCH] cargo-pgrx: 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. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 5da7f839e9b2..fdcdfee56a9a 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -24,6 +24,7 @@ let inherit version pname hash; }; + useFetchCargoVendor = true; inherit cargoHash; nativeBuildInputs = [ @@ -60,19 +61,19 @@ in cargo-pgrx_0_12_0_alpha_1 = generic { version = "0.12.0-alpha.1"; hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; - cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; + cargoHash = "sha256-zYjqE7LZLnTaVxWAPWC1ncEjCMlrhy4THtgecB7wBYY="; }; cargo-pgrx_0_12_5 = generic { version = "0.12.5"; hash = "sha256-U2kF+qjQwMTaocv5f4p5y3qmPUsTzdvAp8mz9cn/COw="; - cargoHash = "sha256-nEgIOBGNG3TupA55/TgoXDPeJzjBjOGGfK+WjrH06VY="; + cargoHash = "sha256-CycwWvxYrHj7lmTiiNC1WdbFgrdlGr/M3qTN/N+7xQA="; }; cargo-pgrx_0_12_6 = generic { version = "0.12.6"; hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; - cargoHash = "sha256-Di4UldQwAt3xVyvgQT1gUhdvYUVp7n/a72pnX45kP0w="; + cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08="; }; }