Skip to content

Commit b1730fc

Browse files
committed
chore: remove commented out code not needed in latest changes to pg
1 parent ce6f5eb commit b1730fc

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

nix/postgresql/generic.nix

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -190,21 +190,6 @@ let
190190
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
191191
})
192192
]
193-
# tzdata patches temporarily removed due to conflicts with PostgreSQL 15.14
194-
# ++ lib.optionals (olderThan "17") [
195-
# # back port changes related to tzdata release 2024b
196-
# (fetchpatch ({
197-
# url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
198-
# hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
199-
# excludes = [ "doc/*" ];
200-
# }))
201-
# # back port changes related to tzdata release 2025a
202-
# (fetchpatch ({
203-
# url = "https://github.com/postgres/postgres/commit/aac0384975ff1129557cd2158fab4656f933cdc8.patch";
204-
# hash = "sha256-4Aua4QJhCS9B0zegQ9I6Us5QfX7GuRUilnkmOpSTUUw=";
205-
# excludes = [ "doc/*" ];
206-
# }))
207-
# ]
208193
++ lib.optionals stdenv'.hostPlatform.isMusl (
209194
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
210195
map fetchurl (lib.attrValues muslPatches)

0 commit comments

Comments
 (0)