Skip to content

perf(nix): shrink postgres-env closure #2521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brainrake merged 14 commits into from
Oct 22, 2026
+36 −12
Merged

perf(nix): shrink postgres-env closure #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d3f77d3
perf(nix): shrink postgres-env closure
brainrake Oct 6, 2026
a654955
fix(nix): correct supautils path in checks
brainrake Oct 6, 2026
c092ba3
fix(nix): build old pg_net versions against current curl
brainrake Oct 6, 2026
fb463d5
refactor(nix): keep all extension versions in postgres-env
brainrake Oct 6, 2026
8a35d22
refactor(nix): drop supautils and site-env changes
brainrake Oct 7, 2026
4e3ee06
refactor(nix): leave postgres-env as on develop
brainrake Oct 8, 2026
cc5fc72
Merge branch 'develop' into martonboros/postgres-17-env-closure-size-…
brainrake Oct 8, 2026
b564dcf
fix(nix): link darwin pg_net curl against apple libiconv
brainrake Oct 8, 2026
b11d1e7
perf(nix): build pgbouncer against systemdLibs
brainrake Oct 8, 2026
bf83069
refactor(nix): leave pgrx stripping as on develop
brainrake Oct 8, 2026
283614a
Merge branch 'develop' into martonboros/postgres-17-env-closure-size-…
brainrake Oct 9, 2026
77f62e3
Merge branch 'develop' into martonboros/postgres-17-env-closure-size-…
brainrake Oct 19, 2026
2f09416
Merge remote-tracking branch 'origin/develop' into martonboros/postgr…
brainrake Oct 20, 2026
5c73b3e
refactor(nix): pick the darwin curl at the pg_net use site
brainrake Oct 20, 2026
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
30 changes: 25 additions & 5 deletions nix/ext/pg_net.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,39 @@
libuv,
makeWrapper,
switch-ext-version,
curl_8_6,
curl,
libidn2,
libpsl,
libunistring,
libiconv,
latestOnly ? false,
}:

let
curl = curl_8_6;
in
let
# nixpkgs builds libunistring against gnu libiconv on darwin, which collides with apple's in the cli bundle
curlAppleIconv =
let
libunistringApple = libunistring.override { libiconvReal = libiconv; };
libidn2Apple = libidn2.override { libunistring = libunistringApple; };
libpslApple =
(libpsl.override {
libidn2 = libidn2Apple;
libunistring = libunistringApple;
}).overrideAttrs
{ env.NIX_LDFLAGS = "-liconv"; };
in
curl.override {
libidn2 = libidn2Apple;
libpsl = libpslApple;
};
pname = "pg_net";
build =
version: hash:
stdenv.mkDerivation rec {
inherit pname version;

buildInputs = [
curl
(if stdenv.isDarwin then curlAppleIconv else curl)
postgresql
]
++ lib.optional (version == "0.6") libuv;
Expand All @@ -35,6 +52,9 @@ let
};

buildPhase = ''
${lib.optionalString (lib.versionOlder version "0.20.4") ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DCURL_DISABLE_TYPECHECK"
''}
make PG_CONFIG=${postgresql}/bin/pg_config
'';

Expand Down
6 changes: 5 additions & 1 deletion nix/ext/postgis.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@
coreutils,
cgal,
sfcgal,
boost,
icu75,
latestOnly ? false,
}:

let
boostIcu75 = boost.override { icu = icu75; };
# Hold cgal back to 6.0.2 until nixpkgs bumps sfcgal past 2.2.0 (incompatible with CGAL 6.1+).
sfcgal' =
assert lib.assertMsg (lib.versionAtLeast "2.2.0" sfcgal.version)
"sfcgal ${sfcgal.version} is newer than 2.2.0, drop the cgal 6.0.2 pin";
sfcgal.override {
cgal = cgal.overrideAttrs (_: {
boost = boostIcu75;
cgal = (cgal.override { boost = boostIcu75; }).overrideAttrs (_: {
version = "6.0.2";
src = fetchurl {
url = "https://github.com/CGAL/cgal/releases/download/v6.0.2/CGAL-6.0.2.tar.xz";
Expand Down
1 change: 0 additions & 1 deletion nix/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
};
in
_final: _prev: {
curl_8_6 = oldstable.curl;

@hitmands hitmands Oct 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is dropping this safe? what tests cover it?

@mmlb mmlb Oct 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like its handled by the export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DCURL_DISABLE_TYPECHECK" in pg_net

@brainrake brainrake Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Safe. Only pg_net used curl_8_6, and it now builds against the main curl. Old versions get -DCURL_DISABLE_TYPECHECK for the curl 8.17 header break, as @mmlb noted. Every pg_net version builds for 15 and 17, and the pg_net tests run in the check harness.

v8_oldstable = oldstable.v8;
}
)
Expand Down
4 changes: 2 additions & 2 deletions nix/pgbouncer.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
libevent,
c-ares,
pkg-config,
systemd,
systemdLibs,
nixosTests,
pandoc,
python3,
Expand All @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
openssl
c-ares
]
++ lib.optional stdenv.hostPlatform.isLinux systemd;
++ lib.optional stdenv.hostPlatform.isLinux systemdLibs;
enableParallelBuilding = true;
configureFlags = lib.optional stdenv.hostPlatform.isLinux "--with-systemd";

Expand Down
7 changes: 4 additions & 3 deletions nix/postgresql/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let
icu75,
lz4,
zstd,
systemd,
systemdLibs,
libossp_uuid,
pkg-config,
libxml2,
Expand All @@ -33,7 +33,8 @@ let
libxslt,

# This is important to obtain a version of `libpq` that does not depend on systemd.
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic,
systemdSupport ?
lib.meta.availableOn stdenv.hostPlatform systemdLibs && !stdenv.hostPlatform.isStatic,
enableSystemd ? null,
gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic,

Expand Down Expand Up @@ -120,7 +121,7 @@ let
++ lib.optionals (olderThan "13") [ libxcrypt ]
++ lib.optionals lz4Enabled [ lz4 ]
++ lib.optionals zstdEnabled [ zstd ]
++ lib.optionals systemdSupport' [ systemd ]
++ lib.optionals systemdSupport' [ systemdLibs ]
++ lib.optionals pythonSupport [ python3 ]
++ lib.optionals gssSupport [ libkrb5 ]
++ lib.optionals stdenv.isLinux [ linux-pam ]
Expand Down
Loading