diff --git a/nix/packages/extension-catalog.nix b/nix/packages/extension-catalog.nix index d8d559121..547f7baaa 100644 --- a/nix/packages/extension-catalog.nix +++ b/nix/packages/extension-catalog.nix @@ -116,13 +116,6 @@ '' ) ) perMajor; - - versions = lib.mapAttrs' ( - major: wrappers: - lib.nameValuePair "site-extensions-versions-${major}" ( - lib.recurseIntoAttrs (lib.mapAttrs (_: lib.recurseIntoAttrs) wrappers) - ) - ) perMajor; in { packages = catalogs // { @@ -163,6 +156,6 @@ ''; }; }; - legacyPackages = catalogs // versions; + legacyPackages = catalogs; }; } diff --git a/nix/packages/postgres.nix b/nix/packages/postgres.nix index 87daccdae..279ad638c 100644 --- a/nix/packages/postgres.nix +++ b/nix/packages/postgres.nix @@ -216,17 +216,21 @@ # installed, and a receipt.json file containing metadata about the # install. # - exts: an attrset containing all the extensions, mapped to their - # package names. + # package names. Not exposed for the "cli" variant. makePostgres = version: { variant ? "full", latestOnly ? false, }: - lib.recurseIntoAttrs { - bin = makePostgresBin version { inherit variant latestOnly; }; - exts = makeOurPostgresPkgsSet version { inherit variant latestOnly; }; - }; + lib.recurseIntoAttrs ( + { + bin = makePostgresBin version { inherit variant latestOnly; }; + } + // lib.optionalAttrs (variant != "cli") { + exts = makeOurPostgresPkgsSet version { inherit variant latestOnly; }; + } + ); basePackages = { psql_15 = makePostgres "15" { }; psql_17 = makePostgres "17" { };