refactor(nix): remove "-all" suffix from extension package names

jfroche · jfroche · commit 9d031fef4308 · 2025-12-01T15:23:09.000+01:00
Simplify extension package naming by removing the redundant "-all" suffix that was appended to pname attributes.
diff --git a/nix/checks.nix b/nix/checks.nix
@@ -88,7 +88,7 @@
                 builtins.trace "Major version result: ${result}" result;
 
               # Select the appropriate pgroonga package for this PostgreSQL version
-              pgroonga = self'.legacyPackages."psql_${majorVersion}".exts.pgroonga-all;
+              pgroonga = self'.legacyPackages."psql_${majorVersion}".exts.pgroonga;
 
               pgPort =
                 if (majorVersion == "17") then
diff --git a/nix/ext/hypopg.nix b/nix/ext/hypopg.nix
@@ -87,8 +87,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/index_advisor.nix b/nix/ext/index_advisor.nix
@@ -78,8 +78,7 @@ pkgs.buildEnv {
   ];
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pg-safeupdate.nix b/nix/ext/pg-safeupdate.nix
@@ -74,8 +74,7 @@ pkgs.buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     defaultSettings = {
       shared_preload_libraries = [ "safeupdate" ];
     };
diff --git a/nix/ext/pg_cron/default.nix b/nix/ext/pg_cron/default.nix
@@ -110,7 +110,6 @@ buildEnv {
 
   passthru = {
     inherit versions numberOfVersions switch-ext-version;
-    pname = "${pname}-all";
     hasBackgroundWorker = true;
     defaultSettings = {
       shared_preload_libraries = [ "pg_cron" ];
diff --git a/nix/ext/pg_graphql/default.nix b/nix/ext/pg_graphql/default.nix
@@ -172,8 +172,7 @@ in
     )
   '';
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pg_hashids.nix b/nix/ext/pg_hashids.nix
@@ -93,8 +93,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pg_jsonschema/default.nix b/nix/ext/pg_jsonschema/default.nix
@@ -165,8 +165,7 @@ in
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pg_net.nix b/nix/ext/pg_net.nix
@@ -116,8 +116,7 @@ pkgs.buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     hasBackgroundWorker = true;
     defaultSettings = {
       shared_preload_libraries = [ "pg_net" ];
diff --git a/nix/ext/pg_plan_filter.nix b/nix/ext/pg_plan_filter.nix
@@ -75,8 +75,7 @@ pkgs.buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     defaultSettings = {
       shared_preload_libraries = [ "plan_filter" ];
     };
diff --git a/nix/ext/pg_repack.nix b/nix/ext/pg_repack.nix
@@ -129,8 +129,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pg_stat_monitor.nix b/nix/ext/pg_stat_monitor.nix
@@ -97,8 +97,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pg_tle.nix b/nix/ext/pg_tle.nix
@@ -100,8 +100,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     defaultSettings = {
       shared_preload_libraries = [ "pg_tle" ];
     };
diff --git a/nix/ext/pgaudit.nix b/nix/ext/pgaudit.nix
@@ -231,8 +231,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
     defaultSettings = {
diff --git a/nix/ext/pgjwt.nix b/nix/ext/pgjwt.nix
@@ -77,8 +77,7 @@ buildEnv {
   pathsToLink = [ "/share/postgresql/extension" ];
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pgmq/default.nix b/nix/ext/pgmq/default.nix
@@ -99,11 +99,10 @@ buildEnv {
   pathsToLink = [ "/share/postgresql/extension" ];
 
   passthru = {
-    inherit versions numberOfVersions;
+    inherit versions numberOfVersions pname;
     defaultSettings = {
       search_path = "\"$user\", public, auth, extensions";
     };
-    pname = "${pname}-all";
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pgroonga/default.nix b/nix/ext/pgroonga/default.nix
@@ -170,8 +170,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pgrouting.nix b/nix/ext/pgrouting.nix
@@ -136,8 +136,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pgsodium.nix b/nix/ext/pgsodium.nix
@@ -101,8 +101,7 @@ pkgs.buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pgsql-http.nix b/nix/ext/pgsql-http.nix
@@ -103,8 +103,7 @@ pkgs.buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/pgvector.nix b/nix/ext/pgvector.nix
@@ -83,8 +83,7 @@ pkgs.buildEnv {
   ];
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
     pgRegressTestName = "pgvector";
diff --git a/nix/ext/plpgsql-check.nix b/nix/ext/plpgsql-check.nix
@@ -131,7 +131,6 @@ buildEnv {
 
   passthru = {
     inherit versions numberOfVersions switch-ext-version;
-    pname = "${pname}-all";
     hasBackgroundWorker = true;
     defaultSettings = {
       shared_preload_libraries = [
diff --git a/nix/ext/plv8/default.nix b/nix/ext/plv8/default.nix
@@ -240,8 +240,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/postgis.nix b/nix/ext/postgis.nix
@@ -204,8 +204,7 @@ in
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/rum.nix b/nix/ext/rum.nix
@@ -94,8 +94,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };
diff --git a/nix/ext/tests/default.nix b/nix/ext/tests/default.nix
@@ -12,7 +12,7 @@ let
       inherit (pkgs) lib;
       installedExtension =
         postgresMajorVersion:
-        self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+        self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
       versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
       postgresqlWithExtension =
         postgresql:
diff --git a/nix/ext/tests/http.nix b/nix/ext/tests/http.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pg_plan_filter.nix b/nix/ext/tests/pg_plan_filter.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pg_repack.nix b/nix/ext/tests/pg_repack.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pg_safeupdate.nix b/nix/ext/tests/pg_safeupdate.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgjwt.nix b/nix/ext/tests/pgjwt.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgmq.nix b/nix/ext/tests/pgmq.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgroonga.nix b/nix/ext/tests/pgroonga.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgrouting.nix b/nix/ext/tests/pgrouting.nix
@@ -3,7 +3,8 @@ let
   pname = "pgrouting";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
@@ -16,10 +17,11 @@ let
             postgresql
             postgresql.lib
             (installedExtension majorVersion)
-            (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.postgis-all)
+            (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.postgis)
           ]
-          ++ lib.optional (postgresql.isOrioleDB
-          ) (self.legacyPackages.${pkgs.system}."psql_orioledb-17".exts.orioledb);
+          ++ lib.optional (postgresql.isOrioleDB) (
+            self.legacyPackages.${pkgs.system}."psql_orioledb-17".exts.orioledb
+          );
         passthru = {
           inherit (postgresql) version psqlSchema;
           lib = pkg;
diff --git a/nix/ext/tests/pgsodium.nix b/nix/ext/tests/pgsodium.nix
@@ -3,7 +3,8 @@ let
   pname = "pgsodium";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
@@ -15,7 +16,7 @@ let
           postgresql
           postgresql.lib
           (installedExtension majorVersion)
-          (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.hypopg-all)
+          (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.hypopg)
         ];
         passthru = {
           inherit (postgresql) version psqlSchema;
diff --git a/nix/ext/tests/plpgsql_check.nix b/nix/ext/tests/plpgsql_check.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/plv8.nix b/nix/ext/tests/plv8.nix
@@ -5,7 +5,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/postgis.nix b/nix/ext/tests/postgis.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/timescaledb.nix b/nix/ext/tests/timescaledb.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) lib;
   installedExtension =
     postgresMajorVersion:
-    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}";
   versions = (installedExtension "15").versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/vault.nix b/nix/ext/tests/vault.nix
diff --git a/nix/ext/timescaledb.nix b/nix/ext/timescaledb.nix
diff --git a/nix/ext/vault.nix b/nix/ext/vault.nix
diff --git a/nix/ext/wal2json.nix b/nix/ext/wal2json.nix
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
diff --git a/nix/packages/postgres.nix b/nix/packages/postgres.nix
