From 719034f6f6749d624faa28dff259309fc0e3e730 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 Feb 2024 21:15:34 +0100
Subject: [PATCH] postgresql: refactor to move packages.nix to ext/default.nix
 (2/2)

This aligns more with the commonly used style in nixpkgs.
---
 .../sql/postgresql/ext/{ext => }/age.nix      |   0
 .../ext/{ext => }/apache_datasketches.nix     |   0
 .../sql/postgresql/ext/{ext => }/citus.nix    |   0
 .../postgresql/ext/{ext => }/cstore_fdw.nix   |   0
 pkgs/servers/sql/postgresql/ext/default.nix   | 106 +++++++++---------
 .../sql/postgresql/ext/{ext => }/h3-pg.nix    |   0
 .../sql/postgresql/ext/{ext => }/hypopg.nix   |   0
 .../ext/{ext => }/jsonb_deep_sum.nix          |   0
 .../sql/postgresql/ext/{ext => }/lantern.nix  |   0
 .../sql/postgresql/ext/{ext => }/periods.nix  |   0
 .../ext/{ext => }/pg_auto_failover.nix        |   0
 .../sql/postgresql/ext/{ext => }/pg_bigm.nix  |   0
 .../sql/postgresql/ext/{ext => }/pg_cron.nix  |   0
 .../postgresql/ext/{ext => }/pg_ed25519.nix   |   0
 .../postgresql/ext/{ext => }/pg_embedding.nix |   0
 .../postgresql/ext/{ext => }/pg_hint_plan.nix |   0
 .../sql/postgresql/ext/{ext => }/pg_hll.nix   |   0
 .../sql/postgresql/ext/{ext => }/pg_ivm.nix   |   0
 .../sql/postgresql/ext/{ext => }/pg_net.nix   |   0
 .../postgresql/ext/{ext => }/pg_partman.nix   |   0
 .../postgresql/ext/{ext => }/pg_rational.nix  |   0
 .../postgresql/ext/{ext => }/pg_relusage.nix  |   0
 .../postgresql/ext/{ext => }/pg_repack.nix    |   0
 .../ext/{ext => }/pg_safeupdate.nix           |   0
 .../ext/{ext => }/pg_similarity.nix           |   0
 .../postgresql/ext/{ext => }/pg_squeeze.nix   |   0
 .../sql/postgresql/ext/{ext => }/pg_topn.nix  |   0
 .../postgresql/ext/{ext => }/pg_uuidv7.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgaudit.nix  |   0
 .../sql/postgresql/ext/{ext => }/pgjwt.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgroonga.nix |   0
 .../postgresql/ext/{ext => }/pgrouting.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgsodium.nix |   0
 .../postgresql/ext/{ext => }/pgsql-http.nix   |   0
 .../sql/postgresql/ext/{ext => }/pgtap.nix    |   0
 .../sql/postgresql/ext/{ext => }/pgvector.nix |   0
 .../ext/{ext => }/plpgsql_check.nix           |   0
 .../sql/postgresql/ext/{ext => }/plr.nix      |   0
 ...001-build-Allow-using-V8-from-system.patch |   0
 .../postgresql/ext/{ext => }/plv8/default.nix |   0
 .../sql/postgresql/ext/{ext => }/postgis.nix  |   0
 .../ext/{ext => }/promscale_extension.nix     |   0
 .../sql/postgresql/ext/{ext => }/repmgr.nix   |   0
 .../sql/postgresql/ext/{ext => }/rum.nix      |   0
 .../sql/postgresql/ext/{ext => }/smlar.nix    |   0
 .../sql/postgresql/ext/{ext => }/tds_fdw.nix  |   0
 .../ext/{ext => }/temporal_tables.nix         |   0
 .../postgresql/ext/{ext => }/timescaledb.nix  |   0
 .../ext/{ext => }/timescaledb_toolkit.nix     |   0
 .../ext/{ext => }/tsearch_extras.nix          |   0
 .../sql/postgresql/ext/{ext => }/tsja.nix     |   0
 .../sql/postgresql/ext/{ext => }/wal2json.nix |   0
 52 files changed, 53 insertions(+), 53 deletions(-)
 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/ext/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/age.nix
rename to pkgs/servers/sql/postgresql/ext/age.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/apache_datasketches.nix
rename to pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/citus.nix
rename to pkgs/servers/sql/postgresql/ext/citus.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/cstore_fdw.nix
rename to pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix
index eabcb0613c0d..b6181da6cf02 100644
--- a/pkgs/servers/sql/postgresql/ext/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/default.nix
@@ -1,107 +1,107 @@
 self: super: {
 
-    age = super.callPackage ./ext/age.nix { };
+    age = super.callPackage ./age.nix { };
 
-    anonymizer = super.callPackage ./ext/anonymizer.nix { };
+    anonymizer = super.callPackage ./anonymizer.nix { };
 
-    apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { };
+    apache_datasketches = super.callPackage ./apache_datasketches.nix { };
 
-    citus = super.callPackage ./ext/citus.nix { };
+    citus = super.callPackage ./citus.nix { };
 
-    h3-pg = super.callPackage ./ext/h3-pg.nix { };
+    h3-pg = super.callPackage ./h3-pg.nix { };
 
-    hypopg = super.callPackage ./ext/hypopg.nix { };
+    hypopg = super.callPackage ./hypopg.nix { };
 
-    jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { };
+    jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { };
 
-    lantern = super.callPackage ./ext/lantern.nix { };
+    lantern = super.callPackage ./lantern.nix { };
 
-    periods = super.callPackage ./ext/periods.nix { };
+    periods = super.callPackage ./periods.nix { };
 
-    postgis = super.callPackage ./ext/postgis.nix { };
+    postgis = super.callPackage ./postgis.nix { };
 
-    pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { };
+    pg_auto_failover = super.callPackage ./pg_auto_failover.nix { };
 
-    pg_bigm = super.callPackage ./ext/pg_bigm.nix { };
+    pg_bigm = super.callPackage ./pg_bigm.nix { };
 
-    pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { };
+    pg_ed25519 = super.callPackage ./pg_ed25519.nix { };
 
-    pg_embedding = super.callPackage ./ext/pg_embedding.nix { };
+    pg_embedding = super.callPackage ./pg_embedding.nix { };
 
-    pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { };
+    pg_hint_plan = super.callPackage ./pg_hint_plan.nix { };
 
-    pg_ivm = super.callPackage ./ext/pg_ivm.nix { };
+    pg_ivm = super.callPackage ./pg_ivm.nix { };
 
-    pg_rational = super.callPackage ./ext/pg_rational.nix { };
+    pg_rational = super.callPackage ./pg_rational.nix { };
 
-    pg_repack = super.callPackage ./ext/pg_repack.nix { };
+    pg_repack = super.callPackage ./pg_repack.nix { };
 
-    pg_similarity = super.callPackage ./ext/pg_similarity.nix { };
+    pg_similarity = super.callPackage ./pg_similarity.nix { };
 
-    pgaudit = super.callPackage ./ext/pgaudit.nix { };
+    pgaudit = super.callPackage ./pgaudit.nix { };
 
-    pgroonga = super.callPackage ./ext/pgroonga.nix { };
+    pgroonga = super.callPackage ./pgroonga.nix { };
 
-    pgsodium = super.callPackage ./ext/pgsodium.nix { };
+    pgsodium = super.callPackage ./pgsodium.nix { };
 
-    pgsql-http = super.callPackage ./ext/pgsql-http.nix { };
+    pgsql-http = super.callPackage ./pgsql-http.nix { };
 
-    pgvecto-rs = super.callPackage ./ext/pgvecto-rs { };
+    pgvecto-rs = super.callPackage ./pgvecto-rs { };
 
-    pgvector = super.callPackage ./ext/pgvector.nix { };
+    pgvector = super.callPackage ./pgvector.nix { };
 
-    plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };
+    plpgsql_check = super.callPackage ./plpgsql_check.nix { };
 
-    plr = super.callPackage ./ext/plr.nix { };
+    plr = super.callPackage ./plr.nix { };
 
-    plv8 = super.callPackage ./ext/plv8 { };
+    plv8 = super.callPackage ./plv8 { };
 
-    pgjwt = super.callPackage ./ext/pgjwt.nix { };
+    pgjwt = super.callPackage ./pgjwt.nix { };
 
-    cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { };
+    cstore_fdw = super.callPackage ./cstore_fdw.nix { };
 
-    pg_hll = super.callPackage ./ext/pg_hll.nix { };
+    pg_hll = super.callPackage ./pg_hll.nix { };
 
-    pg_cron = super.callPackage ./ext/pg_cron.nix { };
+    pg_cron = super.callPackage ./pg_cron.nix { };
 
-    pg_topn = super.callPackage ./ext/pg_topn.nix { };
+    pg_topn = super.callPackage ./pg_topn.nix { };
 
-    pg_net = super.callPackage ./ext/pg_net.nix { };
+    pg_net = super.callPackage ./pg_net.nix { };
 
-    pgtap = super.callPackage ./ext/pgtap.nix { };
+    pgtap = super.callPackage ./pgtap.nix { };
 
-    smlar = super.callPackage ./ext/smlar.nix { };
+    smlar = super.callPackage ./smlar.nix { };
 
-    temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
+    temporal_tables = super.callPackage ./temporal_tables.nix { };
 
-    timescaledb = super.callPackage ./ext/timescaledb.nix { };
-    timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
+    timescaledb = super.callPackage ./timescaledb.nix { };
+    timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; };
 
-    timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { };
+    timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { };
 
-    tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
+    tsearch_extras = super.callPackage ./tsearch_extras.nix { };
 
-    tds_fdw = super.callPackage ./ext/tds_fdw.nix { };
+    tds_fdw = super.callPackage ./tds_fdw.nix { };
 
-    pgrouting = super.callPackage ./ext/pgrouting.nix { };
+    pgrouting = super.callPackage ./pgrouting.nix { };
 
-    pg_partman = super.callPackage ./ext/pg_partman.nix { };
+    pg_partman = super.callPackage ./pg_partman.nix { };
 
-    pg_relusage = super.callPackage ./ext/pg_relusage.nix { };
+    pg_relusage = super.callPackage ./pg_relusage.nix { };
 
-    pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
+    pg_safeupdate = super.callPackage ./pg_safeupdate.nix { };
 
-    pg_squeeze = super.callPackage ./ext/pg_squeeze.nix { };
+    pg_squeeze = super.callPackage ./pg_squeeze.nix { };
 
-    pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { };
+    pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { };
 
-    promscale_extension = super.callPackage ./ext/promscale_extension.nix { };
+    promscale_extension = super.callPackage ./promscale_extension.nix { };
 
-    repmgr = super.callPackage ./ext/repmgr.nix { };
+    repmgr = super.callPackage ./repmgr.nix { };
 
-    rum = super.callPackage ./ext/rum.nix { };
+    rum = super.callPackage ./rum.nix { };
 
-    tsja = super.callPackage ./ext/tsja.nix { };
+    tsja = super.callPackage ./tsja.nix { };
 
-    wal2json = super.callPackage ./ext/wal2json.nix { };
+    wal2json = super.callPackage ./wal2json.nix { };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/h3-pg.nix
rename to pkgs/servers/sql/postgresql/ext/h3-pg.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/hypopg.nix
rename to pkgs/servers/sql/postgresql/ext/hypopg.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/jsonb_deep_sum.nix
rename to pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/lantern.nix
rename to pkgs/servers/sql/postgresql/ext/lantern.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/periods.nix
rename to pkgs/servers/sql/postgresql/ext/periods.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_auto_failover.nix
rename to pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_bigm.nix
rename to pkgs/servers/sql/postgresql/ext/pg_bigm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_cron.nix
rename to pkgs/servers/sql/postgresql/ext/pg_cron.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_ed25519.nix
rename to pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_embedding.nix
rename to pkgs/servers/sql/postgresql/ext/pg_embedding.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_hint_plan.nix
rename to pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_hll.nix
rename to pkgs/servers/sql/postgresql/ext/pg_hll.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_ivm.nix
rename to pkgs/servers/sql/postgresql/ext/pg_ivm.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_net.nix
rename to pkgs/servers/sql/postgresql/ext/pg_net.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_partman.nix
rename to pkgs/servers/sql/postgresql/ext/pg_partman.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_rational.nix
rename to pkgs/servers/sql/postgresql/ext/pg_rational.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_relusage.nix
rename to pkgs/servers/sql/postgresql/ext/pg_relusage.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_repack.nix
rename to pkgs/servers/sql/postgresql/ext/pg_repack.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_safeupdate.nix
rename to pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_similarity.nix
rename to pkgs/servers/sql/postgresql/ext/pg_similarity.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_squeeze.nix
rename to pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_topn.nix
rename to pkgs/servers/sql/postgresql/ext/pg_topn.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pg_uuidv7.nix
rename to pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgaudit.nix
rename to pkgs/servers/sql/postgresql/ext/pgaudit.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgjwt.nix
rename to pkgs/servers/sql/postgresql/ext/pgjwt.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgroonga.nix
rename to pkgs/servers/sql/postgresql/ext/pgroonga.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgrouting.nix
rename to pkgs/servers/sql/postgresql/ext/pgrouting.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgsodium.nix
rename to pkgs/servers/sql/postgresql/ext/pgsodium.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgsql-http.nix
rename to pkgs/servers/sql/postgresql/ext/pgsql-http.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgtap.nix
rename to pkgs/servers/sql/postgresql/ext/pgtap.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/pgvector.nix
rename to pkgs/servers/sql/postgresql/ext/pgvector.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plpgsql_check.nix
rename to pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plr.nix
rename to pkgs/servers/sql/postgresql/ext/plr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plv8/0001-build-Allow-using-V8-from-system.patch
rename to pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch
diff --git a/pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/plv8/default.nix
rename to pkgs/servers/sql/postgresql/ext/plv8/default.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/postgis.nix
rename to pkgs/servers/sql/postgresql/ext/postgis.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/promscale_extension.nix
rename to pkgs/servers/sql/postgresql/ext/promscale_extension.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/repmgr.nix
rename to pkgs/servers/sql/postgresql/ext/repmgr.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/rum.nix
rename to pkgs/servers/sql/postgresql/ext/rum.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/smlar.nix
rename to pkgs/servers/sql/postgresql/ext/smlar.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/tds_fdw.nix
rename to pkgs/servers/sql/postgresql/ext/tds_fdw.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/temporal_tables.nix
rename to pkgs/servers/sql/postgresql/ext/temporal_tables.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/timescaledb.nix
rename to pkgs/servers/sql/postgresql/ext/timescaledb.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/timescaledb_toolkit.nix
rename to pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/tsearch_extras.nix
rename to pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/tsja.nix
rename to pkgs/servers/sql/postgresql/ext/tsja.nix
diff --git a/pkgs/servers/sql/postgresql/ext/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
similarity index 100%
rename from pkgs/servers/sql/postgresql/ext/ext/wal2json.nix
rename to pkgs/servers/sql/postgresql/ext/wal2json.nix