Skip to content

Commit 90fb1af

Browse files
committed
chore: set pg_graphql to stable rust
1 parent dd8c99d commit 90fb1af

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

ansible/vars.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ postgres_major:
88

99
# Full version strings for each major version
1010
postgres_release:
11+
<<<<<<< HEAD
1112
postgresorioledb-17: "17.0.1.051-orioledb"
1213
postgres15: "15.8.1.058"
14+
=======
15+
postgresorioledb-17: "17.0.1.045-orioledb-rc-1"
16+
postgres15: "15.8.1.052-rc-1"
17+
>>>>>>> 830aa63f (chore: set pg_graphql to stable rust)
1318

1419
# Non Postgres Extensions
1520
pgbouncer_release: "1.19.0"

nix/ext/pg_graphql.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{ lib, stdenv, fetchFromGitHub, postgresql, buildPgrxExtension_0_12_9, cargo, rust-bin }:
22

33
let
4-
rustVersion = "nightly";
5-
cargo = rust-bin.nightly.latest.default;
4+
rustVersion = "1.81.0";
5+
cargo = rust-bin.stable.${rustVersion}.default;
66
in
77
buildPgrxExtension_0_12_9 rec {
88
pname = "pg_graphql";
@@ -32,7 +32,7 @@ buildPgrxExtension_0_12_9 rec {
3232
NIX_BUILD_CORES = "4"; # Limit parallel jobs
3333
CARGO_BUILD_JOBS = "4"; # Limit cargo parallelism
3434
};
35-
CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
35+
CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
3636
CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
3737

3838

@@ -45,4 +45,4 @@ CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
4545
platforms = postgresql.meta.platforms;
4646
license = licenses.postgresql;
4747
};
48-
}
48+
}

0 commit comments

Comments
 (0)