Skip to content

Commit a1d5ea4

Browse files
jfrochesamrose
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 ee9a8bf commit a1d5ea4

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,
@@ -194,6 +195,20 @@ let
194195
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
195196
})
196197
]
198+
++ lib.optionals (olderThan "17") [
199+
# back port changes related to tzdata release 2024b
200+
(fetchpatch ({
201+
url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
202+
hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
203+
excludes = [ "doc/*" ];
204+
}))
205+
# back port changes related to tzdata release 2025a
206+
(fetchpatch ({
207+
url = "https://github.com/postgres/postgres/commit/aac0384975ff1129557cd2158fab4656f933cdc8.patch";
208+
hash = "sha256-4Aua4QJhCS9B0zegQ9I6Us5QfX7GuRUilnkmOpSTUUw=";
209+
excludes = [ "doc/*" ];
210+
}))
211+
]
197212
++ lib.optionals stdenv'.hostPlatform.isMusl (
198213
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
199214
map fetchurl (lib.attrValues muslPatches)

0 commit comments

Comments
 (0)