commit 01e6f1370cb704e6fdc848ca3f1e38fc70f4112e · pyrox.dev/nixpkgs

+14 -5
nixos/modules/config/i18n.nix
···

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
        
         aggregatedLocales =

     

       9
       9
       -
           builtins.map

     

       9
       9
       +
           (builtins.map

     

       10
       10
        
             (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8")

     

       11
       11
        
             (

     

       12
       12
        
               [ config.i18n.defaultLocale ]

     

       13
       13
       -
               ++ config.i18n.extraLocales

     

       13
       13
       +
               ++ (lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales)

     

       14
       14
        
               ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))

     

       15
       15
       -
             );

     

       15
       15
       +
             )

     

       16
       16
       +
           )

     

       17
       17
       +
           ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales);

     

       16
       18
        
       in

     

       17
       19
        
       {

     

       18
       20
        
         ###### interface

     
···

       53
       55
        
             };

     

       54
       56
        
       

     

       55
       57
        
             extraLocales = lib.mkOption {

     

       56
       56
       -
               type = lib.types.listOf lib.types.str;

     

       58
       58
       +
               type = lib.types.either (lib.types.listOf lib.types.str) (lib.types.enum [ "all" ]);

     

       57
       59
        
               default = [ ];

     

       58
       60
        
               example = [ "nl_NL.UTF-8" ];

     

       59
       61
        
               description = ''

     

       60
       62
        
                 Additional locales that the system should support, besides the ones

     

       61
       63
        
                 configured with {option}`i18n.defaultLocale` and

     

       62
       64
        
                 {option}`i18n.extraLocaleSettings`.

     

       65
       65
       +
                 Set this to `"all"` to install all available locales.

     

       63
       66
        
               '';

     

       64
       67
        
             };

     

       65
       68
        
       

     
···

       108
       111
        
       

     

       109
       112
        
         config = {

     

       110
       113
        
           warnings =

     

       111
       111
       -
             lib.optional ((lib.subtractLists config.i18n.supportedLocales aggregatedLocales) != [ ])

     

       114
       114
       +
             lib.optional

     

       115
       115
       +
               (

     

       116
       116
       +
                 !(

     

       117
       117
       +
                   (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ]

     

       118
       118
       +
                   || lib.any (x: x == "all") config.i18n.supportedLocales

     

       119
       119
       +
                 )

     

       120
       120
       +
               )

     

       112
       121
        
               ''

     

       113
       122
        
                 `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`,

     

       114
       123
        
                 and it seems you are using `i18n.supportedLocales` and forgot to