File tree Expand file tree Collapse file tree 3 files changed +11
-9
lines changed Expand file tree Collapse file tree 3 files changed +11
-9
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 1212, git
1313} :
1414let
15- rustVersion = "1.81 .0" ;
15+ rustVersion = "1.84 .0" ;
1616 cargo = rust-bin . stable . ${ rustVersion } . default ;
1717in
1818buildPgrxExtension_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 } ;
You can’t perform that action at this time.
0 commit comments