diff options
| author | Eric Sagnes <eric.sagnes@gmail.com> | 2016-11-04 13:33:59 +0900 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-11-05 21:46:42 +0100 |
| commit | 1fe1cdecb24de63be577a2df538da03bbe96cd1d (patch) | |
| tree | 885c9bd93bad613bcd842d8b006d1f6b73ffe2c8 /nixos | |
| parent | f74d48e9fe7095244bb730dc5501321eedbd1719 (diff) | |
types: loeOf -> listOf
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/development/option-types.xml | 6 | ||||
| -rw-r--r-- | nixos/modules/config/shells-environment.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/system-environment.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/taskserver/default.nix | 4 |
4 files changed, 4 insertions, 10 deletions
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 8871b02cebf1a..9ef7bb30a5760 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -100,12 +100,6 @@ value.</para></listitem> </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> <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term> <listitem><para><literal>null</literal> or type <replaceable>t</replaceable>. Multiple definitions are merged according diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index f458bc39adaa1..8147fed39d094 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -41,7 +41,7 @@ in strings. The latter is concatenated, interspersed with colon 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); }; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 3362400326d2b..6011e354ece48 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -23,7 +23,7 @@ in strings. The latter is concatenated, interspersed with colon 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); }; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 233c47684b7de..ca82a733f6fc1 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -292,7 +292,7 @@ in { }; allowedClientIDs = mkOption { - type = with types; loeOf (either (enum ["all" "none"]) str); + type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -306,7 +306,7 @@ in { }; disallowedClientIDs = mkOption { - type = with types; loeOf (either (enum ["all" "none"]) str); + type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' |