Skip to content

Commit ad20583

Browse files
committed
Backport tzdata fix for OrioleDB
This was backported from postgres into OrioleDB 17_10: orioledb/postgres@b7bad91
1 parent 227b870 commit ad20583

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

nix/postgresql/generic.nix

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ let
7878
else
7979
(lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd);
8080

81+
isOrioleDB = (builtins.match "[0-9][0-9]_.*" version) != null;
82+
8183
pname = "postgresql";
8284

8385
stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;
@@ -87,7 +89,7 @@ let
8789
pname = pname + lib.optionalString jitSupport "-jit";
8890

8991
src =
90-
if (builtins.match "[0-9][0-9]_.*" version != null) then
92+
if (isOrioleDB) then
9193
fetchurl {
9294
url = "https://github.com/orioledb/postgres/archive/refs/tags/patches${version}.tar.gz";
9395
inherit hash;
@@ -125,7 +127,7 @@ let
125127
++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]
126128
++
127129
lib.optionals
128-
((builtins.match "[0-9][0-9]_.*" version != null) || (lib.versionAtLeast version "17"))
130+
(isOrioleDB || (lib.versionAtLeast version "17"))
129131
[
130132
perl
131133
bison
@@ -207,6 +209,12 @@ let
207209
excludes = [ "doc/*" ];
208210
}))
209211
]
212+
++ lib.optionals (isOrioleDB) [
213+
(fetchpatch ({
214+
url = "https://github.com/orioledb/postgres/commit/b7bad919e1b0ea3155514258fb19f45851536686.patch";
215+
hash = "sha256-oZZzD8mxi5zswAy7qTOkFshxIz3nhAA6JmavEVT5LJk=";
216+
}))
217+
]
210218
++ lib.optionals stdenv'.hostPlatform.isMusl (
211219
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
212220
map fetchurl (lib.attrValues muslPatches)

0 commit comments

Comments
 (0)