graham/prop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump nix postgres from 16 to 17

Browse source
This commit is contained in:
Graham McInitre 2026-07-16 09:23:39 -05:00
parent 57bd89166f
commit 2e720875c4
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nix/shell.nix
View file

@ -6,7 +6,7 @@
# Elixir/Erlang # Elixir/Erlang
elixir, elixir,
# Database # Database
postgresql_16, postgresql_17,
# Rust toolchain # Rust toolchain
rustup, rustup,
rust-analyzer, rust-analyzer,
@ -45,7 +45,7 @@ let
# Initialize PostgreSQL if needed # Initialize PostgreSQL if needed
if [ ! -d "${pgDataDir}" ]; then if [ ! -d "${pgDataDir}" ]; then
echo "Initializing PostgreSQL database..." echo "Initializing PostgreSQL database..."
${postgresql_16}/bin/initdb -D ${pgDataDir} -U $USER --encoding=UTF8 --locale=en_US.UTF-8 ${postgresql_17}/bin/initdb -D ${pgDataDir} -U $USER --encoding=UTF8 --locale=en_US.UTF-8
# Configure PostgreSQL for development (fast but unsafe for production) # Configure PostgreSQL for development (fast but unsafe for production)
cat >> ${pgDataDir}/postgresql.conf << EOF cat >> ${pgDataDir}/postgresql.conf << EOF
@ -59,16 +59,16 @@ let
fi fi
# Check if PostgreSQL is already running on this port # Check if PostgreSQL is already running on this port
if ${postgresql_16}/bin/pg_isready -h ${pgHost} -p ${pgPort} > /dev/null 2>&1; then if ${postgresql_17}/bin/pg_isready -h ${pgHost} -p ${pgPort} > /dev/null 2>&1; then
echo "PostgreSQL already running on port ${pgPort}" echo "PostgreSQL already running on port ${pgPort}"
else else
# Start PostgreSQL # Start PostgreSQL
echo "Starting PostgreSQL on port ${pgPort}..." echo "Starting PostgreSQL on port ${pgPort}..."
${postgresql_16}/bin/pg_ctl -D ${pgDataDir} -l ${pgDataDir}/logfile -o "-p ${pgPort}" start ${postgresql_17}/bin/pg_ctl -D ${pgDataDir} -l ${pgDataDir}/logfile -o "-p ${pgPort}" start
# Wait for PostgreSQL to be ready # Wait for PostgreSQL to be ready
for i in {1..30}; do for i in {1..30}; do
if ${postgresql_16}/bin/pg_isready -h ${pgHost} -p ${pgPort} > /dev/null 2>&1; then if ${postgresql_17}/bin/pg_isready -h ${pgHost} -p ${pgPort} > /dev/null 2>&1; then
break break
fi fi
if [ $i -eq 30 ]; then if [ $i -eq 30 ]; then
@ -82,16 +82,16 @@ let
fi fi
# Create postgres role if it doesn't exist (needed by some tools) # Create postgres role if it doesn't exist (needed by some tools)
${postgresql_16}/bin/psql -h ${pgHost} -p ${pgPort} -U $USER -d postgres -tc \ ${postgresql_17}/bin/psql -h ${pgHost} -p ${pgPort} -U $USER -d postgres -tc \
"SELECT 1 FROM pg_roles WHERE rolname='postgres'" | grep -q 1 || \ "SELECT 1 FROM pg_roles WHERE rolname='postgres'" | grep -q 1 || \
${postgresql_16}/bin/psql -h ${pgHost} -p ${pgPort} -U $USER -d postgres -c \ ${postgresql_17}/bin/psql -h ${pgHost} -p ${pgPort} -U $USER -d postgres -c \
"CREATE ROLE postgres WITH SUPERUSER LOGIN;" "CREATE ROLE postgres WITH SUPERUSER LOGIN;"
# Create development and test databases # Create development and test databases
for db in prop_dev prop_test; do for db in prop_dev prop_test; do
${postgresql_16}/bin/psql -h ${pgHost} -p ${pgPort} -U $USER -d postgres -tc \ ${postgresql_17}/bin/psql -h ${pgHost} -p ${pgPort} -U $USER -d postgres -tc \
"SELECT 1 FROM pg_database WHERE datname='$db'" | grep -q 1 || \ "SELECT 1 FROM pg_database WHERE datname='$db'" | grep -q 1 || \
${postgresql_16}/bin/createdb -h ${pgHost} -p ${pgPort} -U $USER $db ${postgresql_17}/bin/createdb -h ${pgHost} -p ${pgPort} -U $USER $db
done done
# Mark services as started # Mark services as started
@ -112,7 +112,7 @@ let
# Stop PostgreSQL # Stop PostgreSQL
if [ -d "${pgDataDir}" ]; then if [ -d "${pgDataDir}" ]; then
${postgresql_16}/bin/pg_ctl -D ${pgDataDir} stop -m fast 2>/dev/null || true ${postgresql_17}/bin/pg_ctl -D ${pgDataDir} stop -m fast 2>/dev/null || true
echo "PostgreSQL stopped" echo "PostgreSQL stopped"
fi fi
@ -182,7 +182,7 @@ mkShell {
elixir elixir
# Database # Database
postgresql_16 postgresql_17
# Rust toolchain # Rust toolchain
rustup rustup