From 8cbe6b9ce421f5f214bcca92d5d18d12104edeb7 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 6 Aug 2018 10:17:52 -0500 Subject: [PATCH] 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 --- .../java-modules/postgresql_jdbc}/default.nix | 0 .../libraries}/psqlodbc/default.nix | 0 .../default.nix => ext/cstore_fdw.nix} | 0 .../{pg_cron/default.nix => ext/pg_cron.nix} | 0 .../{pg_hll/default.nix => ext/pg_hll.nix} | 0 .../default.nix => ext/pg_repack.nix} | 0 .../default.nix => ext/pg_similarity.nix} | 0 .../{topn/default.nix => ext/pg_topn.nix} | 0 .../{pgjwt/default.nix => ext/pgjwt.nix} | 0 .../default.nix => ext/pgroonga.nix} | 0 .../{pgtap/default.nix => ext/pgtap.nix} | 0 .../{plv8/default.nix => ext/plv8.nix} | 0 .../default.nix => ext/timescaledb.nix} | 0 .../default.nix => ext/tsearch_extras.nix} | 0 pkgs/top-level/all-packages.nix | 51 ++++++++++--------- 15 files changed, 27 insertions(+), 24 deletions(-) rename pkgs/{servers/sql/postgresql/jdbc => development/java-modules/postgresql_jdbc}/default.nix (100%) rename pkgs/{servers/sql/postgresql => development/libraries}/psqlodbc/default.nix (100%) rename pkgs/servers/sql/postgresql/{cstore_fdw/default.nix => ext/cstore_fdw.nix} (100%) rename pkgs/servers/sql/postgresql/{pg_cron/default.nix => ext/pg_cron.nix} (100%) rename pkgs/servers/sql/postgresql/{pg_hll/default.nix => ext/pg_hll.nix} (100%) rename pkgs/servers/sql/postgresql/{pg_repack/default.nix => ext/pg_repack.nix} (100%) rename pkgs/servers/sql/postgresql/{pg_similarity/default.nix => ext/pg_similarity.nix} (100%) rename pkgs/servers/sql/postgresql/{topn/default.nix => ext/pg_topn.nix} (100%) rename pkgs/servers/sql/postgresql/{pgjwt/default.nix => ext/pgjwt.nix} (100%) rename pkgs/servers/sql/postgresql/{pgroonga/default.nix => ext/pgroonga.nix} (100%) rename pkgs/servers/sql/postgresql/{pgtap/default.nix => ext/pgtap.nix} (100%) rename pkgs/servers/sql/postgresql/{plv8/default.nix => ext/plv8.nix} (100%) rename pkgs/servers/sql/postgresql/{timescaledb/default.nix => ext/timescaledb.nix} (100%) rename pkgs/servers/sql/postgresql/{tsearch_extras/default.nix => ext/tsearch_extras.nix} (100%) diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/jdbc/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/psqlodbc/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/cstore_fdw/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pg_cron/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pg_hll/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pg_repack/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pg_similarity/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/topn/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pgjwt/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pgroonga/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/pgtap/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/plv8/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/timescaledb/default.nix rename to 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 similarity index 100% rename from pkgs/servers/sql/postgresql/tsearch_extras/default.nix rename to 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 { };