Skip to content

Commit b540067

Browse files
burmeciasamrose
andauthored
chore: add cargo pgrx v0.14.3 for nix (#1619)
* chore: add cargo pgrx v0.14.3 for nix * chore: update cargoHash --------- Co-authored-by: Sam Rose <[email protected]>
1 parent af325c0 commit b540067

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

flake.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_9;
7676
};
7777

78+
buildPgrxExtension_0_14_3 = prev.buildPgrxExtension.override {
79+
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_14_3;
80+
};
81+
7882
})
7983
(final: prev: {
8084
postgresql = final.callPackage ./nix/postgresql/default.nix {
@@ -417,6 +421,7 @@
417421
cargo-pgrx_0_11_3 = pkgs.cargo-pgrx.cargo-pgrx_0_11_3;
418422
cargo-pgrx_0_12_6 = pkgs.cargo-pgrx.cargo-pgrx_0_12_6;
419423
cargo-pgrx_0_12_9 = pkgs.cargo-pgrx.cargo-pgrx_0_12_9;
424+
cargo-pgrx_0_14_3 = pkgs.cargo-pgrx.cargo-pgrx_0_14_3;
420425
# PostgreSQL versions.
421426
psql_15 = postgresVersions.psql_15;
422427
psql_17 = postgresVersions.psql_17;

nix/cargo-pgrx/default.nix

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
, rust-bin
99
}:
1010
let
11-
rustVersion = "1.76.0";
11+
rustVersion = "1.85.1";
1212
rustPlatform = makeRustPlatform {
1313
cargo = rust-bin.stable.${rustVersion}.default;
1414
rustc = rust-bin.stable.${rustVersion}.default;
@@ -19,6 +19,11 @@ let
1919
, cargoHash
2020
}:
2121
rustPlatform.buildRustPackage rec {
22+
# rust-overlay uses 'cargo-auditable' wrapper for 'cargo' command, but it
23+
# is using older version 0.18.1 of 'cargo_metadata' which doesn't support
24+
# rust edition 2024, so we disable the 'cargo-auditable' just for now.
25+
# ref: https://github.com/oxalica/rust-overlay/issues/153
26+
auditable = false;
2227
pname = "cargo-pgrx";
2328
inherit version;
2429
src = fetchCrate {
@@ -69,7 +74,12 @@ in
6974
cargo-pgrx_0_12_9 = generic {
7075
version = "0.12.9";
7176
hash = "sha256-aR3DZAjeEEAjLQfZ0ZxkjLqTVMIEbU0UiZ62T4BkQq8=";
72-
cargoHash = "sha256-53HKhvsKLTa2JCByLEcK3UzWXoM+LTatd98zvS1C9no=";
77+
cargoHash = "sha256-KTKcol9qSNLQZGW32e6fBb6cPkUGItknyVpLdBYqrBY=";
78+
};
79+
cargo-pgrx_0_14_3 = generic {
80+
version = "0.14.3";
81+
hash = "sha256-3TsNpEqNm3Uol5XPW1i0XEbP2fF2+RKB2d7lO6BDnvQ=";
82+
cargoHash = "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk=";
7383
};
7484
inherit rustPlatform;
7585
}

0 commit comments

Comments
 (0)