commit 33ae3f2fe4baeb4db19d3c90dbb6cd35b9373004 · pyrox.dev/nixpkgs

+18 -1

lib/types.nix

···

       6
       6
        
       with import ./options.nix;

     

       7
       7
        
       with import ./trivial.nix;

     

       8
       8
        
       with import ./strings.nix;

     

       9
       9
       -
       with {inherit (import ./modules.nix) mergeDefinitions; };

     

       9
       9
       +
       with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; };

     

       10
       10
        
       

     

       11
       11
        
       rec {

     

       12
       12
        
       

     
···

       165
       165
        
               getSubModules = elemType.getSubModules;

     

       166
       166
        
               substSubModules = m: loaOf (elemType.substSubModules m);

     

       167
       167
        
             };

     

       168
       168
       +
       

     

       169
       169
       +
           # List or element of ...

     

       170
       170
       +
           loeOf = elemType: mkOptionType {

     

       171
       171
       +
             name = "element or list of ${elemType.name}s";

     

       172
       172
       +
             check = x: isList x || elemType.check x;

     

       173
       173
       +
             merge = loc: defs:

     

       174
       174
       +
               let

     

       175
       175
       +
                 defs' = filterOverrides defs;

     

       176
       176
       +
                 res = (head defs').value;

     

       177
       177
       +
               in

     

       178
       178
       +
               if isList res then concatLists (getValues defs')

     

       179
       179
       +
               else if lessThan 1 (length defs') then

     

       180
       180
       +
                 throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."

     

       181
       181
       +
               else if !isString res then

     

       182
       182
       +
                 throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."

     

       183
       183
       +
               else res;

     

       184
       184
       +
           };

     

       168
       185
        
       

     

       169
       186
        
           uniq = elemType: mkOptionType {

     

       170
       187
        
             inherit (elemType) name check;

+1 -14

nixos/modules/config/shells-environment.nix

···

       41
       41
        
               strings.  The latter is concatenated, interspersed with colon

     

       42
       42
        
               characters.

     

       43
       43
        
             '';

     

       44
       44
       -
             type = types.attrsOf (mkOptionType {

     

       45
       45
       -
               name = "a string or a list of strings";

     

       46
       46
       -
               merge = loc: defs:

     

       47
       47
       -
                 let

     

       48
       48
       -
                   defs' = filterOverrides defs;

     

       49
       49
       -
                   res = (head defs').value;

     

       50
       50
       -
                 in

     

       51
       51
       -
                 if isList res then concatLists (getValues defs')

     

       52
       52
       -
                 else if lessThan 1 (length defs') then

     

       53
       53
       -
                   throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."

     

       54
       54
       -
                 else if !isString res then

     

       55
       55
       -
                   throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."

     

       56
       56
       -
                 else res;

     

       57
       57
       -
             });

     

       44
       44
       +
             type = types.attrsOf (types.loeOf types.str);

     

       58
       45
        
             apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);

     

       59
       46
        
           };

     

       60
       47

+1 -14

nixos/modules/config/system-environment.nix

···

       23
       23
        
               strings.  The latter is concatenated, interspersed with colon

     

       24
       24
        
               characters.

     

       25
       25
        
             '';

     

       26
       26
       -
             type = types.attrsOf (mkOptionType {

     

       27
       27
       -
               name = "a string or a list of strings";

     

       28
       28
       -
               merge = loc: defs:

     

       29
       29
       -
                 let

     

       30
       30
       -
                   defs' = filterOverrides defs;

     

       31
       31
       -
                   res = (head defs').value;

     

       32
       32
       -
                 in

     

       33
       33
       -
                 if isList res then concatLists (getValues defs')

     

       34
       34
       -
                 else if lessThan 1 (length defs') then

     

       35
       35
       -
                   throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."

     

       36
       36
       -
                 else if !isString res then

     

       37
       37
       -
                   throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."

     

       38
       38
       -
                 else res;

     

       39
       39
       -
             });

     

       26
       26
       +
             type = types.attrsOf (types.loeOf types.str);

     

       40
       27
        
             apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);

     

       41
       28
        
           };

     

       42
       29