types: loeOf -> listOf

authored by

Eric Sagnes and committed by
Nicolas B. Pierron
1fe1cdec f74d48e9

+4 -10
-6
nixos/doc/manual/development/option-types.xml
··· 100 100 value.</para></listitem> 101 101 </varlistentry> 102 102 <varlistentry> 103 - <term><varname>types.loeOf</varname> <replaceable>t</replaceable></term> 104 - <listitem><para>A list or an element of <replaceable>t</replaceable> type. 105 - Multiple definitions are merged according to the 106 - values.</para></listitem> 107 - </varlistentry> 108 - <varlistentry> 109 103 <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term> 110 104 <listitem><para><literal>null</literal> or type 111 105 <replaceable>t</replaceable>. Multiple definitions are merged according
+1 -1
nixos/modules/config/shells-environment.nix
··· 41 41 strings. The latter is concatenated, interspersed with colon 42 42 characters. 43 43 ''; 44 - type = types.attrsOf (types.loeOf types.str); 44 + type = with types; attrsOf (either str (listOf str)); 45 45 apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); 46 46 }; 47 47
+1 -1
nixos/modules/config/system-environment.nix
··· 23 23 strings. The latter is concatenated, interspersed with colon 24 24 characters. 25 25 ''; 26 - type = types.attrsOf (types.loeOf types.str); 26 + type = with types; attrsOf (either str (listOf str)); 27 27 apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); 28 28 }; 29 29
+2 -2
nixos/modules/services/misc/taskserver/default.nix
··· 292 292 }; 293 293 294 294 allowedClientIDs = mkOption { 295 - type = with types; loeOf (either (enum ["all" "none"]) str); 295 + type = with types; either str (listOf str); 296 296 default = []; 297 297 example = [ "[Tt]ask [2-9]+" ]; 298 298 description = '' ··· 306 306 }; 307 307 308 308 disallowedClientIDs = mkOption { 309 - type = with types; loeOf (either (enum ["all" "none"]) str); 309 + type = with types; either str (listOf str); 310 310 default = []; 311 311 example = [ "[Tt]ask [2-9]+" ]; 312 312 description = ''