Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_9;
};

buildPgrxExtension_0_14_3 = prev.buildPgrxExtension.override {
cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_14_3;
};

})
(final: prev: {
postgresql = final.callPackage ./nix/postgresql/default.nix {
Expand Down Expand Up @@ -417,6 +421,7 @@
cargo-pgrx_0_11_3 = pkgs.cargo-pgrx.cargo-pgrx_0_11_3;
cargo-pgrx_0_12_6 = pkgs.cargo-pgrx.cargo-pgrx_0_12_6;
cargo-pgrx_0_12_9 = pkgs.cargo-pgrx.cargo-pgrx_0_12_9;
cargo-pgrx_0_14_3 = pkgs.cargo-pgrx.cargo-pgrx_0_14_3;
# PostgreSQL versions.
psql_15 = postgresVersions.psql_15;
psql_17 = postgresVersions.psql_17;
Expand Down
12 changes: 11 additions & 1 deletion nix/cargo-pgrx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
, rust-bin
}:
let
rustVersion = "1.76.0";
rustVersion = "1.85.1";
rustPlatform = makeRustPlatform {
cargo = rust-bin.stable.${rustVersion}.default;
rustc = rust-bin.stable.${rustVersion}.default;
Expand All @@ -19,6 +19,11 @@ let
, cargoHash
}:
rustPlatform.buildRustPackage rec {
# rust-overlay uses 'cargo-auditable' wrapper for 'cargo' command, but it
# is using older version 0.18.1 of 'cargo_metadata' which doesn't support
# rust edition 2024, so we disable the 'cargo-auditable' just for now.
# ref: https://github.com/oxalica/rust-overlay/issues/153
auditable = false;
pname = "cargo-pgrx";
inherit version;
src = fetchCrate {
Expand Down Expand Up @@ -71,5 +76,10 @@ in
hash = "sha256-aR3DZAjeEEAjLQfZ0ZxkjLqTVMIEbU0UiZ62T4BkQq8=";
cargoHash = "sha256-53HKhvsKLTa2JCByLEcK3UzWXoM+LTatd98zvS1C9no=";
};
cargo-pgrx_0_14_3 = generic {
version = "0.14.3";
hash = "sha256-3TsNpEqNm3Uol5XPW1i0XEbP2fF2+RKB2d7lO6BDnvQ=";
cargoHash = "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk=";
};
inherit rustPlatform;
}
Loading