Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/tasks/setup-wal-g.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

- name: Create symlink to make wal-g-v2 the default wal-g
ansible.builtin.file:
src: /usr/local/bin/wal-g-v2
src: /home/wal-g/.nix-profile/bin/wal-g-2
dest: /usr/local/bin/wal-g
state: link
force: yes
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.0.1.052-orioledb"
postgres15: "15.8.1.059"
postgresorioledb-17: "17.0.1.053-orioledb"
postgres15: "15.8.1.060"

# Non Postgres Extensions
pgbouncer_release: "1.19.0"
Expand Down
9 changes: 4 additions & 5 deletions nix/ext/pg_graphql.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, postgresql, buildPgrxExtension_0_12_9, cargo, rust-bin }:

let
rustVersion = "nightly";
cargo = rust-bin.nightly.latest.default;
rustVersion = "1.81.0";
cargo = rust-bin.stable.${rustVersion}.default;
in
buildPgrxExtension_0_12_9 rec {
pname = "pg_graphql";
Expand All @@ -27,12 +27,11 @@ buildPgrxExtension_0_12_9 rec {
# Setting RUSTFLAGS in env to ensure it's available for all phases
env = lib.optionalAttrs stdenv.isDarwin {
POSTGRES_LIB = "${postgresql}/lib";
PGPORT = "5434";
PGPORT = if (lib.versions.major postgresql.version) == "17" then "5440" else "5439";
RUSTFLAGS = "-C link-arg=-undefined -C link-arg=dynamic_lookup";
NIX_BUILD_CORES = "4"; # Limit parallel jobs
CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism
};
CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;


Expand All @@ -45,4 +44,4 @@ CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
};
}
}