diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix
new file mode 100644
index 000000000000..5095275a423d
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext.nix
@@ -0,0 +1,14 @@
+self: super:
+let
+  inherit (self) lib config;
+in
+(lib.packagesFromDirectoryRecursive {
+  inherit (super) callPackage;
+  directory = ./ext;
+})
+// {
+  timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
+}
+// lib.optionalAttrs config.allowAliases {
+  pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)";
+}
diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index ca052c4c7ff7..6c8b5fbd3f57 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -1,12 +1,12 @@
 {
-  lib,
-  stdenv,
   bison,
   fetchFromGitHub,
   flex,
+  lib,
   perl,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
 let
@@ -17,17 +17,16 @@ let
     "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM=";
     "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E=";
     "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw=";
-    "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4=";
   };
 in
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "age";
   version = "1.5.0-rc0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "age";
-    rev = "PG${lib.versions.major postgresql.version}/v${
+    tag = "PG${lib.versions.major postgresql.version}/v${
       builtins.replaceStrings [ "." ] [ "_" ] version
     }";
     hash =
@@ -73,13 +72,13 @@ buildPostgresqlExtension rec {
     '';
   };
 
-  meta = with lib; {
-    broken = !builtins.elem (versions.major postgresql.version) (builtins.attrNames hashes);
+  meta = {
+    broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes);
     description = "Graph database extension for PostgreSQL";
     homepage = "https://age.apache.org/";
     changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index e70a6afad1c4..71e7624d2677 100644
--- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -1,16 +1,16 @@
 {
+  jitSupport,
   lib,
-  stdenv,
+  llvm,
+  nixosTests,
   pg-dump-anon,
   postgresql,
+  postgresqlBuildExtension,
   runtimeShell,
-  jitSupport,
-  llvm,
-  buildPostgresqlExtension,
-  nixosTests,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "postgresql_anonymizer";
 
   inherit (pg-dump-anon) version src;
diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
index 25c06e6c038c..fa7200198277 100644
--- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
@@ -1,11 +1,11 @@
 {
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  postgresql,
   boost186,
+  fetchFromGitHub,
+  lib,
+  postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
 let
@@ -15,7 +15,7 @@ let
     name = "datasketches-postgresql";
     owner = "apache";
     repo = "datasketches-postgresql";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-W41uAs3W4V7c9O/wBw3rut65bcmY8EdQS1/tPszMGqA=";
   };
 
@@ -23,12 +23,12 @@ let
     name = "datasketches-cpp";
     owner = "apache";
     repo = "datasketches-cpp";
-    rev = "refs/tags/5.0.2";
+    tag = "5.0.2";
     hash = "sha256-yGk1OckYipAgLTQK6w6p6EdHMxBIQSjPV/MMND3cDks=";
   };
 in
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "apache_datasketches";
   inherit version;
 
diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
index 7877f48a7620..c20accfbbacd 100644
--- a/pkgs/servers/sql/postgresql/ext/citus.nix
+++ b/pkgs/servers/sql/postgresql/ext/citus.nix
@@ -1,43 +1,49 @@
 {
-  lib,
-  stdenv,
   curl,
   fetchFromGitHub,
+  fetchpatch,
+  lib,
   lz4,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "citus";
-  version = "13.0.0";
+  version = "13.0.2";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "citus";
-    rev = "v${version}";
-    hash = "sha256-1if/rYMQV1RG4ZkjqTFuFYu5f1JhJiMF4rCVo8gp7+8=";
+    tag = "v${version}";
+    hash = "sha256-SuJs6OCHKO7efQagsATgn/V9rgMyuXQIHGCEP9ME7tQ=";
   };
 
+  patches = [
+    # Even though this commit is on main since Sep 2023, it hasn't made its way to the release-13.0 branch, yet.
+    # https://github.com/citusdata/citus/pull/7221
+    # Fixes build for PG 16 + 17 on darwin
+    (fetchpatch {
+      url = "https://github.com/citusdata/citus/commit/0f28a69f12418d211ffba5f7ddd222fd0c47daeb.patch";
+      hash = "sha256-8JAM+PUswzbdlAZUpRApgO0eBsMbUHFdFGsdATsG88I=";
+    })
+  ];
+
   buildInputs = [
     curl
     lz4
   ];
 
-  meta = with lib; {
+  meta = {
     # "Our soft policy for Postgres version compatibility is to support Citus'
     # latest release with Postgres' 3 latest releases."
     # https://www.citusdata.com/updates/v12-0/#deprecated_features
-    broken =
-      versionOlder postgresql.version "14"
-      ||
-        # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708
-        # Check after next package update.
-        (versionAtLeast postgresql.version "17" && version == "12.1.6");
+    broken = lib.versionOlder postgresql.version "15";
     description = "Distributed PostgreSQL as an extension";
     homepage = "https://www.citusdata.com/";
     changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
     inherit (postgresql.meta) platforms;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index b9223e4beecc..d6abe6b3e8dd 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -1,13 +1,13 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   protobufc,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension {
+postgresqlBuildExtension {
   pname = "cstore_fdw";
   version = "1.7.0-unstable-2021-03-08";
 
@@ -18,15 +18,15 @@ buildPostgresqlExtension {
     owner = "citusdata";
     repo = "cstore_fdw";
     rev = "90e22b62fbee6852529104fdd463f532cf7a3311";
-    sha256 = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc=";
+    hash = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc=";
   };
 
-  meta = with lib; {
-    broken = versionAtLeast postgresql.version "14";
+  meta = {
+    broken = lib.versionAtLeast postgresql.version "14";
     description = "Columnar storage for PostgreSQL";
     homepage = "https://github.com/citusdata/cstore_fdw";
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = postgresql.meta.platforms;
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/default.nix b/pkgs/servers/sql/postgresql/ext/default.nix
deleted file mode 100644
index 1c65255d056f..000000000000
--- a/pkgs/servers/sql/postgresql/ext/default.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-self: super: let
-  inherit (self) lib config;
-in {
-
-    age = super.callPackage ./age.nix { };
-
-    anonymizer = super.callPackage ./anonymizer.nix { };
-
-    apache_datasketches = super.callPackage ./apache_datasketches.nix { };
-
-    citus = super.callPackage ./citus.nix { };
-
-    h3-pg = super.callPackage ./h3-pg.nix { };
-
-    hypopg = super.callPackage ./hypopg.nix { };
-
-    jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { };
-
-    lantern = super.callPackage ./lantern.nix { };
-
-    periods = super.callPackage ./periods.nix { };
-
-    postgis = super.callPackage ./postgis.nix { };
-
-    pg_auto_failover = super.callPackage ./pg_auto_failover.nix { };
-
-    pg_byteamagic = super.callPackage ./pg_byteamagic.nix { };
-
-    pg_bigm = super.callPackage ./pg_bigm.nix { };
-
-    pg_ed25519 = super.callPackage ./pg_ed25519.nix { };
-
-    pg_hint_plan = super.callPackage ./pg_hint_plan.nix { };
-
-    pg_ivm = super.callPackage ./pg_ivm.nix { };
-
-    pg_libversion = super.callPackage ./pg_libversion.nix { };
-
-    pg_rational = super.callPackage ./pg_rational.nix { };
-
-    pg_repack = super.callPackage ./pg_repack.nix { };
-
-    pg_similarity = super.callPackage ./pg_similarity.nix { };
-
-    pgaudit = super.callPackage ./pgaudit.nix { };
-
-    pgmq = super.callPackage ./pgmq.nix { };
-
-    pgroonga = super.callPackage ./pgroonga.nix { };
-
-    pgsodium = super.callPackage ./pgsodium.nix { };
-
-    pgsql-http = super.callPackage ./pgsql-http.nix { };
-
-    pgvecto-rs = super.callPackage ./pgvecto-rs { };
-
-    pgvector = super.callPackage ./pgvector.nix { };
-
-    plpgsql_check = super.callPackage ./plpgsql_check.nix { };
-
-    plr = super.callPackage ./plr.nix { };
-
-    plv8 = super.callPackage ./plv8 { };
-
-    pgjwt = super.callPackage ./pgjwt.nix { };
-
-    cstore_fdw = super.callPackage ./cstore_fdw.nix { };
-
-    pg_hll = super.callPackage ./pg_hll.nix { };
-
-    pg_cron = super.callPackage ./pg_cron.nix { };
-
-    pg_tle = super.callPackage ./pg_tle.nix { };
-
-    pg_topn = super.callPackage ./pg_topn.nix { };
-
-    pg_net = super.callPackage ./pg_net.nix { };
-
-    pg-gvm = super.callPackage ./pg-gvm.nix { };
-
-    pg-semver = super.callPackage ./pg-semver.nix { };
-
-    pgtap = super.callPackage ./pgtap.nix { };
-
-    smlar = super.callPackage ./smlar.nix { };
-
-    system_stats = super.callPackage ./system_stats.nix { };
-
-    temporal_tables = super.callPackage ./temporal_tables.nix { };
-
-    timescaledb = super.callPackage ./timescaledb.nix { };
-    timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; };
-
-    timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { };
-
-    tds_fdw = super.callPackage ./tds_fdw.nix { };
-
-    pgrouting = super.callPackage ./pgrouting.nix { };
-
-    pgx_ulid = super.callPackage ./pgx_ulid.nix { };
-
-    pg_partman = super.callPackage ./pg_partman.nix { };
-
-    pg_relusage = super.callPackage ./pg_relusage.nix { };
-
-    pg_roaringbitmap = super.callPackage ./pg_roaringbitmap.nix { };
-
-    pg_safeupdate = super.callPackage ./pg_safeupdate.nix { };
-
-    pg_squeeze = super.callPackage ./pg_squeeze.nix { };
-
-    pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { };
-
-    repmgr = super.callPackage ./repmgr.nix { };
-
-    rum = super.callPackage ./rum.nix { };
-
-    sqlite_fdw = super.callPackage ./sqlite_fdw.nix { };
-
-    tsja = super.callPackage ./tsja.nix { };
-
-    wal2json = super.callPackage ./wal2json.nix { };
-
-    pgddl = super.callPackage ./pgddl.nix {};
-} // lib.optionalAttrs config.allowAliases {
-  pg_embedding = throw "PostgreSQL extension `pg_embedding` has been removed since the project has been abandoned. Upstream's recommendation is to use pgvector instead (https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector)";
-}
diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
index 88435112e0dd..3defcde5699f 100644
--- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix
+++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
@@ -1,22 +1,22 @@
 {
-  lib,
-  stdenv,
   cmake,
   fetchFromGitHub,
   h3_4,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "h3-pg";
   version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "zachasme";
     repo = "h3-pg";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2xp9gssPMTroLT/1Me0VWvtIPyouIk9MW0Rp13uYBEw=";
   };
 
@@ -50,10 +50,10 @@ buildPostgresqlExtension (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system";
     homepage = "https://github.com/zachasme/h3-pg";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
     inherit (postgresql.meta) platforms;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix
index f85a743d9fca..84a47bb9dac0 100644
--- a/pkgs/servers/sql/postgresql/ext/hypopg.nix
+++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix
@@ -1,20 +1,20 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
-  postgresql,
   gitUpdater,
-  buildPostgresqlExtension,
+  lib,
+  postgresql,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "hypopg";
   version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "HypoPG";
     repo = "hypopg";
-    rev = version;
+    tag = version;
     hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM=";
   };
 
@@ -24,11 +24,11 @@ buildPostgresqlExtension rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Hypothetical Indexes for PostgreSQL";
     homepage = "https://hypopg.readthedocs.io";
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ bbigras ];
+    maintainers = with lib.maintainers; [ bbigras ];
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
index 8d8ccf12e56b..fb6acd607466 100644
--- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
+++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
@@ -1,12 +1,12 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension {
+postgresqlBuildExtension {
   pname = "jsonb_deep_sum";
   version = "0-unstable-2021-12-24";
 
@@ -14,14 +14,14 @@ buildPostgresqlExtension {
     owner = "furstenheim";
     repo = "jsonb_deep_sum";
     rev = "d9c69aa6b7da860e5522a9426467e67cb787980c";
-    sha256 = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0=";
+    hash = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension to easily add jsonb numeric";
     homepage = "https://github.com/furstenheim/jsonb_deep_sum";
-    maintainers = with maintainers; [ _1000101 ];
+    maintainers = with lib.maintainers; [ _1000101 ];
     platforms = postgresql.meta.platforms;
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
index fcfd82e61345..3a6275c66686 100644
--- a/pkgs/servers/sql/postgresql/ext/lantern.nix
+++ b/pkgs/servers/sql/postgresql/ext/lantern.nix
@@ -1,22 +1,22 @@
 {
-  lib,
-  stdenv,
   cmake,
   fetchFromGitHub,
+  lib,
   openssl,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "postgresql-lantern";
   version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lanterndata";
     repo = "lantern";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-IsDD/um5pVvbzin8onf45DQVszl+Id/pJSQ2iijgHmg=";
     fetchSubmodules = true;
   };
@@ -51,11 +51,11 @@ buildPostgresqlExtension (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL vector database extension for building AI applications";
     homepage = "https://lantern.dev/";
     changelog = "https://github.com/lanterndata/lantern/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
index 343482d26c7b..db170862a7ba 100644
--- a/pkgs/servers/sql/postgresql/ext/periods.nix
+++ b/pkgs/servers/sql/postgresql/ext/periods.nix
@@ -1,27 +1,27 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "periods";
   version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "xocolatl";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo=";
+    repo = "periods";
+    tag = "v${version}";
+    hash = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING";
     homepage = "https://github.com/xocolatl/periods";
-    maintainers = with maintainers; [ ivan ];
+    maintainers = with lib.maintainers; [ ivan ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix
index 0332bf986232..679374aae167 100644
--- a/pkgs/servers/sql/postgresql/ext/pg-gvm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg-gvm.nix
@@ -1,5 +1,4 @@
 {
-  buildPostgresqlExtension,
   cmake,
   fetchFromGitHub,
   glib,
@@ -10,17 +9,18 @@
   pcre2,
   pkg-config,
   postgresql,
+  postgresqlBuildExtension,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg-gvm";
-  version = "22.6.7";
+  version = "22.6.8";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "pg-gvm";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Sa9ltW3KV/69OCxD3gRcp5owL0oW+z3fs4fRBHbSh30=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D8KpOTF+vcBNIn//8Y0Hwk4B+OBF2Hh3dkWyO2KYeqw=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,6 @@ buildPostgresqlExtension (finalAttrs: {
     changelog = "https://github.com/greenbone/pg-gvm/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ tochiaha ];
-    mainProgram = "pg-gvm";
     platforms = postgresql.meta.platforms;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pg-semver.nix b/pkgs/servers/sql/postgresql/ext/pg-semver.nix
index d379981cd0df..005e7f46bdbc 100644
--- a/pkgs/servers/sql/postgresql/ext/pg-semver.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg-semver.nix
@@ -1,20 +1,20 @@
 {
-  lib,
   fetchFromGitHub,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
   testers,
-  buildPostgresqlExtension,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg-semver";
   version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "theory";
     repo = "pg-semver";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-9f+QuGupjTUK3cQk7DFDrL7MOIwDE9SAUyVZ9RfrdDM=";
   };
 
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 0d43faa7fe2e..d041e3dc5863 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -1,34 +1,34 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_auto_failover";
   version = "2.1";
 
   src = fetchFromGitHub {
     owner = "citusdata";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI=";
+    repo = "pg_auto_failover";
+    tag = "v${version}";
+    hash = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI=";
   };
 
   buildInputs = postgresql.buildInputs;
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension and service for automated failover and high-availability";
     mainProgram = "pg_autoctl";
     homepage = "https://github.com/citusdata/pg_auto_failover";
     changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     # PostgreSQL 17 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1048
     # Check after next package update.
-    broken = versionAtLeast postgresql.version "17" && version == "2.1";
+    broken = lib.versionAtLeast postgresql.version "17" && version == "2.1";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
index e4c12f676d07..246110923737 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@@ -1,28 +1,28 @@
 {
-  lib,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_bigm";
   version = "1.2-20240606";
 
   src = fetchFromGitHub {
     owner = "pgbigm";
     repo = "pg_bigm";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs=";
   };
 
   makeFlags = [ "USE_PGXS=1" ];
 
-  meta = with lib; {
+  meta = {
     description = "Text similarity measurement and index searching based on bigrams";
     homepage = "https://pgbigm.osdn.jp/";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix
index 1fdc86a7e9a2..8de8850d04eb 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix
@@ -1,13 +1,13 @@
 {
-  buildPostgresqlExtension,
   fetchFromGitHub,
   file,
   lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg_byteamagic";
   version = "0.2.4";
 
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 124f58fababf..d4cbd3839d79 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -1,28 +1,28 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_cron";
   version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "citusdata";
-    repo = pname;
-    rev = "v${version}";
+    repo = "pg_cron";
+    tag = "v${version}";
     hash = "sha256-Llksil7Fk7jvJJmCpfCN0Qm2b2I4J1VOA7/ibytO+KM=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Run Cron jobs through PostgreSQL";
     homepage = "https://github.com/citusdata/pg_cron";
     changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${version}";
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
index 6e823f82b560..cb975af46a44 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
@@ -1,28 +1,28 @@
 {
-  lib,
-  stdenv,
   fetchFromGitLab,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_ed25519";
   version = "0.2";
 
   src = fetchFromGitLab {
     owner = "dwagin";
     repo = "pg_ed25519";
-    rev = version;
-    sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0";
+    tag = version;
+    hash = "sha256-IOL3ogbPCMNmwDwpeaCZSoaFLJRX0Oah+ysgyUfHg5s=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension for signing and verifying ed25519 signatures";
     homepage = "https://gitlab.com/dwagin/pg_ed25519";
-    maintainers = [ maintainers.renzo ];
+    maintainers = with lib.maintainers; [ renzo ];
     platforms = postgresql.meta.platforms;
-    license = licenses.mit;
+    license = lib.licenses.mit;
     # Broken with no upstream fix available.
     broken = lib.versionAtLeast postgresql.version "16";
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
index 20d31530164e..4081d5b35f89 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
@@ -1,9 +1,9 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
 let
@@ -29,22 +29,18 @@ let
         version = "1.3.9";
         hash = "sha256-KGcHDwk8CgNHPZARfLBfS8r7TRCP9LPjT+m4fNSnnW0=";
       };
-      "12" = {
-        version = "1.3.9";
-        hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y=";
-      };
     }
     .${lib.versions.major postgresql.version}
     or (throw "Source for pg_hint_plan is not available for ${postgresql.version}");
 in
-buildPostgresqlExtension {
+postgresqlBuildExtension {
   pname = "pg_hint_plan";
   inherit (source) version;
 
   src = fetchFromGitHub {
     owner = "ossc-db";
     repo = "pg_hint_plan";
-    rev = "REL${lib.versions.major postgresql.version}_${
+    tag = "REL${lib.versions.major postgresql.version}_${
       builtins.replaceStrings [ "." ] [ "_" ] source.version
     }";
     inherit (source) hash;
@@ -57,11 +53,11 @@ buildPostgresqlExtension {
 
   enableUpdateScript = false;
 
-  meta = with lib; {
+  meta = {
     description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments";
     homepage = "https://github.com/ossc-db/pg_hint_plan";
-    maintainers = with maintainers; [ _1000101 ];
+    maintainers = with lib.maintainers; [ _1000101 ];
     platforms = postgresql.meta.platforms;
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index 709424365e7c..429319faa801 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -1,28 +1,28 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_hll";
   version = "2.18";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "postgresql-hll";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "HyperLogLog for PostgreSQL";
     homepage = "https://github.com/citusdata/postgresql-hll";
     changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = postgresql.meta.platforms;
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index 675eab8fee5c..3ebcf0c57086 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -1,29 +1,29 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_ivm";
   version = "1.9";
 
   src = fetchFromGitHub {
     owner = "sraoss";
-    repo = pname;
-    rev = "v${version}";
+    repo = "pg_ivm";
+    tag = "v${version}";
     hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL";
     homepage = "https://github.com/sraoss/pg_ivm";
     changelog = "https://github.com/sraoss/pg_ivm/releases/tag/v${version}";
-    maintainers = with maintainers; [ ivan ];
+    maintainers = with lib.maintainers; [ ivan ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
-    broken = versionOlder postgresql.version "13";
+    license = lib.licenses.postgresql;
+    broken = lib.versionOlder postgresql.version "13";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix
index 2360944e555d..4b5dbd34b12c 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix
@@ -1,22 +1,22 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
   gitUpdater,
+  lib,
+  libversion,
   pkg-config,
   postgresql,
-  libversion,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg_libversion";
   version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "repology";
     repo = "postgresql-libversion";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-3nqXaBwPRUSo6wUY5YMjJ/nFFKmhgP1zFKapD+RqSDw=";
   };
 
@@ -30,11 +30,11 @@ buildPostgresqlExtension (finalAttrs: {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension with support for version string comparison";
     homepage = "https://github.com/repology/postgresql-libversion";
-    license = licenses.mit;
-    maintainers = [ maintainers.jopejoe1 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
     platforms = postgresql.meta.platforms;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 61ee9572467e..698e76de4f50 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -1,33 +1,33 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
   curl,
+  fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_net";
   version = "0.14.0";
 
-  buildInputs = [ curl ];
-
   src = fetchFromGitHub {
     owner = "supabase";
-    repo = pname;
-    rev = "refs/tags/v${version}";
+    repo = "pg_net";
+    tag = "v${version}";
     hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI=";
   };
 
+  buildInputs = [ curl ];
+
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = with lib; {
+  meta = {
     description = "Async networking for Postgres";
     homepage = "https://github.com/supabase/pg_net";
     changelog = "https://github.com/supabase/pg_net/releases/tag/v${version}";
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index c3ffbbe2ce7d..6e06529be058 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -1,29 +1,29 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_partman";
   version = "5.2.4";
 
   src = fetchFromGitHub {
     owner = "pgpartman";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w=";
+    repo = "pg_partman";
+    tag = "v${version}";
+    hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Partition management extension for PostgreSQL";
     homepage = "https://github.com/pgpartman/pg_partman";
     changelog = "https://github.com/pgpartman/pg_partman/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ ggpeti ];
+    maintainers = with lib.maintainers; [ ggpeti ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
-    broken = versionOlder postgresql.version "14";
+    license = lib.licenses.postgresql;
+    broken = lib.versionOlder postgresql.version "14";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix
index d2131b9f8c78..add5ed477aed 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix
@@ -1,27 +1,26 @@
 {
-  stdenv,
   fetchFromGitHub,
   lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_rational";
   version = "0.0.2";
 
   src = fetchFromGitHub {
     owner = "begriffs";
     repo = "pg_rational";
-    rev = "v${version}";
-    sha256 = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw=";
+    tag = "v${version}";
+    hash = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Precise fractional arithmetic for PostgreSQL";
     homepage = "https://github.com/begriffs/pg_rational";
-    maintainers = with maintainers; [ netcrns ];
+    maintainers = with lib.maintainers; [ netcrns ];
     platforms = postgresql.meta.platforms;
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix
index 4379dc1ffdc9..b1195b514140 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix
@@ -1,27 +1,27 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_relusage";
   version = "0.0.1";
 
   src = fetchFromGitHub {
     owner = "adept";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    sha256 = "8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs=";
+    repo = "pg_relusage";
+    tag = "${version}";
+    hash = "sha256-8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "pg_relusage extension for PostgreSQL: discover and log the relations used in your statements";
     homepage = "https://github.com/adept/pg_relusage";
-    maintainers = with maintainers; [ thenonameguy ];
+    maintainers = with lib.maintainers; [ thenonameguy ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index f7cb29c40ad5..a785635d0e7d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -1,14 +1,15 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  gitUpdater,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
+  stdenv,
   testers,
-  buildPostgresqlExtension,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg_repack";
   version = "1.5.2";
 
@@ -17,8 +18,12 @@ buildPostgresqlExtension (finalAttrs: {
   src = fetchFromGitHub {
     owner = "reorg";
     repo = "pg_repack";
-    rev = "ver_${finalAttrs.version}";
-    sha256 = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA=";
+    tag = "ver_${finalAttrs.version}";
+    hash = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA=";
+  };
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "ver_";
   };
 
   passthru.tests = {
@@ -31,7 +36,7 @@ buildPostgresqlExtension (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Reorganize tables in PostgreSQL databases with minimal locks";
     longDescription = ''
       pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore
@@ -40,8 +45,8 @@ buildPostgresqlExtension (finalAttrs: {
       with performance comparable to using CLUSTER directly.
     '';
     homepage = "https://github.com/reorg/pg_repack";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ danbst ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ danbst ];
     inherit (postgresql.meta) platforms;
     mainProgram = "pg_repack";
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix
index eeade122d1e1..8810a6710227 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix
@@ -1,28 +1,28 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestHook,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg_roaringbitmap";
   version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "ChenHuajun";
     repo = "pg_roaringbitmap";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "RoaringBitmap extension for PostgreSQL";
     homepage = "https://github.com/ChenHuajun/pg_roaringbitmap";
     changelog = "https://github.com/ChenHuajun/pg_roaringbitmap/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
     inherit (postgresql.meta) platforms;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
index 17ffa9a67203..8722a7ff7f31 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@@ -1,57 +1,53 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
 with {
-  "12" = {
-    version = "1.4";
-    sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y=";
-  };
   "13" = {
     version = "1.4";
-    sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y=";
+    hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y=";
   };
   "14" = {
     version = "1.5";
-    sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
+    hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
   };
   "15" = {
     version = "1.5";
-    sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
+    hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
   };
   "16" = {
     version = "1.5";
-    sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
+    hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
   };
   "17" = {
     version = "1.5";
-    sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
+    hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
   };
 }
 ."${lib.versions.major postgresql.version}"
   or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing.");
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg-safeupdate";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "eradman";
-    repo = pname;
-    rev = version;
-    inherit sha256;
+    repo = "pg-safeupdate";
+    tag = version;
+    inherit hash;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple extension to PostgreSQL that requires criteria for UPDATE and DELETE";
     homepage = "https://github.com/eradman/pg-safeupdate";
     changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS";
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ wolfgangwalther ];
-    license = licenses.postgresql;
+    maintainers = with lib.maintainers; [ wolfgangwalther ];
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index 41b663864ba2..c0fb92f09f2f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -1,13 +1,13 @@
 {
-  stdenv,
-  lib,
   fetchFromGitHub,
   fetchpatch,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension {
+postgresqlBuildExtension {
   pname = "pg_similarity";
   version = "pg_similarity_1_0-unstable-2021-01-12";
 
@@ -15,7 +15,7 @@ buildPostgresqlExtension {
     owner = "eulerto";
     repo = "pg_similarity";
     rev = "b9cb0a2d501b91e33cd1ef550b05483ca3563f71";
-    sha256 = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0=";
+    hash = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0=";
   };
 
   patches = [
diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
index 13bbd7a330b7..a0c88f6c66b2 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
@@ -1,14 +1,14 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
-  postgresql,
-  postgresqlTestExtension,
-  buildPostgresqlExtension,
+  lib,
   nix-update-script,
+  postgresql,
+  postgresqlBuildExtension,
+  postgresqlTestExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pg_squeeze";
   version = "${builtins.replaceStrings [ "_" ] [ "." ] (
     lib.strings.removePrefix "REL" finalAttrs.src.rev
@@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cybertec-postgresql";
     repo = "pg_squeeze";
-    rev = "REL1_7_0";
+    tag = "REL1_7_0";
     hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik=";
   };
 
@@ -41,11 +41,11 @@ buildPostgresqlExtension (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension for automatic bloat cleanup";
     homepage = "https://github.com/cybertec-postgresql/pg_squeeze";
     changelog = "https://github.com/cybertec-postgresql/pg_squeeze/blob/${finalAttrs.src.rev}/NEWS";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pg_tle.nix b/pkgs/servers/sql/postgresql/ext/pg_tle.nix
index 299771b12769..e8c45d2a026a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_tle.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_tle.nix
@@ -1,11 +1,11 @@
 {
-  lib,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_tle";
   version = "1.4.0";
 
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index 3271c6ac7a68..1c14a028ce12 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -1,28 +1,28 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_topn";
   version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "postgresql-topn";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png=";
+    tag = "v${version}";
+    hash = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Efficient querying of 'top values' for PostgreSQL";
     homepage = "https://github.com/citusdata/postgresql-topn";
     changelog = "https://github.com/citusdata/postgresql-topn/raw/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = postgresql.meta.platforms;
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
index a11332dd6192..157d40e6bc5c 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
@@ -1,29 +1,29 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pg_uuidv7";
   version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "fboulnois";
     repo = "pg_uuidv7";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tiny Postgres extension to create version 7 UUIDs";
     homepage = "https://github.com/fboulnois/pg_uuidv7";
     changelog = "https://github.com/fboulnois/pg_uuidv7/blob/main/CHANGELOG.md";
-    maintainers = with maintainers; [ gaelreyrol ];
+    maintainers = with lib.maintainers; [ gaelreyrol ];
     platforms = postgresql.meta.platforms;
-    license = licenses.mpl20;
-    broken = versionOlder postgresql.version "13";
+    license = lib.licenses.mpl20;
+    broken = lib.versionOlder postgresql.version "13";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
index 13e5ad29ff4a..6036cf42447f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
@@ -1,11 +1,11 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   libkrb5,
   openssl,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
 let
@@ -31,22 +31,18 @@ let
         version = "1.5.2";
         hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg=";
       };
-      "12" = {
-        version = "1.4.3";
-        hash = "sha256-c8/xUFIHalu2bMCs57DeylK0oW0VnQwmUCpdp+tYqk4=";
-      };
     }
     .${lib.versions.major postgresql.version}
     or (throw "Source for pgaudit is not available for ${postgresql.version}");
 in
-buildPostgresqlExtension {
+postgresqlBuildExtension {
   pname = "pgaudit";
   inherit (source) version;
 
   src = fetchFromGitHub {
     owner = "pgaudit";
     repo = "pgaudit";
-    rev = source.version;
+    tag = source.version;
     hash = source.hash;
   };
 
@@ -59,12 +55,12 @@ buildPostgresqlExtension {
 
   enableUpdateScript = false;
 
-  meta = with lib; {
+  meta = {
     description = "Open Source PostgreSQL Audit Logging";
     homepage = "https://github.com/pgaudit/pgaudit";
     changelog = "https://github.com/pgaudit/pgaudit/releases/tag/${source.version}";
-    maintainers = with maintainers; [ idontgetoutmuch ];
+    maintainers = with lib.maintainers; [ idontgetoutmuch ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix
index b29e78c02725..56b4f617df04 100644
--- a/pkgs/servers/sql/postgresql/ext/pgddl.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix
@@ -1,12 +1,12 @@
 {
-  lib,
   fetchFromGitHub,
-  postgresql,
-  buildPostgresqlExtension,
-  postgresqlTestExtension,
+  lib,
   perl,
+  postgresql,
+  postgresqlBuildExtension,
+  postgresqlTestExtension,
 }:
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pgddl";
   version = "0.29";
 
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index 9b3afd821dbd..f32eaf7687ed 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -1,15 +1,15 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
-  postgresql,
-  unstableGitUpdater,
+  lib,
   nixosTests,
+  postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
-  buildPostgresqlExtension,
+  stdenv,
+  unstableGitUpdater,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pgjwt";
   version = "0-unstable-2023-03-02";
 
@@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: {
     owner = "michelp";
     repo = "pgjwt";
     rev = "f3d82fd30151e754e19ce5d6a06c71c20689ce3d";
-    sha256 = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU=";
+    hash = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU=";
   };
 
   passthru.updateScript = unstableGitUpdater { };
@@ -34,13 +34,13 @@ buildPostgresqlExtension (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL implementation of JSON Web Tokens";
     longDescription = ''
       sign() and verify() functions to create and verify JSON Web Tokens.
     '';
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ spinus ];
+    maintainers = with lib.maintainers; [ spinus ];
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix
index 375bc7fa28d4..ea301fb51c3b 100644
--- a/pkgs/servers/sql/postgresql/ext/pgmq.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix
@@ -1,19 +1,19 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pgmq";
   version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "tembo-io";
     repo = "pgmq";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-iFIHkqL9w7Bw1dxmmL1i0D5Xxq+ljFLf24M9vHArwvE=";
   };
 
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 6ea65c6a5ccd..cffadd4cc61f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -1,23 +1,23 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  groonga,
+  lib,
+  msgpack-c,
   pkg-config,
   postgresql,
-  msgpack-c,
-  groonga,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
   xxHash,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pgroonga";
   version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "pgroonga";
     repo = "pgroonga";
-    rev = "${version}";
+    tag = "${version}";
     hash = "sha256-a5nNtlUiFBuuqWAjIN0gU/FaoV3VpJh+/fab8R/77dw=";
   };
 
@@ -34,7 +34,7 @@ buildPostgresqlExtension rec {
     "MSGPACK_PACKAGE_NAME=msgpack-c"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension to use Groonga as the index";
     longDescription = ''
       PGroonga is a PostgreSQL extension to use Groonga as the index.
@@ -44,8 +44,8 @@ buildPostgresqlExtension rec {
     '';
     homepage = "https://pgroonga.github.io/";
     changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${version}";
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ DerTim1 ];
+    maintainers = with lib.maintainers; [ DerTim1 ];
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 4aef42af2579..2702bd676a42 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -1,15 +1,15 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  postgresql,
-  perl,
-  cmake,
   boost,
-  buildPostgresqlExtension,
+  cmake,
+  fetchFromGitHub,
+  lib,
+  perl,
+  postgresql,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pgrouting";
   version = "3.7.3";
 
@@ -22,16 +22,16 @@ buildPostgresqlExtension rec {
   src = fetchFromGitHub {
     owner = "pgRouting";
     repo = "pgrouting";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-jaevnDCJ6hRQeDhdAkvMTvnnFWElMNvo9gZRW53proQ=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL/PostGIS extension that provides geospatial routing functionality";
     homepage = "https://pgrouting.org/";
     changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}";
-    maintainers = with maintainers; teams.geospatial.members ++ [ steve-chavez ];
+    maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ steve-chavez ];
     platforms = postgresql.meta.platforms;
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix
index 8525fd81947a..d4abb4b32aee 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix
@@ -1,22 +1,22 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
   bash,
+  fetchFromGitHub,
+  lib,
   libsodium,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pgsodium";
   version = "3.1.9";
 
   src = fetchFromGitHub {
     owner = "michelp";
     repo = "pgsodium";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Y8xL3PxF1GQV1JIgolMI1e8oGcUvWAgrPv84om7wKP8=";
   };
 
@@ -45,11 +45,11 @@ buildPostgresqlExtension (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Modern cryptography for PostgreSQL using libsodium";
     homepage = "https://github.com/michelp/pgsodium";
     changelog = "https://github.com/michelp/pgsodium/releases/tag/v${finalAttrs.version}";
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
index 151cd92173eb..227a1680f8ca 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
@@ -1,32 +1,32 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
   curl,
+  fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pgsql-http";
   version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "pramsey";
     repo = "pgsql-http";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Ij8BaNj2SOwDfjgLxrpLFvvPCzSahXyyckRPGmcqKtE=";
   };
 
   buildInputs = [ curl ];
   nativeBuildInputs = [ curl ];
 
-  meta = with lib; {
+  meta = {
     description = "HTTP client for PostgreSQL, retrieve a web page from inside the database";
     homepage = "https://github.com/pramsey/pgsql-http";
     changelog = "https://github.com/pramsey/pgsql-http/releases/tag/v${version}";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 0dd670a0b4b3..55d8613adce0 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -1,24 +1,24 @@
 {
-  lib,
-  stdenv,
-  buildPostgresqlExtension,
   fetchFromGitHub,
+  lib,
   perl,
   perlPackages,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestHook,
+  stdenv,
   which,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "pgtap";
   version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "theory";
     repo = "pgtap";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ buildPostgresqlExtension (finalAttrs: {
     installPhase = "touch $out";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Unit testing framework for PostgreSQL";
     longDescription = ''
       pgTAP is a unit testing framework for PostgreSQL written in PL/pgSQL and PL/SQL.
@@ -62,9 +62,9 @@ buildPostgresqlExtension (finalAttrs: {
       as well as the ability to integrate with other TAP-emitting test frameworks.
       It can also be used in the xUnit testing style.
     '';
-    maintainers = with maintainers; [ willibutz ];
+    maintainers = with lib.maintainers; [ willibutz ];
     homepage = "https://pgtap.org";
     inherit (postgresql.meta) platforms;
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
similarity index 92%
rename from pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
rename to pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
index b7a1496a37fe..800a0b1fa279 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
@@ -1,17 +1,17 @@
 {
-  lib,
   buildPgrxExtension,
   cargo-pgrx_0_12_0_alpha_1,
   clang_16,
   fetchFromGitHub,
+  lib,
   nix-update-script,
   nixosTests,
   openssl,
   pkg-config,
   postgresql,
+  replaceVars,
   rustPlatform,
   stdenv,
-  replaceVars,
 }:
 
 let
@@ -50,7 +50,7 @@ in
     src = fetchFromGitHub {
       owner = "tensorchord";
       repo = "pgvecto.rs";
-      rev = "v${version}";
+      tag = "v${version}";
       hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE=";
     };
 
@@ -90,18 +90,18 @@ in
       tests = nixosTests.postgresql.pgvecto-rs.passthru.override postgresql;
     };
 
-    meta = with lib; {
+    meta = {
       # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343
       broken =
-        (versionOlder postgresql.version "14")
+        (lib.versionOlder postgresql.version "14")
         ||
           # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607
           # Check after next package update.
-          versionAtLeast postgresql.version "17" && version == "0.3.0";
+          lib.versionAtLeast postgresql.version "17" && version == "0.3.0";
       description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres";
       homepage = "https://github.com/tensorchord/pgvecto.rs";
-      license = licenses.asl20;
-      maintainers = with maintainers; [
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [
         diogotcorreia
         esclear
       ];
diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index 3eb06fc9b06c..5741e06a7756 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -1,27 +1,27 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "pgvector";
   version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-JsZV+I4eRMypXTjGmjCtMBXDVpqTIPHQa28ogXncE/Q=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source vector similarity search for PostgreSQL";
     homepage = "https://github.com/pgvector/pgvector";
     changelog = "https://github.com/pgvector/pgvector/raw/v${version}/CHANGELOG.md";
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
     maintainers = [ ];
   };
diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
index a063dd82ee46..3db15229739a 100644
--- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
@@ -1,7 +1,7 @@
 {
-  lib,
   buildPgrxExtension,
   fetchFromGitHub,
+  lib,
   nix-update-script,
   postgresql,
   util-linux,
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index 4ca7244ba407..8a03799cf1c6 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -1,20 +1,20 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestExtension,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "plpgsql-check";
   version = "2.7.15";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "plpgsql_check";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-JF0aTYakoHMRdiWcA70mYFvzTiwMhOJZfqRj+6JC6n0=";
   };
 
@@ -23,12 +23,12 @@ buildPostgresqlExtension (finalAttrs: {
     sql = "CREATE EXTENSION plpgsql_check;";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Linter tool for language PL/pgSQL";
     homepage = "https://github.com/okbob/plpgsql_check";
     changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${finalAttrs.version}";
     platforms = postgresql.meta.platforms;
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix
index c1148bf92c39..891a461040ab 100644
--- a/pkgs/servers/sql/postgresql/ext/plr.nix
+++ b/pkgs/servers/sql/postgresql/ext/plr.nix
@@ -1,22 +1,22 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
   R,
+  fetchFromGitHub,
+  lib,
+  pkg-config,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "plr";
   version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL" src.rev)}";
 
   src = fetchFromGitHub {
     owner = "postgres-plr";
     repo = "plr";
-    rev = "REL8_4_7";
-    sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk=";
+    tag = "REL8_4_7";
+    hash = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -24,12 +24,12 @@ buildPostgresqlExtension rec {
 
   makeFlags = [ "USE_PGXS=1" ];
 
-  meta = with lib; {
+  meta = {
     description = "PL/R - R Procedural Language for PostgreSQL";
     homepage = "https://github.com/postgres-plr/plr";
     changelog = "https://github.com/postgres-plr/plr/blob/${src.rev}/changelog.md";
-    maintainers = with maintainers; [ qoelet ];
+    maintainers = with lib.maintainers; [ qoelet ];
     platforms = postgresql.meta.platforms;
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/package.nix
similarity index 95%
rename from pkgs/servers/sql/postgresql/ext/plv8/default.nix
rename to pkgs/servers/sql/postgresql/ext/plv8/package.nix
index 3e00db9400fe..be8935f42357 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8/package.nix
@@ -1,29 +1,29 @@
 {
-  stdenv,
-  lib,
   fetchFromGitHub,
+  jitSupport,
+  lib,
   nodejs_20,
   perl,
   postgresql,
-  jitSupport,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
   # For test
-  runCommand,
   coreutils,
   gnugrep,
+  runCommand,
 }:
 
 let
   libv8 = nodejs_20.libv8;
 in
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "plv8";
   version = "3.2.3";
 
   src = fetchFromGitHub {
     owner = "plv8";
     repo = "plv8";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ivQZJSNn5giWF351fqZ7mBZoJkGtby5T7beK45g3Zqs=";
   };
 
@@ -130,7 +130,7 @@ buildPostgresqlExtension (finalAttrs: {
       };
   };
 
-  meta = with lib; {
+  meta = {
     description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
     homepage = "https://plv8.github.io/";
     changelog = "https://github.com/plv8/plv8/blob/r${finalAttrs.version}/Changes";
@@ -139,7 +139,7 @@ buildPostgresqlExtension (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
     ];
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     broken = jitSupport;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 556bfd030de7..ceeebabe76d7 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -1,39 +1,40 @@
 {
-  fetchFromGitHub,
-  lib,
-  stdenv,
-  perl,
-  libxml2,
-  postgresql,
-  postgresqlTestHook,
-  geos,
-  proj,
-  gdalMinimal,
-  json_c,
-  pkg-config,
-  file,
-  protobufc,
-  libiconv,
-  libxslt,
-  docbook5,
-  cunit,
-  pcre2,
-  postgresqlTestExtension,
-  jitSupport,
-  llvm,
-  buildPostgresqlExtension,
   autoconf,
   automake,
+  cunit,
+  docbook5,
+  fetchFromGitHub,
+  file,
+  gdalMinimal,
+  geos,
+  jitSupport,
+  json_c,
+  lib,
+  libiconv,
   libtool,
+  libxml2,
+  libxslt,
+  llvm,
+  pcre2,
+  perl,
+  pkg-config,
+  postgresql,
+  postgresqlBuildExtension,
+  postgresqlTestExtension,
+  postgresqlTestHook,
+  proj,
+  protobufc,
+  stdenv,
   which,
-  sfcgal,
+
   withSfcgal ? false,
+  sfcgal,
 }:
 
 let
   gdal = gdalMinimal;
 in
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "postgis";
   version = "3.5.2";
 
@@ -45,7 +46,7 @@ buildPostgresqlExtension (finalAttrs: {
   src = fetchFromGitHub {
     owner = "postgis";
     repo = "postgis";
-    rev = "${finalAttrs.version}";
+    tag = "${finalAttrs.version}";
     hash = "sha256-1kOLtG6AMavbWQ1lHG2ABuvIcyTYhgcbjuVmqMR4X+g=";
   };
 
@@ -60,6 +61,7 @@ buildPostgresqlExtension (finalAttrs: {
     ]
     ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
     ++ lib.optional withSfcgal sfcgal;
+
   nativeBuildInputs = [
     autoconf
     automake
@@ -70,6 +72,7 @@ buildPostgresqlExtension (finalAttrs: {
     protobufc
     which
   ] ++ lib.optional jitSupport llvm;
+
   dontDisableStatic = true;
 
   nativeCheckInputs = [
@@ -158,12 +161,12 @@ buildPostgresqlExtension (finalAttrs: {
       '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Geographic Objects for PostgreSQL";
     homepage = "https://postgis.net/";
     changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; lib.teams.geospatial.members ++ [ marcweber ];
     inherit (postgresql.meta) platforms;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index a80ac369b7d4..dd977bf376f1 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -1,23 +1,23 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  postgresql,
-  flex,
   curl,
+  fetchFromGitHub,
+  flex,
   json_c,
-  buildPostgresqlExtension,
+  lib,
+  postgresql,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "repmgr";
   version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "EnterpriseDB";
     repo = "repmgr";
-    rev = "v${version}";
-    sha256 = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs=";
+    tag = "v${version}";
+    hash = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs=";
   };
 
   nativeBuildInputs = [ flex ];
@@ -27,11 +27,11 @@ buildPostgresqlExtension rec {
     json_c
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://repmgr.org/";
     description = "Replication manager for PostgreSQL cluster";
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ zimbatm ];
+    maintainers = with lib.maintainers; [ zimbatm ];
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix
index f681efd5b9df..1124ab9a445a 100644
--- a/pkgs/servers/sql/postgresql/ext/rum.nix
+++ b/pkgs/servers/sql/postgresql/ext/rum.nix
@@ -1,20 +1,20 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
+  postgresqlBuildExtension,
   postgresqlTestHook,
-  buildPostgresqlExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension (finalAttrs: {
+postgresqlBuildExtension (finalAttrs: {
   pname = "rum";
   version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "postgrespro";
     repo = "rum";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8=";
   };
 
@@ -48,11 +48,11 @@ buildPostgresqlExtension (finalAttrs: {
     installPhase = "touch $out";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Full text search index method for PostgreSQL";
     homepage = "https://github.com/postgrespro/rum";
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ DeeUnderscore ];
+    maintainers = with lib.maintainers; [ DeeUnderscore ];
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix
index e7b26482cd72..3a2b8e0f930f 100644
--- a/pkgs/servers/sql/postgresql/ext/smlar.nix
+++ b/pkgs/servers/sql/postgresql/ext/smlar.nix
@@ -1,12 +1,12 @@
 {
-  lib,
-  stdenv,
   fetchgit,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension {
+postgresqlBuildExtension {
   pname = "smlar-unstable";
   version = "2021-11-08";
 
@@ -18,11 +18,11 @@ buildPostgresqlExtension {
 
   makeFlags = [ "USE_PGXS=1" ];
 
-  meta = with lib; {
+  meta = {
     description = "Compute similary of any one-dimensional arrays";
     homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git";
     platforms = postgresql.meta.platforms;
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     # Broken with no upstream fix available.
     broken = lib.versionAtLeast postgresql.version "16";
diff --git a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix
index bb25a600ecef..710fb5472042 100644
--- a/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/sqlite_fdw.nix
@@ -1,19 +1,19 @@
 {
-  lib,
   fetchFromGitHub,
-  sqlite,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  sqlite,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "sqlite_fdw";
   version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "pgspider";
     repo = "sqlite_fdw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-zPVIFzUv6UFFHq0Zi5MeQOcvgsfZAKGkkNIGxkTJ+oo=";
   };
 
diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix
index bf2930807417..88d92d4b547c 100644
--- a/pkgs/servers/sql/postgresql/ext/system_stats.nix
+++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix
@@ -1,29 +1,29 @@
 {
   fetchFromGitHub,
   lib,
-  stdenv,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "system_stats";
   version = "3.2";
 
   src = fetchFromGitHub {
     owner = "EnterpriseDB";
     repo = "system_stats";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig=";
   };
 
   buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ];
 
-  meta = with lib; {
-    description = "A Postgres extension for exposing system metrics such as CPU, memory and disk information";
+  meta = {
+    description = "Postgres extension for exposing system metrics such as CPU, memory and disk information";
     homepage = "https://github.com/EnterpriseDB/system_stats";
     changelog = "https://github.com/EnterpriseDB/system_stats/raw/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ shivaraj-bh ];
+    maintainers = with lib.maintainers; [ shivaraj-bh ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index 56b9c164d74a..955131db9425 100644
--- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
@@ -1,14 +1,14 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
-  postgresql,
   freetds,
+  lib,
+  postgresql,
+  postgresqlBuildExtension,
+  stdenv,
   unstableGitUpdater,
-  buildPostgresqlExtension,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "tds_fdw";
   version = "2.0.4";
 
@@ -17,16 +17,16 @@ buildPostgresqlExtension rec {
   src = fetchFromGitHub {
     owner = "tds-fdw";
     repo = "tds_fdw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)";
     homepage = "https://github.com/tds-fdw/tds_fdw";
     changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${version}";
-    maintainers = [ maintainers.steve-chavez ];
+    maintainers = with lib.maintainers; [ steve-chavez ];
     platforms = postgresql.meta.platforms;
-    license = licenses.postgresql;
+    license = lib.licenses.postgresql;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
index 03692a3ad7b6..150f66fde899 100644
--- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
+++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
@@ -1,27 +1,27 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   postgresql,
-  buildPostgresqlExtension,
+  postgresqlBuildExtension,
+  stdenv,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "temporal_tables";
   version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "arkhipov";
     repo = "temporal_tables";
-    rev = "v${version}";
-    sha256 = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k=";
+    tag = "v${version}";
+    hash = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Temporal Tables PostgreSQL Extension";
     homepage = "https://github.com/arkhipov/temporal_tables";
-    maintainers = with maintainers; [ ggpeti ];
+    maintainers = with lib.maintainers; [ ggpeti ];
     platforms = postgresql.meta.platforms;
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 8f93c32aed78..a9dcd5cbe07c 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -1,33 +1,34 @@
 {
-  buildPostgresqlExtension,
   cmake,
-  enableUnfree ? true,
   fetchFromGitHub,
   lib,
   libkrb5,
   nixosTests,
   openssl,
   postgresql,
+  postgresqlBuildExtension,
   stdenv,
+
+  enableUnfree ? true,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
   version = "2.18.2";
 
+  src = fetchFromGitHub {
+    owner = "timescale";
+    repo = "timescaledb";
+    tag = version;
+    hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ=";
+  };
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     openssl
     libkrb5
   ];
 
-  src = fetchFromGitHub {
-    owner = "timescale";
-    repo = "timescaledb";
-    rev = version;
-    hash = "sha256-/PKk8/cS6jqL+mhSqFU6gybqDx3ld77RLF/uB+1XJCQ=";
-  };
-
   cmakeFlags =
     [
       "-DSEND_TELEMETRY_DEFAULT=OFF"
@@ -53,13 +54,13 @@ buildPostgresqlExtension rec {
 
   passthru.tests = nixosTests.postgresql.timescaledb.passthru.override postgresql;
 
-  meta = with lib; {
+  meta = {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
     homepage = "https://www.timescale.com/";
     changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md";
-    maintainers = [ maintainers.kirillrdy ];
+    maintainers = with lib.maintainers; [ kirillrdy ];
     platforms = postgresql.meta.platforms;
-    license = with licenses; if enableUnfree then tsl else asl20;
-    broken = versionOlder postgresql.version "14";
+    license = with lib.licenses; if enableUnfree then tsl else asl20;
+    broken = lib.versionOlder postgresql.version "14";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index a82c73e84337..3c294a0338a7 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -1,11 +1,11 @@
 {
-  lib,
-  fetchFromGitHub,
   buildPgrxExtension,
-  postgresql,
-  nixosTests,
   cargo-pgrx_0_12_6,
+  fetchFromGitHub,
+  lib,
   nix-update-script,
+  nixosTests,
+  postgresql,
 }:
 
 (buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) rec {
@@ -17,7 +17,7 @@
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb-toolkit";
-    rev = version;
+    tag = version;
     hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog=";
   };
 
@@ -33,11 +33,11 @@
   # tests take really long
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Provide additional tools to ease all things analytic when using TimescaleDB";
     homepage = "https://github.com/timescale/timescaledb-toolkit";
-    maintainers = with maintainers; [ typetetris ];
+    maintainers = with lib.maintainers; [ typetetris ];
     platforms = postgresql.meta.platforms;
-    license = licenses.tsl;
+    license = lib.licenses.tsl;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix
index 15df1763e2bf..0aafc6772363 100644
--- a/pkgs/servers/sql/postgresql/ext/tsja.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsja.nix
@@ -1,10 +1,10 @@
 {
-  lib,
   fetchzip,
-  nixosTests,
-  stdenv,
+  lib,
   mecab,
+  nixosTests,
   postgresql,
+  stdenv,
 }:
 
 stdenv.mkDerivation rec {
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
 
   passthru.tests = nixosTests.postgresql.tsja.passthru.override postgresql;
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL extension implementing Japanese text search";
     homepage = "https://www.amris.jp/tsja/index.html";
-    maintainers = with maintainers; [ chayleaf ];
+    maintainers = with lib.maintainers; [ chayleaf ];
     # GNU-specific linker options are used
-    platforms = platforms.gnu;
-    license = licenses.gpl2Only;
+    platforms = lib.platforms.gnu;
+    license = lib.licenses.gpl2Only;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
index 9562c738eb1f..b40e1f5f21e2 100644
--- a/pkgs/servers/sql/postgresql/ext/wal2json.nix
+++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix
@@ -1,12 +1,12 @@
 {
-  lib,
   fetchFromGitHub,
-  postgresql,
-  buildPostgresqlExtension,
+  lib,
   nixosTests,
+  postgresql,
+  postgresqlBuildExtension,
 }:
 
-buildPostgresqlExtension rec {
+postgresqlBuildExtension rec {
   pname = "wal2json";
   version = "${builtins.replaceStrings [ "_" ] [ "." ] (
     lib.strings.removePrefix "wal2json_" src.rev
@@ -15,20 +15,20 @@ buildPostgresqlExtension rec {
   src = fetchFromGitHub {
     owner = "eulerto";
     repo = "wal2json";
-    rev = "wal2json_2_6";
-    sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM=";
+    tag = "wal2json_2_6";
+    hash = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM=";
   };
 
   makeFlags = [ "USE_PGXS=1" ];
 
   passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql;
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL JSON output plugin for changeset extraction";
     homepage = "https://github.com/eulerto/wal2json";
     changelog = "https://github.com/eulerto/wal2json/releases/tag/${src.rev}";
-    maintainers = with maintainers; [ euank ];
+    maintainers = with lib.maintainers; [ euank ];
     platforms = postgresql.meta.platforms;
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index ca157411536e..9c487a14ea93 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -425,41 +425,15 @@ let
                 inherit (llvmPackages) llvm;
                 postgresql = this;
                 stdenv = stdenv';
-                postgresqlTestExtension =
-                  {
-                    finalPackage,
-                    withPackages ? [ ],
-                    ...
-                  }@extraArgs:
-                  stdenvNoCC.mkDerivation (
-                    {
-                      name = "${finalPackage.name}-test-extension";
-                      dontUnpack = true;
-                      doCheck = true;
-                      nativeCheckInputs = [
-                        postgresqlTestHook
-                        (this.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
-                      ];
-                      failureHook = "postgresqlStop";
-                      postgresqlTestUserOptions = "LOGIN SUPERUSER";
-                      passAsFile = [ "sql" ];
-                      checkPhase = ''
-                        runHook preCheck
-                        psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
-                        runHook postCheck
-                      '';
-                      installPhase = "touch $out";
-                    }
-                    // extraArgs
-                  );
-                buildPostgresqlExtension = newSuper.callPackage ./buildPostgresqlExtension.nix { };
+                postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { };
+                postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { };
               };
               newSelf = self // scope;
               newSuper = {
                 callPackage = newScope (scope // this.pkgs);
               };
             in
-            import ./ext newSelf newSuper;
+            import ./ext.nix newSelf newSuper;
 
           withPackages = postgresqlWithPackages {
             inherit buildEnv;
diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
similarity index 98%
rename from pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix
rename to pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
index a427b7f88053..9ea82fb80f84 100644
--- a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix
+++ b/pkgs/servers/sql/postgresql/postgresqlBuildExtension.nix
@@ -66,7 +66,7 @@
 args:
 
 let
-  buildPostgresqlExtension =
+  postgresqlBuildExtension =
     finalAttrs:
     {
       enableUpdateScript ? true,
@@ -146,4 +146,4 @@ let
         + prevAttrs.postInstall or "";
     };
 in
-stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args))
+stdenv.mkDerivation (lib.extends postgresqlBuildExtension (lib.toFunction args))
diff --git a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
new file mode 100644
index 000000000000..468a89a3b2e2
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
@@ -0,0 +1,32 @@
+{
+  postgresql,
+  postgresqlTestHook,
+  stdenvNoCC,
+}:
+
+{
+  finalPackage,
+  withPackages ? [ ],
+  ...
+}@extraArgs:
+stdenvNoCC.mkDerivation (
+  {
+    name = "${finalPackage.name}-test-extension";
+    dontUnpack = true;
+    doCheck = true;
+    nativeCheckInputs = [
+      postgresqlTestHook
+      (postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
+    ];
+    failureHook = "postgresqlStop";
+    postgresqlTestUserOptions = "LOGIN SUPERUSER";
+    passAsFile = [ "sql" ];
+    checkPhase = ''
+      runHook preCheck
+      psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
+      runHook postCheck
+    '';
+    installPhase = "touch $out";
+  }
+  // extraArgs
+)