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

lib/types: fix up documentation formatting a bit

This commit is contained in:
Profpatsch 2017-11-03 12:20:35 +01:00
parent 462c048c77
commit 213bd2847b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/types.nix
View File

@ -114,7 +114,7 @@ rec {
merge = mergeOneOption; merge = mergeOneOption;
}; };
# specialized subdomains of int # Specialized subdomains of int
ints = ints =
let let
betweenDesc = lowest: highest: betweenDesc = lowest: highest:
@ -225,7 +225,7 @@ rec {
}; };
# drop this in the future: # drop this in the future:
list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf; list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf;
listOf = elemType: mkOptionType rec { listOf = elemType: mkOptionType rec {
name = "listOf"; name = "listOf";
@ -242,7 +242,7 @@ rec {
).optionalValue ).optionalValue
) def.value ) def.value
else else
throw "The option value `${showOption loc}' in `${def.file}' is not a list.") defs))); throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs)));
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
getSubModules = elemType.getSubModules; getSubModules = elemType.getSubModules;
substSubModules = m: listOf (elemType.substSubModules m); substSubModules = m: listOf (elemType.substSubModules m);
@ -313,7 +313,7 @@ rec {
let nrNulls = count (def: def.value == null) defs; in let nrNulls = count (def: def.value == null) defs; in
if nrNulls == length defs then null if nrNulls == length defs then null
else if nrNulls != 0 then else if nrNulls != 0 then
throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}." throw "The option `${showOption loc}` is defined both null and not null, in ${showFiles (getFiles defs)}."
else elemType.merge loc defs; else elemType.merge loc defs;
getSubOptions = elemType.getSubOptions; getSubOptions = elemType.getSubOptions;
getSubModules = elemType.getSubModules; getSubModules = elemType.getSubModules;