Skip to content

Commit d576b01

Browse files
committed
feat: WIP orioledb 16
1 parent 3454b62 commit d576b01

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
# pull them from the overlays/ directory automatically, but we don't
3838
# want to have an arbitrary order, since it might matter. being
3939
# explicit is better.
40-
(import ./nix/overlays/cargo-pgrx.nix)
40+
(import ./nix/overlays/cargo-pgrx-0-11-3.nix)
4141
(import ./nix/overlays/psql_16-oriole.nix)
4242

4343
];
@@ -289,7 +289,7 @@
289289
postgresVersions = {
290290
psql_15 = makePostgres "15";
291291
psql_16 = makePostgres "16";
292-
# psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
292+
psql_orioledb_16 = makeOrioleDbPostgres "16_29" postgresql_orioledb_16;
293293
};
294294

295295
# Find the active PostgreSQL version
@@ -311,7 +311,7 @@
311311
# PostgreSQL versions.
312312
psql_15 = postgresVersions.psql_15;
313313
psql_16 = postgresVersions.psql_16;
314-
#psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
314+
psql_orioledb_16 = postgresVersions.psql_orioledb_16;
315315
sfcgal = sfcgal;
316316
pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
317317
inherit postgresql_15 postgresql_16;

nix/ext/orioledb.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
77
owner = "orioledb";
88
repo = "orioledb";
99
rev = "main";
10-
sha256 = "sha256-QbDp9S8JXO66sfaHZIQ3wFCVRxsAaaNSRgC6hvL3EKY=";
10+
sha256 = "sha256-VWjb2JHYad0VZkId70m8UOhRTJRGY4nkEuC7m5ae7w4=";
1111
};
12-
version = "patches16_23";
12+
version = "patches16_29";
1313
buildInputs = [ curl libkrb5 postgresql python3 openssl ];
14-
buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=23";
14+
buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=29";
1515
installPhase = ''
1616
runHook preInstall
1717
mkdir -p $out/{lib,share/postgresql/extension}

nix/overlays/psql_16-oriole.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
final: prev: {
22
postgresql_16 = prev.postgresql_16.overrideAttrs (old: {
33
pname = "postgresql_16";
4-
version = "16_23";
4+
version = "16_29";
55
src = prev.fetchurl {
6-
url = "https://github.com/orioledb/postgres/archive/refs/tags/patches16_23.tar.gz";
7-
sha256 = "sha256-xWmcqn3DYyBG0FsBNqPWTFzUidSJZgoPWI6Rt0N9oJ4=";
6+
url = "https://github.com/orioledb/postgres/archive/refs/tags/patches16_29.tar.gz";
7+
sha256 = "sha256-JiC4upjta7OWOfnuxgo/KL41tWcsBUyykOJakn6XjvA=";
88
};
99
buildInputs = old.buildInputs ++ [
1010
prev.bison

0 commit comments

Comments
 (0)