Skip to content

postgresql: minor rearrangements #54344

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
thoughtpolice merged 2 commits into from
Jan 19, 2019
Merged

postgresql: minor rearrangements #54344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c75847
nixpkgs: move postgresql patches into a common directory
thoughtpolice Aug 6, 2018
d2f5646
nixpkgs: reorganize the postgresql extensions
thoughtpolice Aug 6, 2018
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
0 pkgs/servers/sql/postgresql/jdbc/default.nix → .../java-modules/postgresql_jdbc/default.nix
View file
Open in desktop
File renamed without changes.
0 ...rvers/sql/postgresql/psqlodbc/default.nix → ...evelopment/libraries/psqlodbc/default.nix
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions pkgs/servers/sql/postgresql/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ let
] ++ lib.optionals icuEnabled [ "--with-icu" ];

patches =
[ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
(if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch)
(if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch)
./specify_pkglibdir_at_runtime.patch
[ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch)
(if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch)
(if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch)
./patches/specify_pkglibdir_at_runtime.patch
];

installTargets = [ "install-world" ];
Expand Down
0 ...ers/sql/postgresql/cstore_fdw/default.nix → ...servers/sql/postgresql/ext/cstore_fdw.nix
View file
Open in desktop
File renamed without changes.
0 ...ervers/sql/postgresql/pg_cron/default.nix → pkgs/servers/sql/postgresql/ext/pg_cron.nix
View file
Open in desktop
File renamed without changes.
0 ...servers/sql/postgresql/pg_hll/default.nix → pkgs/servers/sql/postgresql/ext/pg_hll.nix
View file
Open in desktop
File renamed without changes.
0 ...vers/sql/postgresql/pg_repack/default.nix → .../servers/sql/postgresql/ext/pg_repack.nix
View file
Open in desktop
File renamed without changes.
0 .../sql/postgresql/pg_similarity/default.nix → ...vers/sql/postgresql/ext/pg_similarity.nix
View file
Open in desktop
File renamed without changes.
0 pkgs/servers/sql/postgresql/topn/default.nix → pkgs/servers/sql/postgresql/ext/pg_topn.nix
View file
Open in desktop
File renamed without changes.
0 .../servers/sql/postgresql/pgjwt/default.nix → pkgs/servers/sql/postgresql/ext/pgjwt.nix
View file
Open in desktop
File renamed without changes.
0 ...rvers/sql/postgresql/pgroonga/default.nix → pkgs/servers/sql/postgresql/ext/pgroonga.nix
View file
Open in desktop
File renamed without changes.
0 .../servers/sql/postgresql/pgtap/default.nix → pkgs/servers/sql/postgresql/ext/pgtap.nix
View file
Open in desktop
File renamed without changes.
0 pkgs/servers/sql/postgresql/plv8/default.nix → pkgs/servers/sql/postgresql/ext/plv8.nix
View file
Open in desktop
File renamed without changes.
0 ...rs/sql/postgresql/timescaledb/default.nix → ...ervers/sql/postgresql/ext/timescaledb.nix
View file
Open in desktop
File renamed without changes.
0 ...sql/postgresql/tsearch_extras/default.nix → ...ers/sql/postgresql/ext/tsearch_extras.nix
View file
Open in desktop
File renamed without changes.
0 ...tgresql/disable-resolve_symlinks-94.patch → ...patches/disable-resolve_symlinks-94.patch
View file
Open in desktop
File renamed without changes.
0 ...postgresql/disable-resolve_symlinks.patch → ...ql/patches/disable-resolve_symlinks.patch
View file
Open in desktop
File renamed without changes.
0 ...ql/postgresql/hardcode-pgxs-path-96.patch → ...resql/patches/hardcode-pgxs-path-96.patch
View file
Open in desktop
File renamed without changes.
0 ...s/sql/postgresql/hardcode-pgxs-path.patch → ...stgresql/patches/hardcode-pgxs-path.patch
View file
Open in desktop
File renamed without changes.
0 ...vers/sql/postgresql/less-is-more-96.patch → .../postgresql/patches/less-is-more-96.patch
View file
Open in desktop
File renamed without changes.
0 ...servers/sql/postgresql/less-is-more.patch → ...sql/postgresql/patches/less-is-more.patch
View file
Open in desktop
File renamed without changes.
0 ...gresql/specify_pkglibdir_at_runtime.patch → ...atches/specify_pkglibdir_at_runtime.patch
View file
Open in desktop
File renamed without changes.
51 changes: 27 additions & 24 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3211,17 +3211,36 @@ in

pgf_graphics = callPackage ../tools/graphics/pgf { };

pgjwt = callPackage ../servers/sql/postgresql/pgjwt {};

cstore_fdw = callPackage ../servers/sql/postgresql/cstore_fdw {};
# postgresql extensions

pg_hll = callPackage ../servers/sql/postgresql/pg_hll {};
cstore_fdw = callPackage ../servers/sql/postgresql/ext/cstore_fdw.nix {};

pg_cron = callPackage ../servers/sql/postgresql/pg_cron {};
pg_cron = callPackage ../servers/sql/postgresql/ext/pg_cron.nix {};

pgtap = callPackage ../servers/sql/postgresql/pgtap {};
pg_hll = callPackage ../servers/sql/postgresql/ext/pg_hll.nix {};

pg_topn = callPackage ../servers/sql/postgresql/topn {};
pgjwt = callPackage ../servers/sql/postgresql/ext/pgjwt.nix {};

pg_repack = callPackage ../servers/sql/postgresql/ext/pg_repack.nix {};

pgroonga = callPackage ../servers/sql/postgresql/ext/pgroonga.nix {};

plv8 = callPackage ../servers/sql/postgresql/ext/plv8.nix {
v8 = callPackage ../development/libraries/v8/plv8_6_x.nix {
inherit (python2Packages) python;
};
};

pg_similarity = callPackage ../servers/sql/postgresql/ext/pg_similarity.nix {};

pgtap = callPackage ../servers/sql/postgresql/ext/pgtap.nix {};

pg_topn = callPackage ../servers/sql/postgresql/ext/pg_topn.nix {};

timescaledb = callPackage ../servers/sql/postgresql/ext/timescaledb.nix {};

tsearch_extras = callPackage ../servers/sql/postgresql/ext/tsearch_extras.nix { };

pigz = callPackage ../tools/compression/pigz { };

Expand Down Expand Up @@ -11978,18 +11997,6 @@ in

pdf2xml = callPackage ../development/libraries/pdf2xml {} ;

pg_repack = callPackage ../servers/sql/postgresql/pg_repack {};

pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};

pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};

plv8 = callPackage ../servers/sql/postgresql/plv8 {
v8 = callPackage ../development/libraries/v8/plv8_6_x.nix {
inherit (python2Packages) python;
};
};

phonon = callPackage ../development/libraries/phonon {};

phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
Expand Down Expand Up @@ -13931,7 +13938,7 @@ in
postgresql_10
postgresql_11;

postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };

inherit (callPackage ../servers/monitoring/prometheus {
buildGoPackage = buildGo110Package;
Expand Down Expand Up @@ -13971,7 +13978,7 @@ in
prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { };

psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
psqlodbc = callPackage ../development/libraries/psqlodbc { };

pure-ftpd = callPackage ../servers/ftp/pure-ftpd { };

Expand Down Expand Up @@ -19612,8 +19619,6 @@ in
fftw = fftwSinglePrec;
};

timescaledb = callPackage ../servers/sql/postgresql/timescaledb {};

timewarrior = callPackage ../applications/misc/timewarrior { };

timidity = callPackage ../tools/misc/timidity { };
Expand Down Expand Up @@ -19699,8 +19704,6 @@ in

trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };

tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };

tudu = callPackage ../applications/office/tudu { };

tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
Expand Down