diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-06-25 10:28:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-06-25 10:29:27 +0200 |
| commit | 24b43564ff1e360fbd74b29cd3ed3dbd322a83b2 (patch) | |
| tree | 7501e3603d7aa323aa569a0d5291f291847625ac /nixos/modules | |
| parent | ba5faae6cee4e662fd8e820b4dd627ff98a88359 (diff) | |
| parent | 515b36c0939b2fd96072eef7e58722900218897b (diff) | |
Merge #177318: nixos/i18n: reduce default supportedLocales
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/i18n.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/profiles/minimal.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 5b8d5b214496b..53dd325457e01 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -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 diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index e79b927238419..0e65989214a18 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -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; |