Skip to content

postgresql: minor rearrangements#54344

Merged
thoughtpolice merged 2 commits intoNixOS:masterfrom
thoughtpolice:stage/pgsql-tweaks1
Jan 19, 2019
Merged

postgresql: minor rearrangements#54344
thoughtpolice merged 2 commits intoNixOS:masterfrom
thoughtpolice:stage/pgsql-tweaks1

Conversation

@thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Jan 19, 2019

Motivation for this change

Some changes from #38698.

cc @danbst

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 19, 2019
@thoughtpolice
Copy link
Member Author

thoughtpolice commented Jan 19, 2019

Oh, I don't think these need to go to staging. I thought they had a rebuild, but maybe not.

@danbst
Copy link
Contributor

danbst commented Jan 19, 2019

@thoughtpolice you can change base from Github UI (edit button near PR name)

@thoughtpolice
nixpkgs: move postgresql patches into a common directory
3c75847 
This simply makes it easier to browse the PostgreSQL package directory. More to
come.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
@thoughtpolice
nixpkgs: reorganize the postgresql extensions
d2f5646 
This is a backwards compatible change; it mostly puts all the extensions
for postgresql in a common directory to keep them isolated.

It also moves a few things that /were not/ extensions out into other parts of
the filesystem namespace; namely the postgresql_jdbc and psqlodbc libraries
were moved under development/java-modules and development/libraries,
respectively. Because these libraries use the libpq postgresql client drivers,
they're less sensitive to underlying version changes anyway (since the protocol
is relatively stable).

No attributes were renamed or harmed in the creation of this patch.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
@thoughtpolice thoughtpolice changed the base branch from staging to master January 19, 2019 23:31
@thoughtpolice
Copy link
Member Author

thoughtpolice commented Jan 19, 2019

Ah, I did that. And now I remember why I don't do that anymore (because it picks in staging.) Sigh. Fixing.

@thoughtpolice thoughtpolice merged commit 8cbe6b9 into NixOS:master Jan 19, 2019
@thoughtpolice thoughtpolice deleted the stage/pgsql-tweaks1 branch January 19, 2019 23:33
@GrahamcOfBorg GrahamcOfBorg added 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 8.has: documentation This PR adds or changes documentation 2.status: merge conflict This PR has merge conflicts with the target branch labels Jan 19, 2019
@nixos-discourse
Copy link

nixos-discourse commented Jan 23, 2019

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/heads-up-upcoming-changes-to-the-postgresql-infrastructure-and-nixos-module/297/5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@danbst danbst danbst approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thoughtpolice @danbst @nixos-discourse @GrahamcOfBorg