Skip to content

Commit 6cfc9b9

Browse files
authored
feat: update rust to 1.84.0 and related needed changes (#1590)
1 parent 1dde4ab commit 6cfc9b9

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/ext/pg_graphql.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ buildPgrxExtension_0_12_9 rec {
2727
# Setting RUSTFLAGS in env to ensure it's available for all phases
2828
env = lib.optionalAttrs stdenv.isDarwin {
2929
POSTGRES_LIB = "${postgresql}/lib";
30-
PGPORT = if (lib.versions.major postgresql.version) == "17" then "5440" else "5439";
30+
PGPORT = toString (5430 +
31+
(if builtins.match ".*_.*" postgresql.version != null then 1 else 0) + # +1 for OrioleDB
32+
((builtins.fromJSON (builtins.substring 0 2 postgresql.version)) - 15) * 2); # +2 for each major version
3133
RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup";
3234
NIX_BUILD_CORES = "4"; # Limit parallel jobs
3335
CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism

nix/ext/wrappers/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
, git
1313
}:
1414
let
15-
rustVersion = "1.81.0";
15+
rustVersion = "1.84.0";
1616
cargo = rust-bin.stable.${rustVersion}.default;
1717
in
1818
buildPgrxExtension_0_12_9 rec {
@@ -50,7 +50,7 @@ buildPgrxExtension_0_12_9 rec {
5050
# - PostgreSQL 15.8 → 5435 + 0 + (15-15)*2 = 5435
5151
# - PostgreSQL 17_0 (OrioleDB) → 5435 + 1 + (17-15)*2 = 5440
5252
# - PostgreSQL 17.4 → 5435 + 0 + (17-15)*2 = 5439
53-
PGPORT = toString (5435 +
53+
PGPORT = toString (5534 +
5454
(if builtins.match ".*_.*" postgresql.version != null then 1 else 0) + # +1 for OrioleDB
5555
((builtins.fromJSON (builtins.substring 0 2 postgresql.version)) - 15) * 2); # +2 for each major version
5656
};

0 commit comments

Comments
 (0)