pyrox.dev
Merge: postgresql: fix regress tests after tzdata update (#342026)
authored by Maximilian Bosch and committed by GitHub 9387bb89 952947bd
+17
pkgs/servers/sql/postgresql/generic.nix
+17
pkgs/servers/sql/postgresql/generic.nix
···
161
src = ./patches/locale-binary-path.patch;
162
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
163
})
164
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
165
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
166
map fetchurl (lib.attrValues muslPatches)
···
161
src = ./patches/locale-binary-path.patch;
162
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
163
})
164
+
165
+
# TODO: Remove this with the next set of minor releases
166
+
(fetchpatch (
167
+
if atLeast "14" then {
168
+
url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
169
+
hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
170
+
excludes = [ "doc/*" ];
171
+
} else if atLeast "13" then {
172
+
url = "https://github.com/postgres/postgres/commit/b28b9b19bbe3410da4a805ef775e0383a66af314.patch";
173
+
hash = "sha256-meFFskNWlcc/rv4BWo6fNR/tTFgQRgXGqTkJkoX7lHU=";
174
+
excludes = [ "doc/*" ];
175
+
} else {
176
+
url = "https://github.com/postgres/postgres/commit/205813da4c264d80db3c3215db199cc119e18369.patch";
177
+
hash = "sha256-L8/ns/fxTh2ayfDQXtBIKaArFhMd+v86UxVFWQdmzUw=";
178
+
excludes = [ "doc/*" ];
179
+
})
180
+
)
181
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
182
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
183
map fetchurl (lib.attrValues muslPatches)