From 3e0f110c5276f4e4aa4a2cca043e43f7d02ddb1d Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 1 May 2026 13:38:26 +0200
Subject: [PATCH 1/3] postgresqlTestExtension: use __structuredAttrs instead of
 passAsFile

---
 pkgs/servers/sql/postgresql/postgresqlTestExtension.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
index 0143ce3150ef..734e7b4e3f90 100644
--- a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
+++ b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
@@ -22,7 +22,6 @@ stdenvNoCC.mkDerivation (
       (postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
     ];
     postgresqlTestUserOptions = "LOGIN SUPERUSER";
-    passAsFile = [ "sql" ];
     sql =
       sql
       + lib.concatMapStrings (
@@ -39,10 +38,13 @@ stdenvNoCC.mkDerivation (
       ) asserts;
     checkPhase = ''
       runHook preCheck
+      sqlPath=$TMPDIR/test.sql
+      printf "%s" "$sql" > $sqlPath
       psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
       runHook postCheck
     '';
     installPhase = "touch $out";
+    __structuredAttrs = true;
   }
   // lib.removeAttrs extraArgs [
     "asserts"

From eeda6cc401cc0680efce8c0949221faf2ff79c72 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 29 Apr 2026 00:36:24 +0200
Subject: [PATCH 2/3] postgresqlPackages.pgtap: use __structuredAttrs instead
 of passAsFile

---
 pkgs/servers/sql/postgresql/ext/pgtap.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 2bae99603e03..08052a5cf20f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -35,7 +35,6 @@ postgresqlBuildExtension (finalAttrs: {
       postgresqlTestHook
       (postgresql.withPackages (_: [ finalAttrs.finalPackage ]))
     ];
-    passAsFile = [ "sql" ];
     sql = ''
       CREATE EXTENSION pgtap;
 
@@ -47,10 +46,13 @@ postgresqlBuildExtension (finalAttrs: {
     '';
     checkPhase = ''
       runHook preCheck
+      sqlPath=$TMPDIR/test.sql
+      printf "%s" "$sql" > $sqlPath
       psql -a -v ON_ERROR_STOP=1 -f $sqlPath
       runHook postCheck
     '';
     installPhase = "touch $out";
+    __structuredAttrs = true;
   };
 
   meta = {

From 8271ddc8cea59f40ee955bb1b9c56db48c9fe883 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 29 Apr 2026 00:39:17 +0200
Subject: [PATCH 3/3] postgresqlTestHook: use __structuredAttrs instead of
 passAsFile

---
 pkgs/by-name/po/postgresqlTestHook/test.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/postgresqlTestHook/test.nix b/pkgs/by-name/po/postgresqlTestHook/test.nix
index 44650bc60eca..eb2799d7ea98 100644
--- a/pkgs/by-name/po/postgresqlTestHook/test.nix
+++ b/pkgs/by-name/po/postgresqlTestHook/test.nix
@@ -10,7 +10,6 @@ stdenv.mkDerivation {
   nativeCheckInputs = [ postgresql ];
   dontUnpack = true;
   doCheck = true;
-  passAsFile = [ "sql" ];
   sql = ''
     CREATE TABLE hello (
       message text
@@ -23,6 +22,8 @@ stdenv.mkDerivation {
   '';
   checkPhase = ''
     runHook preCheck
+    sqlPath=$TMPDIR/test.sql
+    printf "%s" "$sql" > $sqlPath
     psql <$sqlPath | grep 'it worked'
     TEST_RAN=1
     runHook postCheck
@@ -31,4 +32,5 @@ stdenv.mkDerivation {
     [[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]]
     touch $out
   '';
+  __structuredAttrs = true;
 }