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

mkEnableOption: Add a period at the end of the description

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-17 14:29:51 +02:00
parent 04690da3bd
commit ad0568e64a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/options.nix
View File

@ -31,7 +31,7 @@ rec {
mkEnableOption = name: mkOption { mkEnableOption = name: mkOption {
default = false; default = false;
example = true; example = true;
description = "Whether to enable ${name}"; description = "Whether to enable ${name}.";
type = lib.types.bool; type = lib.types.bool;
}; };
@ -272,9 +272,7 @@ rec {
let let
docOption = { docOption = {
inherit (opt) name; inherit (opt) name;
description = if opt ? description then opt.description else description = opt.description or (throw "Option ${opt.name}: No description.");
throw "Option ${opt.name}: No description.";
declarations = map (x: toString x.source) opt.declarations; declarations = map (x: toString x.source) opt.declarations;
#definitions = map (x: toString x.source) opt.definitions; #definitions = map (x: toString x.source) opt.definitions;
} }
@ -297,7 +295,7 @@ rec {
generation of `options.xml' much more efficient: the XML generation of `options.xml' much more efficient: the XML
representation of derivations is very large (on the order of representation of derivations is very large (on the order of
megabytes) and is not actually used by the manual generator. */ megabytes) and is not actually used by the manual generator. */
scrubOptionValue = x: scrubOptionValue = x:
if isDerivation x then { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; } if isDerivation x then { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
else if isList x then map scrubOptionValue x else if isList x then map scrubOptionValue x
else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"]) else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])

2
nixos/modules/services/monitoring/uptime.nix
View File

@ -51,7 +51,7 @@ in {
enableWebService = mkEnableOption "the uptime monitoring program web service"; enableWebService = mkEnableOption "the uptime monitoring program web service";
enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service (default: enableWebService == true)" // { default = cfg.enableWebService; }; enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service" // { default = cfg.enableWebService; };
nodeEnv = mkOption { nodeEnv = mkOption {
description = "The node environment to run in (development, production, etc.)"; description = "The node environment to run in (development, production, etc.)";