Skip to content

Commit 9d40b9a

Browse files
committed
add cargo pgrx 0.14.3 package build
1 parent eb79e32 commit 9d40b9a

File tree

4 files changed

+38
-22
lines changed

4 files changed

+38
-22
lines changed

flake.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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: 11 additions & 1 deletion
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 {
@@ -71,5 +76,10 @@ in
7176
hash = "sha256-aR3DZAjeEEAjLQfZ0ZxkjLqTVMIEbU0UiZ62T4BkQq8=";
7277
cargoHash = "sha256-53HKhvsKLTa2JCByLEcK3UzWXoM+LTatd98zvS1C9no=";
7378
};
79+
cargo-pgrx_0_14_3 = generic {
80+
version = "0.14.3";
81+
hash = "sha256-3TsNpEqNm3Uol5XPW1i0XEbP2fF2+RKB2d7lO6BDnvQ=";
82+
cargoHash = "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk=";
83+
};
7484
inherit rustPlatform;
7585
}

nix/ext/wrappers/default.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
, openssl
55
, pkg-config
66
, postgresql
7-
, buildPgrxExtension_0_12_9
7+
, buildPgrxExtension_0_14_3
88
, cargo
99
, darwin
1010
, jq
@@ -15,7 +15,8 @@ let
1515
rustVersion = "1.85.1";
1616
cargo = rust-bin.stable.${rustVersion}.default;
1717
in
18-
buildPgrxExtension_0_12_9 rec {
18+
buildPgrxExtension_0_14_3 rec {
19+
auditable = false;
1920
pname = "supabase-wrappers";
2021
version = "0.5.1";
2122
# update the following array when the wrappers version is updated
@@ -66,7 +67,7 @@ buildPgrxExtension_0_12_9 rec {
6667
allowBuiltinFetchGit = false;
6768
outputHashes = {
6869
"clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o";
69-
"iceberg-0.5.0" = "sha256-dYPZdpP7kcp49UxsCZrZi3xMJ4rJiB8H65dMMR9Z1Yk";
70+
"iceberg-0.5.0" = "sha256-dYPZdpP7kcp49UxsCZrZi3xMJ4rJiB8H65dMMR9Z1Yk=";
7071
};
7172
};
7273

0 commit comments

Comments
 (0)