From 72813a3b4e68cfb089a2211cfc64732c5efe64cb Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Fri, 9 Aug 2024 12:18:50 -0500 Subject: [PATCH 1/2] fix: nix replica command --- flake.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 4cd1992f2..3e60780bc 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ # The 'oriole_pkgs' variable holds all the upstream packages in nixpkgs, which # we can use to build our own images; it is the common name to refer to # a copy of nixpkgs which contains all its packages. - # it also serves as a base for importing the orioldb/postgres overlay to + # it also serves as a base for importing the orioldb/postgres overlay to #build the orioledb postgres patched version of postgresql16 oriole_pkgs = import nixpkgs { config = { allowUnfree = true; }; @@ -302,7 +302,7 @@ ''; # Start a version of the client and runs migrations script on server. - start-client-and-migrate = + start-client-and-migrate = let migrationsDir = ./migrations/db; postgresqlSchemaSql = ./nix/tools/postgresql_schema.sql; @@ -346,7 +346,7 @@ mkdir -p $out/bin substitute ${./nix/tools/run-replica.sh.in} $out/bin/start-postgres-replica \ --subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \ - --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'\ + --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' chmod +x $out/bin/start-postgres-replica ''; sync-exts-versions = pkgs.runCommand "sync-exts-versions" { } '' @@ -356,7 +356,7 @@ --subst-var-by 'JQ' '${pkgs.jq}/bin/jq' \ --subst-var-by 'NIX_EDITOR' '${nix-editor.packages.${system}.nix-editor}/bin/nix-editor' \ --subst-var-by 'NIXPREFETCHURL' '${pkgs.nixVersions.nix_2_20}/bin/nix-prefetch-url' \ - --subst-var-by 'NIX' '${pkgs.nixVersions.nix_2_20}/bin/nix' + --subst-var-by 'NIX' '${pkgs.nixVersions.nix_2_20}/bin/nix' chmod +x $out/bin/sync-exts-versions ''; }; @@ -392,7 +392,7 @@ # Create a simple script to echo the key echo '#!/bin/sh' > $TMPDIR/getkey.sh echo 'echo $PGSODIUM_KEY' >> $TMPDIR/getkey.sh - chmod +x $TMPDIR/getkey.sh + chmod +x $TMPDIR/getkey.sh initdb --locale=C substitute ${./nix/tests/postgresql.conf.in} $PGDATA/postgresql.conf \ --subst-var-by PGSODIUM_GETKEY_SCRIPT "$TMPDIR/getkey.sh" @@ -430,7 +430,7 @@ --host=localhost \ --port=5432 \ $(ls ${./nix/tests/sql} | sed -e 's/\..*$//' | sort ) - + pg_ctl -D "$PGDATA" stop mv $TMPDIR/logfile/postgresql.log $out echo ${pgpkg} From 0bb6abe674b49b7666e924ac7c49f49921acf8da Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Fri, 9 Aug 2024 12:20:52 -0500 Subject: [PATCH 2/2] bump to pg_net 0.9.3 This will only be updated for Nix. --- common-nix.vars.pkr.hcl | 2 +- nix/ext/pg_net.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common-nix.vars.pkr.hcl b/common-nix.vars.pkr.hcl index 9b378b4b7..db1efb0a9 100644 --- a/common-nix.vars.pkr.hcl +++ b/common-nix.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.6.1.108" +postgres-version = "15.6.1.109" diff --git a/nix/ext/pg_net.nix b/nix/ext/pg_net.nix index 509114dc1..d17de4365 100644 --- a/nix/ext/pg_net.nix +++ b/nix/ext/pg_net.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_net"; - version = "0.9.2"; + version = "0.9.3"; buildInputs = [ curl postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "supabase"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ac3lpHhBFTxeSb/HERwZ4fT8PJ7Ibrivn/hDkrs0IYE="; + hash = "sha256-pgyGMJiwmIrghmWOieJoQjWma/A4XAsqLzCjmAyuU9w="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error";