From 4e99afc08845d312e19dc62daa49c32ae847e88f Mon Sep 17 00:00:00 2001 From: Etienne Stalmans Date: Thu, 20 Feb 2025 16:28:29 +0100 Subject: [PATCH 1/3] chore: bump pg_graphql version --- Dockerfile-15 | 2 +- Dockerfile-orioledb-17 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-15 b/Dockerfile-15 index 52c4e5af3..ee9db3c4f 100644 --- a/Dockerfile-15 +++ b/Dockerfile-15 @@ -24,7 +24,7 @@ ARG rum_release=1.3.13 ARG pg_hashids_release=cd0e1b31d52b394a0df64079406a14a4f7387cd6 ARG libsodium_release=1.0.18 ARG pgsodium_release=3.1.6 -ARG pg_graphql_release=1.5.1 +ARG pg_graphql_release=1.5.11 ARG pg_stat_monitor_release=1.1.1 ARG pg_jsonschema_release=0.1.4 ARG pg_repack_release=1.4.8 diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index e75694c16..f5b467828 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -24,7 +24,7 @@ ARG rum_release=1.3.13 ARG pg_hashids_release=cd0e1b31d52b394a0df64079406a14a4f7387cd6 ARG libsodium_release=1.0.18 ARG pgsodium_release=3.1.6 -ARG pg_graphql_release=1.5.1 +ARG pg_graphql_release=1.5.11 ARG pg_stat_monitor_release=1.1.1 ARG pg_jsonschema_release=0.1.4 ARG pg_repack_release=1.4.8 From e7406389ed3b7adb53bb03c63c9f79c23f2a68be Mon Sep 17 00:00:00 2001 From: samrose Date: Thu, 20 Feb 2025 15:27:23 -0500 Subject: [PATCH 2/3] chore: update our nix pkg for pg_graphql too (#1458) --- flake.nix | 6 ++++++ nix/cargo-pgrx/default.nix | 5 +++++ nix/ext/pg_graphql.nix | 34 ++++++++++++++++++++-------------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 92ceebf99..9ce842d35 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,11 @@ buildPgrxExtension_0_12_6 = prev.buildPgrxExtension.override { cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_6; }; + + buildPgrxExtension_0_12_9 = prev.buildPgrxExtension.override { + cargo-pgrx = final.cargo-pgrx.cargo-pgrx_0_12_9; + }; + }) (final: prev: { postgresql = final.callPackage ./nix/postgresql/default.nix { @@ -394,6 +399,7 @@ supabase-groonga = supabase-groonga; 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; # PostgreSQL versions. psql_15 = postgresVersions.psql_15; psql_orioledb-17 = postgresVersions.psql_orioledb-17; diff --git a/nix/cargo-pgrx/default.nix b/nix/cargo-pgrx/default.nix index 2d5545927..64e15160b 100644 --- a/nix/cargo-pgrx/default.nix +++ b/nix/cargo-pgrx/default.nix @@ -66,5 +66,10 @@ in hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; cargoHash = "sha256-Di4UldQwAt3xVyvgQT1gUhdvYUVp7n/a72pnX45kP0w="; }; + cargo-pgrx_0_12_9 = generic { + version = "0.12.9"; + hash = "sha256-aR3DZAjeEEAjLQfZ0ZxkjLqTVMIEbU0UiZ62T4BkQq8="; + cargoHash = "sha256-53HKhvsKLTa2JCByLEcK3UzWXoM+LTatd98zvS1C9no="; + }; inherit rustPlatform; } diff --git a/nix/ext/pg_graphql.nix b/nix/ext/pg_graphql.nix index f54dff46a..54e500924 100644 --- a/nix/ext/pg_graphql.nix +++ b/nix/ext/pg_graphql.nix @@ -1,35 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, buildPgrxExtension_0_12_6, cargo, rust-bin }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPgrxExtension_0_12_9, cargo, rust-bin }: + let - rustVersion = "1.80.0"; - cargo = rust-bin.stable.${rustVersion}.default; + rustVersion = "nightly"; + cargo = rust-bin.nightly.latest.default; in -buildPgrxExtension_0_12_6 rec { +buildPgrxExtension_0_12_9 rec { pname = "pg_graphql"; - version = "1.5.9"; + version = "1.5.11"; inherit postgresql; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-YpLN43FtLhp2cb7cyM+4gEx8GTwsRiKTfxaMq0b8hk0="; + hash = "sha256-BMZc9ui+2J3U24HzZZVCU5+KWhz+5qeUsRGeptiqbek="; }; nativeBuildInputs = [ cargo ]; buildInputs = [ postgresql ]; - CARGO="${cargo}/bin/cargo"; - #darwin env needs PGPORT to be unique for build to not clash with other pgrx extensions + CARGO = "${cargo}/bin/cargo"; + + cargoLock = { + lockFile = "${src}/Cargo.lock"; + }; + # Setting RUSTFLAGS in env to ensure it's available for all phases env = lib.optionalAttrs stdenv.isDarwin { POSTGRES_LIB = "${postgresql}/lib"; - RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup"; PGPORT = "5434"; + RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup"; + NIX_BUILD_CORES = "4"; # Limit parallel jobs + CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism }; - cargoHash = "sha256-d2RSHtJgbYlOvArjOTaeYoca01UyWPUEO5vhktxxB6U="; +CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0"; + CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true; - # FIXME (aseipp): disable the tests since they try to install .control - # files into the wrong spot, aside from that the one main test seems - # to work, though + doCheck = false; meta = with lib; { @@ -39,4 +45,4 @@ buildPgrxExtension_0_12_6 rec { platforms = postgresql.meta.platforms; license = licenses.postgresql; }; -} +} \ No newline at end of file From 0952290fc84e54ff7c931fa08047c2f454460b41 Mon Sep 17 00:00:00 2001 From: Etienne Stalmans Date: Fri, 21 Feb 2025 07:57:14 +0100 Subject: [PATCH 3/3] chore: bump version --- ansible/vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index 99c05f7c8..2f3defa7d 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -8,8 +8,8 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.0.1.038-orioledb" - postgres15: "15.8.1.043" + postgresorioledb-17: "17.0.1.039-orioledb" + postgres15: "15.8.1.044" # Non Postgres Extensions pgbouncer_release: "1.19.0"