From a9d9cf61deef6ac61094bf202515cb4269f2936f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Mon, 6 Jul 2026 17:49:18 +0300 Subject: [PATCH 1/3] hotfix: backfill x86 ami --- ansible/vars.yml | 6 ++--- nix/packages/default.nix | 5 +++- nix/packages/hotfix-pin.nix | 50 +++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 nix/packages/hotfix-pin.nix diff --git a/ansible/vars.yml b/ansible/vars.yml index c0ab29ef8..d5b8ddbab 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.099-orioledb" - postgres17: "17.6.1.142" - postgres15: "15.14.1.142" + postgresorioledb-17: "17.6.0.099-orioledb-ignore1" + postgres17: "17.6.1.104-backfill" + postgres15: "15.14.1.142-ignore1" # Non Postgres Extensions pgbouncer_release: 1.25.1 diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a452a9b78..0c4a6e710 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -1,6 +1,9 @@ { self, inputs, ... }: { - imports = [ ./postgres.nix ]; + imports = [ + ./postgres.nix + ./hotfix-pin.nix + ]; perSystem = { inputs', diff --git a/nix/packages/hotfix-pin.nix b/nix/packages/hotfix-pin.nix new file mode 100644 index 000000000..11fa20f25 --- /dev/null +++ b/nix/packages/hotfix-pin.nix @@ -0,0 +1,50 @@ +{ ... }: +{ + perSystem = + { + self', + lib, + pkgs, + system, + ... + }: + let + # Rebuild old release as an x86_64 linux AMI. + # Reuse old packages from the legacy flake to avoid version differences in postgresql and extensions. + postgres_old = + # tag 17.6.1.104 + (builtins.getFlake "github:supabase/postgres/2997c92770dd85e6450e3e2c7d2c843f4717f492") + .packages.${system}; + + psql_old_with_latest_supautils = + let + oldPsql = postgres_old."psql_17/bin"; + supautils = self'.legacyPackages.psql_17.exts.supautils; + in + pkgs.runCommand "${oldPsql.name}-supautils-${supautils.version}" + { + inherit (oldPsql) version; + nativeBuildInputs = [ pkgs.jq ]; + } + '' + cp -a ${oldPsql}/. $out/ + chmod -R u+w $out + rm -f $out/lib/supautils${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} + ln -s ${supautils}/lib/* $out/lib/ + + # update receipt + jq --arg version '${supautils.version}' \ + '(.extensions[] | select(.name == "supautils") | .version) = $version' \ + $out/receipt.json > $out/receipt.json.tmp + mv $out/receipt.json.tmp $out/receipt.json + ''; + in + { + packages = lib.optionalAttrs pkgs.stdenv.isLinux { + "psql_17/bin" = lib.mkForce psql_old_with_latest_supautils; + postgresql_17_debug = lib.mkForce postgres_old.postgresql_17_debug; + postgresql_17_src = lib.mkForce postgres_old.postgresql_17_src; + supabase-groonga = lib.mkForce postgres_old.supabase-groonga; + }; + }; +} From b71036575c89511e455c8aa136af13572b8a320a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Mon, 6 Jul 2026 19:36:26 +0300 Subject: [PATCH 2/3] hotfix: use cli --- nix/packages/hotfix-pin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/packages/hotfix-pin.nix b/nix/packages/hotfix-pin.nix index 11fa20f25..9ec74489a 100644 --- a/nix/packages/hotfix-pin.nix +++ b/nix/packages/hotfix-pin.nix @@ -42,6 +42,7 @@ { packages = lib.optionalAttrs pkgs.stdenv.isLinux { "psql_17/bin" = lib.mkForce psql_old_with_latest_supautils; + "psql_17_cli/bin" = lib.mkForce postgres_old."psql_17_cli/bin"; postgresql_17_debug = lib.mkForce postgres_old.postgresql_17_debug; postgresql_17_src = lib.mkForce postgres_old.postgresql_17_src; supabase-groonga = lib.mkForce postgres_old.supabase-groonga; From d40a5697549dd3afd0fe4eacf1cb7a6c4138c353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Tue, 7 Jul 2026 11:29:25 +0300 Subject: [PATCH 3/3] update version --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index d5b8ddbab..d7df7f60c 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.6.0.099-orioledb-ignore1" - postgres17: "17.6.1.104-backfill" - postgres15: "15.14.1.142-ignore1" + postgresorioledb-17: "17.6.0.099-orioledb-ignore11" + postgres17: "17.6.1.104-backfill2" + postgres15: "15.14.1.142-ignore11" # Non Postgres Extensions pgbouncer_release: 1.25.1