Skip to content

postgresql.pg_config: make overrideable#426704

Merged
Ma27 merged 3 commits intoNixOS:stagingfrom
wolfgangwalther:postgresql-pg-config-without-dev
Aug 13, 2025
Merged

postgresql.pg_config: make overrideable#426704
Ma27 merged 3 commits intoNixOS:stagingfrom
wolfgangwalther:postgresql-pg-config-without-dev

Conversation

@wolfgangwalther
Copy link
Copy Markdown
Contributor

@wolfgangwalther wolfgangwalther commented Jul 19, 2025 •
edited
Loading

This allows postgresql.withPackages to easily override the paths to the default and man outputs for pg_config. It avoids all buildEnv-dev-output hackery, which it didn't properly support, and separates the logic cleanly.

Closes #425384, reverts #426048.

Things done

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 6.topic: python Python is a high-level, general-purpose programming language. labels Jul 19, 2025
@wolfgangwalther wolfgangwalther mentioned this pull request Jul 19, 2025
Closed
13 tasks
@wolfgangwalther wolfgangwalther force-pushed the postgresql-pg-config-without-dev branch from d7082d8 to a7ff1c9 Compare July 19, 2025 16:50
@wolfgangwalther wolfgangwalther changed the base branch from master to staging July 19, 2025 16:52
@nixpkgs-ci nixpkgs-ci bot closed this Jul 19, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Jul 19, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jul 19, 2025
@wolfgangwalther
Copy link
Copy Markdown
Contributor Author

wolfgangwalther commented Jul 19, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 426704 --checkout commit --package postgresqlPackages.omnigres --package python3Packages.pgvector --package python3Packages.langgraph-checkpoint-postgres
Commit: a7ff1c9901fdcad97247401301c0d550be0bb970

x86_64-linux

✅ 5 packages built:
  • postgresqlPackages.omnigres
  • python3Packages.langgraph-checkpoint-postgres
  • python3Packages.langgraph-checkpoint-postgres.dist (python3Packages.langgraph-checkpoint-postgres.dist.dist)
  • python3Packages.pgvector
  • python3Packages.pgvector.dist (python3Packages.pgvector.dist.dist)

aarch64-linux

✅ 5 packages built:
  • postgresqlPackages.omnigres
  • python3Packages.langgraph-checkpoint-postgres
  • python3Packages.langgraph-checkpoint-postgres.dist (python3Packages.langgraph-checkpoint-postgres.dist.dist)
  • python3Packages.pgvector
  • python3Packages.pgvector.dist (python3Packages.pgvector.dist.dist)

aarch64-darwin

✅ 3 packages built:
  • postgresqlPackages.omnigres
  • python3Packages.langgraph-checkpoint-postgres
  • python3Packages.langgraph-checkpoint-postgres.dist (python3Packages.langgraph-checkpoint-postgres.dist.dist)

@wolfgangwalther wolfgangwalther marked this pull request as ready for review July 19, 2025 20:22
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jul 19, 2025
@wolfgangwalther
Copy link
Copy Markdown
Contributor Author

wolfgangwalther commented Jul 20, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 426704 --checkout commit --package postgresql_18.pg_config --package postgresql_13.pg_config --package libpq.pg_config --package postgresql.pg_config --package postgresql_jit.pg_config
Commit: a7ff1c9901fdcad97247401301c0d550be0bb970

x86_64-linux

✅ 5 packages built:
  • libpq.pg_config
  • postgresql.pg_config
  • postgresql_13.pg_config
  • postgresql_18.pg_config
  • postgresql_jit.pg_config

aarch64-linux

✅ 5 packages built:
  • libpq.pg_config
  • postgresql.pg_config
  • postgresql_13.pg_config
  • postgresql_18.pg_config
  • postgresql_jit.pg_config

aarch64-darwin

✅ 5 packages built:
  • libpq.pg_config
  • postgresql.pg_config
  • postgresql_13.pg_config
  • postgresql_18.pg_config
  • postgresql_jit.pg_config

@wolfgangwalther
Copy link
Copy Markdown
Contributor Author

wolfgangwalther commented Jul 20, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 426704 --checkout commit --package pkgsCross.x86_64-freebsd.libpq.pg_config --package pkgsCross.x86_64-freebsd.postgresql.pg_config --package pkgsStatic.postgresql.pg_config --package pkgsStatic.libpq.pg_config
Commit: a7ff1c9901fdcad97247401301c0d550be0bb970

x86_64-linux

✅ 4 packages built:
  • pkgsCross.x86_64-freebsd.libpq.pg_config
  • pkgsCross.x86_64-freebsd.postgresql.pg_config
  • pkgsStatic.libpq.pg_config
  • pkgsStatic.postgresql.pg_config

aarch64-linux

✅ 4 packages built:
  • pkgsCross.x86_64-freebsd.libpq.pg_config
  • pkgsCross.x86_64-freebsd.postgresql.pg_config
  • pkgsStatic.libpq.pg_config
  • pkgsStatic.postgresql.pg_config

@Ma27
Copy link
Copy Markdown
Member

Ma27 commented Jul 20, 2025

Looks reasonable on a first glance, but would like to take a closer look. May take a few days, too much other stuff on my plate.

This was referenced Jul 21, 2025
Merged
Merged
@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 24, 2025
This was referenced Aug 4, 2025
Merged
Merged
@wolfgangwalther
postgresql.pg_config: make overrideable
f8bc00e 
This allows `postgresql.withPackages` to easily override the paths to
the default and man outputs for `pg_config`. It avoids all
`buildEnv`-dev-output hackery, which it didn't properly support, and
separates the logic cleanly.
@wolfgangwalther
Revert "python3Packages.pgvector: temporarily disable checkPhase"
43fddf0 
This reverts commit 39767f9.
@wolfgangwalther
Revert "python3Packages.langgraph-checkpoint-postgres: temporarily di…
267991c 
…sable checkPhase"

This reverts commit 6dee2b6.
@wolfgangwalther wolfgangwalther force-pushed the postgresql-pg-config-without-dev branch from a7ff1c9 to 267991c Compare August 4, 2025 14:53
@wolfgangwalther
Copy link
Copy Markdown
Contributor Author

wolfgangwalther commented Aug 4, 2025

Rebased after the nixfmt-bump merge conflict.

I would like to proceed with this, because all pg extension's passthru tests are still broken without it.

@Ma27 did you have a chance to look at it a bit more?

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. labels Aug 4, 2025
@Ma27
Copy link
Copy Markdown
Member

Ma27 commented Aug 10, 2025

Sorry, no. Will do my best to do that either today or in the upcoming days!

Ma27
Ma27 approved these changes Aug 13, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

I'm happy that the messing with multi-out buildEnv can go, thanks! 🎉

@Ma27 Ma27 merged commit 9024fc9 into NixOS:staging Aug 13, 2025
27 of 28 checks passed
@wolfgangwalther wolfgangwalther deleted the postgresql-pg-config-without-dev branch August 13, 2025 16:05
@schonfinkel schonfinkel mentioned this pull request Aug 18, 2025
Merged
@wolfgangwalther wolfgangwalther mentioned this pull request Aug 23, 2025
Merged
13 tasks
gepbird added a commit to gepbird/nixpkgs that referenced this pull request Aug 23, 2025
@gepbird
Revert "froide: fix initdb not being in PATH"
3826354 
This reverts commit ae730b3.

The underlying issue was properly fixed in
NixOS#426704.
The commit this reverts was a temporary workaround.
@wolfgangwalther wolfgangwalther mentioned this pull request Aug 24, 2025
Draft
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ma27 Ma27 Ma27 approved these changes

@natsukium natsukium Awaiting requested review from natsukium

@drupol drupol Awaiting requested review from drupol

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

+1 more reviewer

@sarahec sarahec sarahec approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wolfgangwalther @Ma27 @sarahec