Skip to content

Commit

Permalink
Merge #177318: nixos/i18n: reduce default supportedLocales
Browse files Browse the repository at this point in the history
  • Loading branch information
vcunat committed Jun 25, 2022
2 parents ba5faae + 515b36c commit 24b4356
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
10 changes: 10 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,16 @@
</para>
</listitem>
<listitem>
<literal>i18n.supportedLocales</literal> is now by default
only generated with the default locale set in
<literal>i18n.defaultLocale</literal>. This got copied over
from the minimal profile and reduces the final system size by
200MB. If you require all locales installed set the option to
<literal>[ &quot;all&quot; ]</literal>.
</para>
</listitem>
<listitem>
<para>
<para>
The <literal>isPowerPC</literal> predicate, found on
<literal>platform</literal> attrsets
Expand Down
4 changes: 4 additions & 0 deletions nixos/doc/manual/release-notes/rl-2211.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ In addition to numerous new and upgraded packages, this release has the followin
and [changelog](https://ngrok.com/docs/ngrok-agent/changelog). Notably, breaking changes are that the config file format has
changed and support for single hypen arguments was dropped.

- `i18n.supportedLocales` is now by default only generated with the default locale set in `i18n.defaultLocale`.
This got copied over from the minimal profile and reduces the final system size by 200MB.
If you require all locales installed set the option to ``[ "all" ]``.

- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.

- The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed,
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/config/i18n.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ with lib;

supportedLocales = mkOption {
type = types.listOf types.str;
default = ["all"];
default = [ (config.i18n.defaultLocale + "/UTF-8") ];
defaultText = literalExpression "[ (config.i18n.defaultLocale + \"/UTF-8\") ]";
example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"];
description = ''
List of locales that the system should support. The value
Expand Down
3 changes: 0 additions & 3 deletions nixos/modules/profiles/minimal.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ with lib;
{
environment.noXlibs = mkDefault true;

# This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale
i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];

documentation.enable = mkDefault false;

documentation.nixos.enable = mkDefault false;
Expand Down

0 comments on commit 24b4356

Please sign in to comment.