Skip to content

Commit 2319f01

Browse files
jfrocheyvan-sraka
authored andcommitted
Backport tzdata fixes for postgresql 15
This was discussed upstream here: https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6%40technowledgy.de Also applied by nixpkgs here: NixOS/nixpkgs#342026
1 parent b722f14 commit 2319f01

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

nix/postgresql/generic.nix

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ let
77
stdenv,
88
lib,
99
fetchurl,
10+
fetchpatch,
1011
makeWrapper,
1112
glibc,
1213
zlib,
@@ -198,6 +199,20 @@ let
198199
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
199200
})
200201
]
202+
++ lib.optionals (olderThan "17") [
203+
# back port changes related to tzdata release 2024b
204+
(fetchpatch ({
205+
url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
206+
hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
207+
excludes = [ "doc/*" ];
208+
}))
209+
# back port changes related to tzdata release 2025a
210+
(fetchpatch ({
211+
url = "https://github.com/postgres/postgres/commit/aac0384975ff1129557cd2158fab4656f933cdc8.patch";
212+
hash = "sha256-4Aua4QJhCS9B0zegQ9I6Us5QfX7GuRUilnkmOpSTUUw=";
213+
excludes = [ "doc/*" ];
214+
}))
215+
]
201216
++ lib.optionals stdenv'.hostPlatform.isMusl (
202217
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
203218
map fetchurl (lib.attrValues muslPatches)

0 commit comments

Comments
 (0)