refactor: migrate from packages to legacyPackages for PostgreSQL extensions

jfroche · jfroche · commit fab8a231391b · 2025-12-01T12:45:19.000+01:00
To be able to build extensions versions packages separately in CI, we
need to expose them in a nested structure. It is currently not possible
to do so with the flattened packages structure, as the individual
extension packages are not directly accessible.

In this change, we replace the flattened package structure with nested
legacyPackages to improve discoverability of individual extension
packages.
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'.packages."psql_${majorVersion}/exts/pgroonga-all";
+              pgroonga = self'.legacyPackages."psql_${majorVersion}".exts.pgroonga-all;
 
               pgPort =
                 if (majorVersion == "17") then
diff --git a/nix/ext/tests/default.nix b/nix/ext/tests/default.nix
@@ -11,7 +11,8 @@ let
       pname = extension_name;
       inherit (pkgs) lib;
       installedExtension =
-        postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+        postgresMajorVersion:
+        self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
       versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
       postgresqlWithExtension =
         postgresql:
diff --git a/nix/ext/tests/http.nix b/nix/ext/tests/http.nix
@@ -3,7 +3,8 @@ let
   pname = "http";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/orioledb.nix b/nix/ext/tests/orioledb.nix
@@ -11,7 +11,7 @@ let
         paths = [
           postgresql
           postgresql.lib
-          self.packages.${pkgs.system}."psql_orioledb-17/exts/orioledb"
+          (self.legacyPackages.${pkgs.system}."psql_orioledb-17".exts.orioledb)
         ];
         passthru = {
           inherit (postgresql) version psqlSchema;
diff --git a/nix/ext/tests/pg_plan_filter.nix b/nix/ext/tests/pg_plan_filter.nix
@@ -3,7 +3,8 @@ let
   pname = "plan_filter";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pg_repack.nix b/nix/ext/tests/pg_repack.nix
@@ -3,7 +3,8 @@ let
   pname = "pg_repack";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pg_safeupdate.nix b/nix/ext/tests/pg_safeupdate.nix
@@ -3,7 +3,8 @@ let
   pname = "safeupdate";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgjwt.nix b/nix/ext/tests/pgjwt.nix
@@ -3,7 +3,8 @@ let
   pname = "pgjwt";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgmq.nix b/nix/ext/tests/pgmq.nix
@@ -3,7 +3,8 @@ let
   pname = "pgmq";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgroonga.nix b/nix/ext/tests/pgroonga.nix
@@ -3,7 +3,8 @@ let
   pname = "pgroonga";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/pgrouting.nix b/nix/ext/tests/pgrouting.nix
@@ -3,7 +3,7 @@ let
   pname = "pgrouting";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion: self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
@@ -16,10 +16,10 @@ let
             postgresql
             postgresql.lib
             (installedExtension majorVersion)
-            self.packages.${pkgs.system}."psql_${majorVersion}/exts/postgis-all"
+            (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.postgis-all)
           ]
           ++ lib.optional (postgresql.isOrioleDB
-          ) self.packages.${pkgs.system}."psql_orioledb-17/exts/orioledb";
+          ) (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,7 @@ let
   pname = "pgsodium";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion: self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
@@ -15,7 +15,7 @@ let
           postgresql
           postgresql.lib
           (installedExtension majorVersion)
-          self.packages.${pkgs.system}."psql_${majorVersion}/exts/hypopg-all"
+          (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.hypopg-all)
         ];
         passthru = {
           inherit (postgresql) version psqlSchema;
diff --git a/nix/ext/tests/plpgsql_check.nix b/nix/ext/tests/plpgsql_check.nix
@@ -3,7 +3,8 @@ let
   pname = "plpgsql_check";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/plv8.nix b/nix/ext/tests/plv8.nix
@@ -4,7 +4,8 @@ let
   pname = "plv8";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/postgis.nix b/nix/ext/tests/postgis.nix
@@ -3,7 +3,8 @@ let
   pname = "postgis";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/timescaledb.nix b/nix/ext/tests/timescaledb.nix
@@ -3,7 +3,8 @@ let
   pname = "timescaledb";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion:
+    self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = (installedExtension "15").versions;
   postgresqlWithExtension =
     postgresql:
diff --git a/nix/ext/tests/vault.nix b/nix/ext/tests/vault.nix
@@ -3,7 +3,7 @@ let
   pname = "supabase_vault";
   inherit (pkgs) lib;
   installedExtension =
-    postgresMajorVersion: self.packages.${pkgs.system}."psql_${postgresMajorVersion}/exts/${pname}-all";
+    postgresMajorVersion: self.legacyPackages.${pkgs.system}."psql_${postgresMajorVersion}".exts."${pname}-all";
   versions = postgresqlMajorVersion: (installedExtension postgresqlMajorVersion).versions;
   postgresqlWithExtension =
     postgresql:
@@ -15,7 +15,7 @@ let
           postgresql
           postgresql.lib
           (installedExtension majorVersion)
-          self.packages.${pkgs.system}."psql_${majorVersion}/exts/pgsodium-all" # dependency
+          (self.legacyPackages.${pkgs.system}."psql_${majorVersion}".exts.pgsodium-all) # dependency
         ];
         passthru = {
           inherit (postgresql) version psqlSchema;
diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
@@ -220,9 +220,10 @@ let
     v: !(builtins.elem v versions)
   ) allPreviouslyPackagedVersions;
   numberOfPreviouslyPackagedVersions = builtins.length previouslyPackagedVersions;
-  packages = builtins.attrValues (
-    lib.mapAttrs (name: value: build name value.hash value.rust value.pgrx) supportedVersions
-  );
+  packagesAttrSet = lib.mapAttrs (
+    name: value: build name value.hash value.rust value.pgrx
+  ) supportedVersions;
+  packages = builtins.attrValues packagesAttrSet;
 in
 (buildEnv {
   name = pname;
@@ -305,9 +306,13 @@ in
   '';
   passthru = {
     inherit versions numberOfVersions;
-    pname = "${pname}-all";
+    pname = "${pname}";
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
+    # Expose individual packages for CI to build separately
+    packages = packagesAttrSet // {
+      recurseForDerivations = true;
+    };
   };
 }).overrideAttrs
   (_: {
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -63,7 +63,7 @@
           start-server = pkgs-lib.makePostgresDevSetup {
             inherit pkgs;
             name = "start-postgres-server";
-            pgroonga = self'.packages."psql_${activeVersion}/exts/pgroonga-all";
+            pgroonga = self'.legacyPackages."psql_${activeVersion}".exts.pgroonga-all;
           };
           switch-ext-version = pkgs.callPackage ./switch-ext-version.nix {
             inherit (self'.packages) overlayfs-on-package;
diff --git a/nix/packages/github-matrix/tests/test_github_matrix.py b/nix/packages/github-matrix/tests/test_github_matrix.py
@@ -15,8 +15,14 @@
 class TestIsExtensionPkg:
     def test_extension_package(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.x86_64-linux.psql_15.exts.pg_cron",
-            "attrPath": ["packages", "x86_64-linux", "psql_15", "exts", "pg_cron"],
+            "attr": "legacyPackages.x86_64-linux.psql_15.exts.pg_cron",
+            "attrPath": [
+                "legacyPackages",
+                "x86_64-linux",
+                "psql_15",
+                "exts",
+                "pg_cron",
+            ],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "pg_cron",
@@ -26,8 +32,8 @@ def test_extension_package(self):
 
     def test_non_extension_package(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.x86_64-linux.psql_15",
-            "attrPath": ["packages", "x86_64-linux", "psql_15"],
+            "attr": "legacyPackages.x86_64-linux.psql_15",
+            "attrPath": ["legacyPackages", "x86_64-linux", "psql_15"],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "postgresql-16.0",
@@ -40,12 +46,12 @@ class TestIsLargePkg:
     @pytest.mark.parametrize(
         "attr,expected",
         [
-            ("packages.x86_64-linux.psql_15.exts.wrappers", True),
-            ("packages.x86_64-linux.psql_15.exts.pg_jsonschema", True),
-            ("packages.x86_64-linux.psql_15.exts.pg_graphql", True),
-            ("packages.x86_64-linux.psql_15.exts.postgis", True),
-            ("packages.x86_64-linux.psql_15.exts.pg_cron", False),
-            ("packages.x86_64-linux.psql_15", False),
+            ("legacyPackages.x86_64-linux.psql_15.exts.wrappers", True),
+            ("legacyPackages.x86_64-linux.psql_15.exts.pg_jsonschema", True),
+            ("legacyPackages.x86_64-linux.psql_15.exts.pg_graphql", True),
+            ("legacyPackages.x86_64-linux.psql_15.exts.postgis", True),
+            ("legacyPackages.x86_64-linux.psql_15.exts.pg_cron", False),
+            ("legacyPackages.x86_64-linux.psql_15", False),
         ],
     )
     def test_large_package_detection(self, attr: str, expected: bool):
@@ -121,8 +127,14 @@ def test_kvm_package_aarch64_linux(self):
 
     def test_large_package_x86_64_linux(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.x86_64-linux.psql_15.exts.postgis",
-            "attrPath": ["packages", "x86_64-linux", "psql_15", "exts", "postgis"],
+            "attr": "legacyPackages.x86_64-linux.psql_15.exts.postgis",
+            "attrPath": [
+                "legacyPackages",
+                "x86_64-linux",
+                "psql_15",
+                "exts",
+                "postgis",
+            ],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "postgis",
@@ -134,8 +146,14 @@ def test_large_package_x86_64_linux(self):
 
     def test_large_package_aarch64_linux(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.aarch64-linux.psql_15.exts.pg_graphql",
-            "attrPath": ["packages", "aarch64-linux", "psql_15", "exts", "pg_graphql"],
+            "attr": "legacyPackages.aarch64-linux.psql_15.exts.pg_graphql",
+            "attrPath": [
+                "legacyPackages",
+                "aarch64-linux",
+                "psql_15",
+                "exts",
+                "pg_graphql",
+            ],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "pg_graphql",
@@ -147,8 +165,8 @@ def test_large_package_aarch64_linux(self):
 
     def test_darwin_package(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.aarch64-darwin.psql_15",
-            "attrPath": ["packages", "aarch64-darwin", "psql_15"],
+            "attr": "legacyPackages.aarch64-darwin.psql_15",
+            "attrPath": ["legacyPackages", "aarch64-darwin", "psql_15"],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "postgresql-16.0",
@@ -162,8 +180,14 @@ def test_darwin_package(self):
 
     def test_default_x86_64_linux(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.x86_64-linux.psql_15.exts.pg_cron",
-            "attrPath": ["packages", "x86_64-linux", "psql_15", "exts", "pg_cron"],
+            "attr": "legacyPackages.x86_64-linux.psql_15.exts.pg_cron",
+            "attrPath": [
+                "legacyPackages",
+                "x86_64-linux",
+                "psql_15",
+                "exts",
+                "pg_cron",
+            ],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "pg_cron",
@@ -174,8 +198,14 @@ def test_default_x86_64_linux(self):
 
     def test_default_aarch64_linux(self):
         pkg: NixEvalJobsOutput = {
-            "attr": "packages.aarch64-linux.psql_15.exts.pg_cron",
-            "attrPath": ["packages", "aarch64-linux", "psql_15", "exts", "pg_cron"],
+            "attr": "legacyPackages.aarch64-linux.psql_15.exts.pg_cron",
+            "attrPath": [
+                "legacyPackages",
+                "aarch64-linux",
+                "psql_15",
+                "exts",
+                "pg_cron",
+            ],
             "cacheStatus": "notBuilt",
             "drvPath": "/nix/store/test.drv",
             "name": "pg_cron",
diff --git a/nix/packages/postgres.nix b/nix/packages/postgres.nix
