From d916dd44703335e7fb9ec8937fd0d427d4064907 Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Mon, 26 May 2025 16:09:06 +1000 Subject: [PATCH 1/2] chore: bump wrappers version to v0.5.1 --- Dockerfile-15 | 2 +- Dockerfile-17 | 2 +- Dockerfile-orioledb-17 | 2 +- ansible/vars.yml | 6 +++--- nix/ext/wrappers/default.nix | 13 +++++++------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Dockerfile-15 b/Dockerfile-15 index 11781df42..9c71811f5 100644 --- a/Dockerfile-15 +++ b/Dockerfile-15 @@ -30,7 +30,7 @@ ARG pg_repack_release=1.4.8 ARG vault_release=0.2.8 ARG groonga_release=12.0.8 ARG pgroonga_release=2.4.0 -ARG wrappers_release=0.5.0 +ARG wrappers_release=0.5.1 ARG hypopg_release=1.3.1 ARG pgvector_release=0.4.0 ARG pg_tle_release=1.3.2 diff --git a/Dockerfile-17 b/Dockerfile-17 index 8dd7a0de4..56afc0517 100644 --- a/Dockerfile-17 +++ b/Dockerfile-17 @@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8 ARG vault_release=0.2.8 ARG groonga_release=12.0.8 ARG pgroonga_release=2.4.0 -ARG wrappers_release=0.5.0 +ARG wrappers_release=0.5.1 ARG hypopg_release=1.3.1 ARG pgvector_release=0.4.0 ARG pg_tle_release=1.3.2 diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index 8b3f9c806..7b32a049e 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -31,7 +31,7 @@ ARG pg_repack_release=1.4.8 ARG vault_release=0.2.8 ARG groonga_release=12.0.8 ARG pgroonga_release=2.4.0 -ARG wrappers_release=0.5.0 +ARG wrappers_release=0.5.1 ARG hypopg_release=1.3.1 ARG pgvector_release=0.4.0 ARG pg_tle_release=1.3.2 diff --git a/ansible/vars.yml b/ansible/vars.yml index c33f69a76..0eb0e949c 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -9,9 +9,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.0.1.086-orioledb" - postgres17: "17.4.1.036" - postgres15: "15.8.1.093" + postgresorioledb-17: "17.0.1.087-orioledb" + postgres17: "17.4.1.037" + postgres15: "15.8.1.094" # Non Postgres Extensions pgbouncer_release: "1.19.0" diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix index 2bd424942..749074de8 100644 --- a/nix/ext/wrappers/default.nix +++ b/nix/ext/wrappers/default.nix @@ -12,21 +12,21 @@ , git }: let - rustVersion = "1.84.0"; + rustVersion = "1.85.1"; cargo = rust-bin.stable.${rustVersion}.default; in buildPgrxExtension_0_12_9 rec { pname = "supabase-wrappers"; - version = "0.5.0"; + version = "0.5.1"; # update the following array when the wrappers version is updated # required to ensure that extensions update scripts from previous versions are generated - previousVersions = ["0.4.6" "0.4.5" "0.4.4" "0.4.3" "0.4.2" "0.4.1" "0.4.0" "0.3.1" "0.3.0" "0.2.0" "0.1.19" "0.1.18" "0.1.17" "0.1.16" "0.1.15" "0.1.14" "0.1.12" "0.1.11" "0.1.10" "0.1.9" "0.1.8" "0.1.7" "0.1.6" "0.1.5" "0.1.4" "0.1.1" "0.1.0"]; + previousVersions = ["0.5.0" "0.4.6" "0.4.5" "0.4.4" "0.4.3" "0.4.2" "0.4.1" "0.4.0" "0.3.1" "0.3.0" "0.2.0" "0.1.19" "0.1.18" "0.1.17" "0.1.16" "0.1.15" "0.1.14" "0.1.12" "0.1.11" "0.1.10" "0.1.9" "0.1.8" "0.1.7" "0.1.6" "0.1.5" "0.1.4" "0.1.1" "0.1.0"]; inherit postgresql; src = fetchFromGitHub { owner = "supabase"; repo = "wrappers"; rev = "v${version}"; - hash = "sha256-FbRTUcpEHBa5DI6dutvBeahYM0RZVAXIzIAZWIaxvn0"; + hash = "sha256-3GfN3vZMFWf4FV/fSOe9ZN6KETmjoNw3Paz+JRzaH3c"; }; nativeBuildInputs = [ pkg-config cargo git ]; @@ -65,7 +65,8 @@ buildPgrxExtension_0_12_9 rec { lockFile = "${src}/Cargo.lock"; allowBuiltinFetchGit = false; outputHashes = { - "clickhouse-rs-1.1.0-alpha.1" = "sha256-G+v4lNP5eK2U45D1fL90Dq24pUSlpIysNCxuZ17eac0="; + "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o"; + "iceberg-0.5.0" = "sha256-dYPZdpP7kcp49UxsCZrZi3xMJ4rJiB8H65dMMR9Z1Yk"; }; }; @@ -80,7 +81,7 @@ buildPgrxExtension_0_12_9 rec { print getline if ($0 ~ /git =/) { - print "git = \"https://github.com/suharev7/clickhouse-rs/async-await\"" + print "git = \"https://github.com/burmecia/clickhouse-rs/supabase-patch\"" } else { print } From 9d40b9a9e5ba0f0e0c67958d2fef81c609b44145 Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Tue, 3 Jun 2025 14:36:27 +1000 Subject: [PATCH 2/2] add cargo pgrx 0.14.3 package build --- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 5 +++++ nix/cargo-pgrx/default.nix | 12 +++++++++++- nix/ext/wrappers/default.nix | 7 ++++--- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index d593fa3dc..ddacac446 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1708764364, - "narHash": "sha256-+pOtDvmuVTg0Gi58hKDUyrNla5NbyUvt3Xs3gLR0Fws=", + "lastModified": 1744699837, + "narHash": "sha256-mJ1OgxMM2VTTjSVrMZItM8DxttzROYbWkmEPvYF/Kpg=", "owner": "nlewo", "repo": "nix2container", - "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455", + "rev": "78aadfc4ee1f9c2ee256e304b180ca356eb6a045", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697269602, - "narHash": "sha256-dSzV7Ud+JH4DPVD9od53EgDrxUVQOcSj4KGjggCDVJI=", + "lastModified": 1712920918, + "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb540e9c1910d74a7e10736277f6eb9dff51c81", + "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712666087, - "narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a76c4553d7e741e17f289224eda135423de0491d", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1746758179, - "narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=", + "lastModified": 1748918260, + "narHash": "sha256-KhXNXQ5IDLvwwYfJ0pXDjwIuisZ2qM6F7fcXjIGZy/4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8", + "rev": "c9736155bc1eb7c7cf3a925920850e61c07ab22a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d49c9e3fa..f4c333fbb 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,10 @@ cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_9; }; + buildPgrxExtension_0_14_3 = prev.buildPgrxExtension.override { + cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_14_3; + }; + }) (final: prev: { postgresql = final.callPackage ./nix/postgresql/default.nix { @@ -417,6 +421,7 @@ cargo-pgrx_0_11_3 = pkgs.cargo-pgrx.cargo-pgrx_0_11_3; cargo-pgrx_0_12_6 = pkgs.cargo-pgrx.cargo-pgrx_0_12_6; cargo-pgrx_0_12_9 = pkgs.cargo-pgrx.cargo-pgrx_0_12_9; + cargo-pgrx_0_14_3 = pkgs.cargo-pgrx.cargo-pgrx_0_14_3; # PostgreSQL versions. psql_15 = postgresVersions.psql_15; psql_17 = postgresVersions.psql_17; diff --git a/nix/cargo-pgrx/default.nix b/nix/cargo-pgrx/default.nix index 64e15160b..a43bd6399 100644 --- a/nix/cargo-pgrx/default.nix +++ b/nix/cargo-pgrx/default.nix @@ -8,7 +8,7 @@ , rust-bin }: let - rustVersion = "1.76.0"; + rustVersion = "1.85.1"; rustPlatform = makeRustPlatform { cargo = rust-bin.stable.${rustVersion}.default; rustc = rust-bin.stable.${rustVersion}.default; @@ -19,6 +19,11 @@ let , cargoHash }: rustPlatform.buildRustPackage rec { + # rust-overlay uses 'cargo-auditable' wrapper for 'cargo' command, but it + # is using older version 0.18.1 of 'cargo_metadata' which doesn't support + # rust edition 2024, so we disable the 'cargo-auditable' just for now. + # ref: https://github.com/oxalica/rust-overlay/issues/153 + auditable = false; pname = "cargo-pgrx"; inherit version; src = fetchCrate { @@ -71,5 +76,10 @@ in hash = "sha256-aR3DZAjeEEAjLQfZ0ZxkjLqTVMIEbU0UiZ62T4BkQq8="; cargoHash = "sha256-53HKhvsKLTa2JCByLEcK3UzWXoM+LTatd98zvS1C9no="; }; + cargo-pgrx_0_14_3 = generic { + version = "0.14.3"; + hash = "sha256-3TsNpEqNm3Uol5XPW1i0XEbP2fF2+RKB2d7lO6BDnvQ="; + cargoHash = "sha256-Ny7j56pwB+2eEK62X0nWfFKQy5fBz+Q1oyvecivxLkk="; + }; inherit rustPlatform; } diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix index 749074de8..cb72c2313 100644 --- a/nix/ext/wrappers/default.nix +++ b/nix/ext/wrappers/default.nix @@ -4,7 +4,7 @@ , openssl , pkg-config , postgresql -, buildPgrxExtension_0_12_9 +, buildPgrxExtension_0_14_3 , cargo , darwin , jq @@ -15,7 +15,8 @@ let rustVersion = "1.85.1"; cargo = rust-bin.stable.${rustVersion}.default; in -buildPgrxExtension_0_12_9 rec { +buildPgrxExtension_0_14_3 rec { + auditable = false; pname = "supabase-wrappers"; version = "0.5.1"; # update the following array when the wrappers version is updated @@ -66,7 +67,7 @@ buildPgrxExtension_0_12_9 rec { allowBuiltinFetchGit = false; outputHashes = { "clickhouse-rs-1.1.0-alpha.1" = "sha256-nKiGzdsAgJej8NgyVOqHaD1sZLrNF1RPfEhu2pRwZ6o"; - "iceberg-0.5.0" = "sha256-dYPZdpP7kcp49UxsCZrZi3xMJ4rJiB8H65dMMR9Z1Yk"; + "iceberg-0.5.0" = "sha256-dYPZdpP7kcp49UxsCZrZi3xMJ4rJiB8H65dMMR9Z1Yk="; }; };