diff options
author | Austin Seipp <aseipp@pobox.com> | 2018-08-06 10:17:52 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-01-19 17:33:32 -0600 |
commit | 8cbe6b9ce421f5f214bcca92d5d18d12104edeb7 (patch) | |
tree | 1d4e5f2ca0aa8c5b0f6bd1fba75bc76164c4fe07 | |
parent | 73f56ae19126109caa02bdfdc42ac2e633de00be (diff) | |
download | nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.tar nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.tar.gz nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.tar.bz2 nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.tar.lz nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.tar.xz nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.tar.zst nixlib-8cbe6b9ce421f5f214bcca92d5d18d12104edeb7.zip |
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>
-rw-r--r-- | pkgs/development/java-modules/postgresql_jdbc/default.nix (renamed from pkgs/servers/sql/postgresql/jdbc/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/psqlodbc/default.nix (renamed from pkgs/servers/sql/postgresql/psqlodbc/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/cstore_fdw.nix (renamed from pkgs/servers/sql/postgresql/cstore_fdw/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_cron.nix (renamed from pkgs/servers/sql/postgresql/pg_cron/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_hll.nix (renamed from pkgs/servers/sql/postgresql/pg_hll/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_repack.nix (renamed from pkgs/servers/sql/postgresql/pg_repack/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_similarity.nix (renamed from pkgs/servers/sql/postgresql/pg_similarity/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_topn.nix (renamed from pkgs/servers/sql/postgresql/topn/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgjwt.nix (renamed from pkgs/servers/sql/postgresql/pgjwt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgroonga.nix (renamed from pkgs/servers/sql/postgresql/pgroonga/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgtap.nix (renamed from pkgs/servers/sql/postgresql/pgtap/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/plv8.nix (renamed from pkgs/servers/sql/postgresql/plv8/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/timescaledb.nix (renamed from pkgs/servers/sql/postgresql/timescaledb/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/tsearch_extras.nix (renamed from pkgs/servers/sql/postgresql/tsearch_extras/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 51 |
15 files changed, 27 insertions, 24 deletions
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index c67d72705482..c67d72705482 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 2364e0913bc8..2364e0913bc8 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index a6e2c590f385..a6e2c590f385 100644 --- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 959c2c382524..959c2c382524 100644 --- a/pkgs/servers/sql/postgresql/pg_cron/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index f91a8b1bf252..f91a8b1bf252 100644 --- a/pkgs/servers/sql/postgresql/pg_hll/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 14f71b1e2b3b..14f71b1e2b3b 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 32945c9fa62b..32945c9fa62b 100644 --- a/pkgs/servers/sql/postgresql/pg_similarity/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index dae30aadabd0..dae30aadabd0 100644 --- a/pkgs/servers/sql/postgresql/topn/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index ab7ba8943a7b..ab7ba8943a7b 100644 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 8a185990725f..8a185990725f 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 6386049be395..6386049be395 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index dae3b2fd1af1..dae3b2fd1af1 100644 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 3c53054ba7de..3c53054ba7de 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index b43a9c51be0c..b43a9c51be0c 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9daaa2c0880..6c43ae2f354e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |