Skip to content

Commit 859cbca

Browse files
committed
working orioledb build
1 parent b6fdd11 commit 859cbca

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

flake.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@
134134

135135
#Where we import and build the orioledb extension, we add on our custom extensions
136136
# plus the orioledb option
137-
orioledbExtension = ourExtensions ++ [ ./nix/ext/orioledb.nix ];
137+
#we're not using timescaledb in the orioledb version of supabase extensions
138+
orioleFilteredExtensions = builtins.filter (x: x != ./nix/ext/timescaledb.nix) ourExtensions;
139+
orioledbExtension = orioleFilteredExtensions ++ [ ./nix/ext/orioledb.nix ];
138140

139141
#this var is a convenience setting to import the orioledb patched version of postgresql
140142
postgresql_orioledb_16 = oriole_pkgs.postgresql_orioledb_16;

nix/ext/orioledb.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ stdenv.mkDerivation rec {
66
src = fetchFromGitHub {
77
owner = "orioledb";
88
repo = "orioledb";
9-
rev = "0dafcb1bc799e9af393094c122c1c3c630797222";
10-
sha256 = "sha256-dsfDqUXkMeAkUI5l9+J09tsRZOGJVsqcKEVo5YAzMjU=";
9+
rev = "bd8e32d0ebaafd0ea3ec3074233b65167f3b6fb7";
10+
sha256 = "sha256-bzH1SgPZ6q90HpqRsECY2XQPghEcd2Hg4X55G43unNo=";
1111
};
12-
version = "patches16_30";
12+
version = "patches16_31";
1313
buildInputs = [ curl libkrb5 postgresql python3 openssl ];
14-
buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=30";
14+
buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=31";
1515
installPhase = ''
1616
runHook preInstall
1717
mkdir -p $out/{lib,share/postgresql/extension}
1818
19-
cp *.so $out/lib
19+
cp *${postgresql.dlSuffix} $out/lib
2020
cp *.sql $out/share/postgresql/extension
2121
cp *.control $out/share/postgresql/extension
2222

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_30";
4+
version = "16_31";
55
src = prev.fetchurl {
6-
url = "https://github.com/orioledb/postgres/archive/refs/tags/patches16_30.tar.gz";
7-
sha256 = "sha256-VITYbOZYKgbtstdfG2wl7+wV+tl/DDYB34BkIM/Xnvs=";
6+
url = "https://github.com/orioledb/postgres/archive/refs/tags/patches16_31.tar.gz";
7+
sha256 = "sha256-29uHUACwZKh8e4zJ9tWzEhLNjEuh6P31KbpxnMEhtuI=";
88
};
99
buildInputs = old.buildInputs ++ [
1010
prev.bison

0 commit comments

Comments
 (0)