supabase-postgres.git / summary / log / commit / refs

commit    6e50974b3b3cbbfaf8f0ded8f5fbc47aa1728a2f
Author:   Leonardo Santiago <leonardo.ribeiro.santiago@gmail.com>
Commit:   GitHub <noreply@github.com>
Date:     Thu Dec 25 01:03:50 2025 +0000

    fix(nix): use the same postgresql inside switch-ext-version (#1990)
    
    * fix(nix): use the same postgresql inside switch-ext-version
    
    currently, `switch-ext-version` uses `nixpkgs.postgresql`, instead of
    the `postgresql` chosen from outside.
    
    * chore: run nix fmt


 nix/packages/postgres.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nix/packages/postgres.nix b/nix/packages/postgres.nix
index aa6cc9e4..e4de2eeb 100644
--- a/nix/packages/postgres.nix
+++ b/nix/packages/postgres.nix
@@ -102,8 +102,16 @@
               dbExtensions17
             else
               ourExtensions;
+          extCallPackage = pkgs.lib.callPackageWith (
+            pkgs
+            // {
+              inherit postgresql;
+              switch-ext-version = extCallPackage ./switch-ext-version.nix { };
+              overlayfs-on-package = extCallPackage ./overlayfs-on-package.nix { };
+            }
+          );
         in
-        map (path: pkgs.callPackage path { inherit postgresql; }) extensionsToUse;
+        map (path: extCallPackage path { }) extensionsToUse;
 
       # Create an attrset that contains all the extensions included in a server.
       makeOurPostgresPkgsSet =
@@ -136,12 +144,13 @@
         version:
         let
           postgresql = getPostgresqlPackage version;
+          postgres-pkgs = makeOurPostgresPkgs version;
           ourExts = map (ext: {
             name = ext.name;
             version = ext.version;
-          }) (makeOurPostgresPkgs version);
+          }) postgres-pkgs;
 
-          pgbin = postgresql.withPackages (_ps: makeOurPostgresPkgs version);
+          pgbin = postgresql.withPackages (_ps: postgres-pkgs);
         in
         pkgs.symlinkJoin {
           inherit (pgbin) name version;


[parent: 431bbc662501]