public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

types: loeOf -> listOf

Browse Source
This commit is contained in:
Eric Sagnes 2016-11-04 13:33:59 +09:00 committed by Nicolas B. Pierron
parent f74d48e9fe
commit 1fe1cdecb2
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/development/option-types.xml
View File

@ -99,12 +99,6 @@
type. Multiple definitions are merged according to the type. Multiple definitions are merged according to the
value.</para></listitem> value.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>types.loeOf</varname> <replaceable>t</replaceable></term>
<listitem><para>A list or an element of <replaceable>t</replaceable> type.
Multiple definitions are merged according to the
values.</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>types.nullOr</varname> <replaceable>t</replaceable></term> <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term>
<listitem><para><literal>null</literal> or type <listitem><para><literal>null</literal> or type

2
nixos/modules/config/shells-environment.nix
View File

@ -41,7 +41,7 @@ in
strings. The latter is concatenated, interspersed with colon strings. The latter is concatenated, interspersed with colon
characters. characters.
''; '';
type = types.attrsOf (types.loeOf types.str); type = with types; attrsOf (either str (listOf str));
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
}; };

2
nixos/modules/config/system-environment.nix
View File

@ -23,7 +23,7 @@ in
strings. The latter is concatenated, interspersed with colon strings. The latter is concatenated, interspersed with colon
characters. characters.
''; '';
type = types.attrsOf (types.loeOf types.str); type = with types; attrsOf (either str (listOf str));
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
}; };

4
nixos/modules/services/misc/taskserver/default.nix
View File

@ -292,7 +292,7 @@ in {
}; };
allowedClientIDs = mkOption { allowedClientIDs = mkOption {
type = with types; loeOf (either (enum ["all" "none"]) str); type = with types; either str (listOf str);
default = []; default = [];
example = [ "[Tt]ask [2-9]+" ]; example = [ "[Tt]ask [2-9]+" ];
description = '' description = ''
@ -306,7 +306,7 @@ in {
}; };
disallowedClientIDs = mkOption { disallowedClientIDs = mkOption {
type = with types; loeOf (either (enum ["all" "none"]) str); type = with types; either str (listOf str);
default = []; default = [];
example = [ "[Tt]ask [2-9]+" ]; example = [ "[Tt]ask [2-9]+" ];
description = '' description = ''