From fad9dabf9f041ba61c410876e2743b53435261dc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 17 Mar 2024 11:35:54 +0100 Subject: [PATCH] pkgsMusl.postgresql: disable "locale -a" properly /bin/locale doesn't exist on musl and was already effectively disabled in #228349. However this still leaves the following warning for initdb: performing post-bootstrap initialization ... sh: locale: not found By applying the alpine patch to disable locale -a entirely, this warning will disappear. This will also make one more regression test pass when testing "check-world" instead of "check", only. --- pkgs/servers/sql/postgresql/12.nix | 6 ++++++ pkgs/servers/sql/postgresql/13.nix | 4 ++++ pkgs/servers/sql/postgresql/14.nix | 4 ++++ pkgs/servers/sql/postgresql/15.nix | 6 ++++++ pkgs/servers/sql/postgresql/16.nix | 6 ++++++ 5 files changed, 26 insertions(+) diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix index 42e8ef960d422..72e3c88301df4 100644 --- a/pkgs/servers/sql/postgresql/12.nix +++ b/pkgs/servers/sql/postgresql/12.nix @@ -1,4 +1,10 @@ import ./generic.nix { version = "12.20"; hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk="; + muslPatches = { + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/dont-use-locale-a-on-musl.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; + hash = "sha256-fk+y/SvyA4Tt8OIvDl7rje5dLs3Zw+Ln1oddyYzerOo="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index ad55c9a55805d..1f4483ccc6319 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -6,5 +6,9 @@ import ./generic.nix { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y="; }; + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/dont-use-locale-a-on-musl.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; + hash = "sha256-fk+y/SvyA4Tt8OIvDl7rje5dLs3Zw+Ln1oddyYzerOo="; + }; }; } diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index 91341a3bd1f7c..ed6661a474ace 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -6,5 +6,9 @@ import ./generic.nix { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM="; }; + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/dont-use-locale-a-on-musl.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-fk+y/SvyA4Tt8OIvDl7rje5dLs3Zw+Ln1oddyYzerOo="; + }; }; } diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 63f4928401ac6..5ede047dc2b01 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,4 +1,10 @@ import ./generic.nix { version = "15.8"; hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o="; + muslPatches = { + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; + hash = "sha256-fk+y/SvyA4Tt8OIvDl7rje5dLs3Zw+Ln1oddyYzerOo="; + }; + }; } diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 569ef4b9e08b0..16215d890be41 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,4 +1,10 @@ import ./generic.nix { version = "16.4"; hash = "sha256-lxdm1kWqc+k7nvTjvkQgG09FtUdwlbBJElQD+fM4bW8="; + muslPatches = { + dont-use-locale-a = { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; + hash = "sha256-fk+y/SvyA4Tt8OIvDl7rje5dLs3Zw+Ln1oddyYzerOo="; + }; + }; }