Skip to content

Commit

Permalink
pkgsMusl.postgresql: disable "locale -a" properly
Browse files Browse the repository at this point in the history
/bin/locale doesn't exist on musl and was already effectively disabled
in NixOS#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.
  • Loading branch information
wolfgangwalther committed Sep 26, 2024
1 parent e266a4a commit fad9dab
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkgs/servers/sql/postgresql/12.nix
Original file line number Diff line number Diff line change
@@ -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=";
};
};
}
4 changes: 4 additions & 0 deletions pkgs/servers/sql/postgresql/13.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
};
};
}
4 changes: 4 additions & 0 deletions pkgs/servers/sql/postgresql/14.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
};
};
}
6 changes: 6 additions & 0 deletions pkgs/servers/sql/postgresql/15.nix
Original file line number Diff line number Diff line change
@@ -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=";
};
};
}
6 changes: 6 additions & 0 deletions pkgs/servers/sql/postgresql/16.nix
Original file line number Diff line number Diff line change
@@ -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=";
};
};
}

0 comments on commit fad9dab

Please sign in to comment.