From f26a78d88b3318563b1cf6210a123a63eda4561e Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Thu, 26 Feb 2026 14:28:23 +1100 Subject: [PATCH 1/4] chore: bump wrappers version 0.6.0 --- nix/docs/updating-pgrx-extensions.md | 12 ++++++------ nix/ext/versions.json | 10 ++++++++++ nix/ext/wrappers/default.nix | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/nix/docs/updating-pgrx-extensions.md b/nix/docs/updating-pgrx-extensions.md index dbf682a0ad..6b282beb87 100644 --- a/nix/docs/updating-pgrx-extensions.md +++ b/nix/docs/updating-pgrx-extensions.md @@ -95,7 +95,7 @@ Use this when the extension has a new release but uses the same pgrx and Rust ve 4. **Build to get the hash**: ```bash - nix build .#psql_17.exts.wrappers-all -L + nix build .#psql_17.exts.wrappers -L ``` The build will fail and print the correct hash. Copy it to `versions.json`. @@ -103,7 +103,7 @@ Use this when the extension has a new release but uses the same pgrx and Rust ve 5. **Rebuild to verify**: ```bash - nix build .#psql_17.exts.wrappers-all -L + nix build .#psql_17.exts.wrappers -L ``` --- @@ -178,7 +178,7 @@ Use this when the extension requires a newer pgrx version. ```bash git add . - nix build .#psql_17.exts.wrappers-all -L + nix build .#psql_17.exts.wrappers -L ``` You'll need to run this multiple times, updating hashes as they're calculated: @@ -291,11 +291,11 @@ For faster iteration, test just your extension before running full checks: ```bash # Build for one PostgreSQL version -nix build .#psql_17.exts.wrappers-all -L +nix build .#psql_17.exts.wrappers -L # Build for all PostgreSQL versions -nix build .#psql_15.exts.wrappers-all -L -nix build .#psql_17.exts.wrappers-all -L +nix build .#psql_15.exts.wrappers -L +nix build .#psql_17.exts.wrappers -L ``` --- diff --git a/nix/ext/versions.json b/nix/ext/versions.json index bd5af879af..94f4670bd1 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -706,6 +706,16 @@ "hash": "sha256-B46ie4qlfD1Wxd7QRv1fIuRmmSrb5s5A7KpQVwadazo=", "pgrx": "0.16.1", "rust": "1.88.0" + }, + "0.6.0": { + "postgresql": [ + "15", + "17", + "orioledb-17" + ], + "hash": "sha256-/ZkAk+yCgWfcsmr6BAP2x+yelfgx+NyvwXnYwUPHTek=", + "pgrx": "0.16.1", + "rust": "1.88.0" } }, "pg_hashids": { diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix index 5383e30ec7..750c983ed9 100644 --- a/nix/ext/wrappers/default.nix +++ b/nix/ext/wrappers/default.nix @@ -97,6 +97,11 @@ let "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; "iceberg-catalog-s3tables-0.6.0" = "sha256-AUK7B0wMqQZwJho91woLs8uOC4k1RdUEEN5Khw2OoqQ="; } + else if builtins.compareVersions "0.6.0" version == 0 then + { + "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; + "iceberg-catalog-s3tables-0.6.0" = "sha256-AUK7B0wMqQZwJho91woLs8uOC4k1RdUEEN5Khw2OoqQ="; + } else { "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o="; @@ -178,6 +183,17 @@ let ); # All versions that were previously packaged (historical list) allPreviouslyPackagedVersions = [ + "0.5.7" + "0.5.6" + "0.5.5" + "0.5.4" + "0.5.3" + "0.5.2" + "0.5.1" + "0.5.0" + "0.4.6" + "0.4.5" + "0.4.4" "0.4.3" "0.4.2" "0.4.1" From 5f4ebafc4f70b2fe914f21f8b7115a3f86992e72 Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Thu, 26 Feb 2026 14:33:58 +1100 Subject: [PATCH 2/4] update vars.yml for testing --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index ae96bbdf33..f0281ed4ca 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.047-orioledb" - postgres17: "17.6.1.090" - postgres15: "15.14.1.090" + postgresorioledb-17: "17.6.0.047-wrappers-orioledb" + postgres17: "17.6.1.090-wrappers" + postgres15: "15.14.1.090-wrappers" # Non Postgres Extensions pgbouncer_release: 1.25.1 From b803ce4b5e563cc67ec2d080145ac70568f4a3f4 Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Thu, 26 Feb 2026 15:32:51 +1100 Subject: [PATCH 3/4] update vars.yml versions for testing --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index f0281ed4ca..94708a9e5a 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.047-wrappers-orioledb" - postgres17: "17.6.1.090-wrappers" - postgres15: "15.14.1.090-wrappers" + postgresorioledb-17: "17.6.0.047-wrappers-2-orioledb" + postgres17: "17.6.1.090-wrappers-2" + postgres15: "15.14.1.090-wrappers-2" # Non Postgres Extensions pgbouncer_release: 1.25.1 From c0f322e8664a2f6f36a2679afbdc6107096c50a2 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 27 Feb 2026 12:54:51 -0500 Subject: [PATCH 4/4] update hash to reflect changes --- nix/ext/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/ext/versions.json b/nix/ext/versions.json index 94f4670bd1..2e242a5d45 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -713,7 +713,7 @@ "17", "orioledb-17" ], - "hash": "sha256-/ZkAk+yCgWfcsmr6BAP2x+yelfgx+NyvwXnYwUPHTek=", + "hash": "sha256-/l1Pyso2ZM22Pvmg0f37/w6hknmZ5SVArg38fpRu7g8=", "pgrx": "0.16.1", "rust": "1.88.0" }