diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-19 00:01:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-19 00:01:42 +0000 |
| commit | 4a9909e0db659aac81dfff01d502761f72f892dc (patch) | |
| tree | 849f84331358a7d8f7d20cd22dcfa093effd081e /pkgs/servers/sql/postgresql | |
| parent | 1949ef20809fcb8fc4bef910b2cbac9b0ca7fb9e (diff) | |
| parent | d3430521cf54218f1037a167d7a62f86e29a88bf (diff) | |
| download | nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.tar nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.tar.gz nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.tar.bz2 nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.tar.lz nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.tar.xz nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.tar.zst nixpkgs-4a9909e0db659aac81dfff01d502761f72f892dc.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/sql/postgresql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6d9bf528c07..0074c6fd6f0 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -109,19 +109,23 @@ let locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) - ] ++ lib.optionals stdenv'.hostPlatform.isMusl [ - # Fixes for musl libc - # These patches are not properly guarded and should NOT be enabled everywhere - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-pnl+wM3/IUyq5iJzk+h278MDA9R0GQXQX8d4wJcB2z4="; - }) + ] ++ lib.optionals (stdenv'.hostPlatform.isMusl && atLeast "12") [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; hash = "sha256-Yb6lMBDqeVP/BLMyIr5rmR6OkaVzo68cV/+cL2LOe/M="; }) - - ] ++ lib.optionals stdenv'.isLinux [ + ] ++ lib.optionals (stdenv'.hostPlatform.isMusl && atLeast "13") [ + (if olderThan "14" then + fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; + hash = "sha256-IOOx7/laDYhTz1Q1r6H1FSZBsHCgD4lHvia+/os7CCo="; + } + else + fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-pnl+wM3/IUyq5iJzk+h278MDA9R0GQXQX8d4wJcB2z4="; + }) + ] ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) ]; |