Skip to content

Backport postgresql packaging changes done in nixpkgs #1716

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

Draft
wants to merge 15 commits into
base: update-nixpkgs
Choose a base branch
from
Draft

Backport postgresql packaging changes done in nixpkgs #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
97cd23d
feat(postgresql): move dynamic modules to default output
jfroche Jul 21, 2025
472804b
feat(postgresql): move libecpq to lib output
jfroche Jul 21, 2025
dd06610
feat(postgresql): split dev output
jfroche Jul 21, 2025
d8ad1b0
feat(postgresql): remove references to llvm-dev on darwin as well
jfroche Jul 21, 2025
79d408a
feat(postgresql): refactor removal of references in bitcode files
jfroche Jul 21, 2025
8c1949b
feat(postgresql): refactor to simplify condition
jfroche Jul 21, 2025
171882c
feat(postgresql): use systemdLibs
jfroche Jul 21, 2025
cfb7e31
feat(postgresql): postgresql_jit.pkgs.postgis: fix build on darwin
jfroche Jul 21, 2025
d7b8162
feat(postgresql): improve fake pg_config in default output
jfroche Jul 21, 2025
1534f07
feat(postgresql): replace `stdenv.is` with `stdenv.hostPlatform.is`
jfroche Jul 21, 2025
8daecd4
feat(postgresql): run full test-suite during checkPhase
jfroche Jul 21, 2025
b1727c9
feat(postgresql): use newer libuuid instead of ossp-uuid
jfroche Jul 21, 2025
7176b6d
feat(postgresql): simplify systemdSupport default value
jfroche Jul 21, 2025
6050efb
feat(postgresql): remove deprecated enableSystemd override
jfroche Jul 21, 2025
26dd9f4
wip
jfroche Jul 22, 2025
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
1 change: 0 additions & 1 deletion nix/cargo-pgrx/buildPgrxExtension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ let
cargo-pgrx pgrx stop all

mv $out/${postgresql}/* $out
mv $out/${postgresql.lib}/* $out
rm -rf $out/nix

${maybeLeaveBuildAndTestSubdir}
Expand Down
7 changes: 0 additions & 7 deletions nix/ext/tests/wrappers.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,18 @@ let
name = "postgresql-${majorVersion}-${pname}";
paths = [
postgresql
postgresql.lib
(installedExtension majorVersion)
];
passthru = {
inherit (postgresql) version psqlSchema;
lib = pkg;
withPackages = _: pkg;
};
nativeBuildInputs = [ pkgs.makeWrapper ];
pathsToLink = [
"/"
"/bin"
"/lib"
];
postBuild = ''
wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
wrapProgram $out/bin/pg_ctl --set NIX_PGLIBDIR $out/lib
wrapProgram $out/bin/pg_upgrade --set NIX_PGLIBDIR $out/lib
'';
};
in
pkg;
Expand Down
Loading