Skip to content

Commit 8cd34fb

Browse files
samroseyvan-sraka
authored andcommitted
chore: remove commented out code not needed in latest changes to pg
1 parent fe4961e commit 8cd34fb

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
@@ -193,21 +193,6 @@ let
193193
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
194194
})
195195
]
196-
# tzdata patches temporarily removed due to conflicts with PostgreSQL 15.14
197-
# ++ lib.optionals (olderThan "17") [
198-
# # back port changes related to tzdata release 2024b
199-
# (fetchpatch ({
200-
# url = "https://github.com/postgres/postgres/commit/b27622c90869aab63cfe22159a459c57768b0fa4.patch";
201-
# hash = "sha256-7G+BkJULhyx6nlMEjClcr2PJg6awgymZHr2JgGhXanA=";
202-
# excludes = [ "doc/*" ];
203-
# }))
204-
# # back port changes related to tzdata release 2025a
205-
# (fetchpatch ({
206-
# url = "https://github.com/postgres/postgres/commit/aac0384975ff1129557cd2158fab4656f933cdc8.patch";
207-
# hash = "sha256-4Aua4QJhCS9B0zegQ9I6Us5QfX7GuRUilnkmOpSTUUw=";
208-
# excludes = [ "doc/*" ];
209-
# }))
210-
# ]
211196
++ lib.optionals stdenv'.hostPlatform.isMusl (
212197
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
213198
map fetchurl (lib.attrValues muslPatches)

0 commit comments

Comments
 (0)