From 5701fabc92695a6d27866390a571284c095af600 Mon Sep 17 00:00:00 2001
From: Leonardo Santiago <leonardo.ribeiro.santiago@gmail.com>
Date: Tue, 23 Dec 2025 10:32:53 -0300
Subject: [PATCH 1/2] fix(nix): use the same postgresql inside
 switch-ext-version

currently, `switch-ext-version` uses `nixpkgs.postgresql`, instead of
the `postgresql` chosen from outside.
---
 nix/packages/postgres.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nix/packages/postgres.nix b/nix/packages/postgres.nix
index aa6cc9e4c..59792846c 100644
--- a/nix/packages/postgres.nix
+++ b/nix/packages/postgres.nix
@@ -102,8 +102,13 @@
               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 +141,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;

From 3f8b9545a69b641b41a6d078e7963fdcb0d7fc16 Mon Sep 17 00:00:00 2001
From: Leonardo Santiago <leonardo.ribeiro.santiago@gmail.com>
Date: Tue, 23 Dec 2025 10:52:00 -0300
Subject: [PATCH 2/2] chore: run nix fmt

---
 nix/packages/postgres.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nix/packages/postgres.nix b/nix/packages/postgres.nix
index 59792846c..e4de2eebe 100644
--- a/nix/packages/postgres.nix
+++ b/nix/packages/postgres.nix
@@ -102,11 +102,14 @@
               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 {};
-          });
+          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: extCallPackage path { }) extensionsToUse;