3
0
Fork 0
forked from mirrors/nixpkgs

nixpkgs: reorganize the postgresql extensions

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>
This commit is contained in:
Austin Seipp 2018-08-06 10:17:52 -05:00
parent 73f56ae191
commit 8cbe6b9ce4
15 changed files with 27 additions and 24 deletions

View file

@ -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 { };
@ -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 {};
@ -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;
@ -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 { };
@ -19612,8 +19619,6 @@ in
fftw = fftwSinglePrec;
};
timescaledb = callPackage ../servers/sql/postgresql/timescaledb {};
timewarrior = callPackage ../applications/misc/timewarrior { };
timidity = callPackage ../tools/misc/timidity { };
@ -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 { };