about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-02-04 12:00:55 +0000
committerGitHub <noreply@github.com>2024-02-04 12:00:55 +0000
commitd87f22085ff5dc02443920b1607212373ef1cf00 (patch)
treeb93b668e440ab14a6714b8b95fac29df5844a170 /pkgs/build-support
parent1e6d207240201cbd26c3e91f41a4d8c4cbeaf517 (diff)
parent4dc52ec83fdbd25e53f84a10992d303d24c4c6e8 (diff)
downloadnixlib-d87f22085ff5dc02443920b1607212373ef1cf00.tar
nixlib-d87f22085ff5dc02443920b1607212373ef1cf00.tar.gz
nixlib-d87f22085ff5dc02443920b1607212373ef1cf00.tar.bz2
nixlib-d87f22085ff5dc02443920b1607212373ef1cf00.tar.lz
nixlib-d87f22085ff5dc02443920b1607212373ef1cf00.tar.xz
nixlib-d87f22085ff5dc02443920b1607212373ef1cf00.tar.zst
nixlib-d87f22085ff5dc02443920b1607212373ef1cf00.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
index 3eec67d60feb..d09153b2d644 100644
--- a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
+++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
@@ -56,6 +56,8 @@ EOF
   echo 'initializing postgresql'
   initdb -U postgres
 
+  echo "$postgresqlExtraSettings" >>"$PGDATA/postgresql.conf"
+
   # Move the socket
   echo "unix_socket_directories = '$NIX_BUILD_TOP/run/postgresql'" >>"$PGDATA/postgresql.conf"