From 9ef7195e08f0a546f4d130c752dfaa21c0ddbfea Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 10 Mar 2024 16:28:01 +0100 Subject: [PATCH] postgresql: refactor to move packages.nix to ext/default.nix (1/2) This commit is split up into two commits to allow git to detect renames, make rebasing easier and allow a working entry in .git-blame-ignore-revs. To allow bisecting we allow evaluation on every commit by moving the extensions into ext/ext/ first and back to ext/ with the next commit. --- pkgs/servers/sql/postgresql/default.nix | 2 +- pkgs/servers/sql/postgresql/{packages.nix => ext/default.nix} | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/age.nix | 0 .../sql/postgresql/ext/{ => ext}/apache_datasketches.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/citus.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/cstore_fdw.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/h3-pg.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/hypopg.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/jsonb_deep_sum.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/lantern.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/periods.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_auto_failover.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_bigm.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_cron.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ed25519.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_embedding.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hint_plan.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hll.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ivm.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_net.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_partman.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_rational.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_relusage.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_repack.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_safeupdate.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_similarity.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_squeeze.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_topn.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pg_uuidv7.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgaudit.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgjwt.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgroonga.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgrouting.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgsodium.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgsql-http.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgtap.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/pgvector.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/plpgsql_check.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/plr.nix | 0 .../{ => ext}/plv8/0001-build-Allow-using-V8-from-system.patch | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/default.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/postgis.nix | 0 .../sql/postgresql/ext/{ => ext}/promscale_extension.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/repmgr.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/rum.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/smlar.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/tds_fdw.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/temporal_tables.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb.nix | 0 .../sql/postgresql/ext/{ => ext}/timescaledb_toolkit.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/tsearch_extras.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/tsja.nix | 0 pkgs/servers/sql/postgresql/ext/{ => ext}/wal2json.nix | 0 53 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/sql/postgresql/{packages.nix => ext/default.nix} (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/age.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/apache_datasketches.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/citus.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/cstore_fdw.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/h3-pg.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/hypopg.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/jsonb_deep_sum.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/lantern.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/periods.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_auto_failover.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_bigm.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_cron.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ed25519.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_embedding.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hint_plan.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_hll.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_ivm.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_net.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_partman.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_rational.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_relusage.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_repack.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_safeupdate.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_similarity.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_squeeze.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_topn.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pg_uuidv7.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgaudit.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgjwt.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgroonga.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgrouting.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgsodium.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgsql-http.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgtap.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/pgvector.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plpgsql_check.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plr.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/0001-build-Allow-using-V8-from-system.patch (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/plv8/default.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/postgis.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/promscale_extension.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/repmgr.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/rum.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/smlar.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/tds_fdw.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/temporal_tables.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/timescaledb_toolkit.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/tsearch_extras.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/tsja.nix (100%) rename pkgs/servers/sql/postgresql/ext/{ => ext}/wal2json.nix (100%) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cfb9553a6d03..015150bfd7a4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -283,7 +283,7 @@ let }; newSelf = self // scope; newSuper = { callPackage = newScope (scope // this.pkgs); }; - in import ./packages.nix newSelf newSuper; + in import ./ext newSelf newSuper; withPackages = postgresqlWithPackages { inherit makeWrapper buildEnv; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/ext/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/packages.nix rename to pkgs/servers/sql/postgresql/ext/default.nix diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/ext/age.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/age.nix rename to pkgs/servers/sql/postgresql/ext/ext/age.nix diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/apache_datasketches.nix rename to pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/ext/citus.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/citus.nix rename to pkgs/servers/sql/postgresql/ext/ext/citus.nix diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/cstore_fdw.nix rename to pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/h3-pg.nix rename to pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/ext/hypopg.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/hypopg.nix rename to pkgs/servers/sql/postgresql/ext/ext/hypopg.nix diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix rename to pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/ext/lantern.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/lantern.nix rename to pkgs/servers/sql/postgresql/ext/ext/lantern.nix diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/ext/periods.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/periods.nix rename to pkgs/servers/sql/postgresql/ext/ext/periods.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_bigm.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_cron.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_ed25519.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_embedding.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_hll.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_ivm.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_net.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_net.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_net.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_partman.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_rational.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_relusage.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_repack.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_similarity.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_squeeze.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_topn.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix rename to pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgaudit.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgjwt.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgroonga.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgrouting.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgsodium.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgsql-http.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/ext/pgtap.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgtap.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgtap.nix diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/ext/pgvector.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/pgvector.nix rename to pkgs/servers/sql/postgresql/ext/ext/pgvector.nix diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plpgsql_check.nix rename to pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/ext/plr.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plr.nix rename to pkgs/servers/sql/postgresql/ext/ext/plr.nix diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch rename to pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/plv8/default.nix rename to pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/ext/postgis.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/postgis.nix rename to pkgs/servers/sql/postgresql/ext/ext/postgis.nix diff --git a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/promscale_extension.nix rename to pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/ext/repmgr.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/repmgr.nix rename to pkgs/servers/sql/postgresql/ext/ext/repmgr.nix diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/ext/rum.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/rum.nix rename to pkgs/servers/sql/postgresql/ext/ext/rum.nix diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/ext/smlar.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/smlar.nix rename to pkgs/servers/sql/postgresql/ext/ext/smlar.nix diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/tds_fdw.nix rename to pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/temporal_tables.nix rename to pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/timescaledb.nix rename to pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix rename to pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/tsearch_extras.nix rename to pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/ext/tsja.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/tsja.nix rename to pkgs/servers/sql/postgresql/ext/ext/tsja.nix diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/ext/wal2json.nix similarity index 100% rename from pkgs/servers/sql/postgresql/ext/wal2json.nix rename to pkgs/servers/sql/postgresql/ext/ext/wal2json.nix