diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-03-10 08:04:21 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-03-10 08:04:21 +0100 |
commit | bf47162c26641af76083b0d26ceb477be6a620ff (patch) | |
tree | 6aac7576850659e3c0e880036bcbeed56a70662b /lib/options.nix | |
parent | 5d7ab319493974dbd8514d99941e6aa1108cc05f (diff) | |
parent | 213d6dd6ac1e440e95398448dae4bd6cf24989dd (diff) |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
Diffstat (limited to 'lib/options.nix')
-rw-r--r-- | lib/options.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/options.nix b/lib/options.nix index 5cea99067aab..a16a980398d6 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -48,6 +48,8 @@ rec { visible ? null, # Whether the option can be set only once readOnly ? null, + # Deprecated, used by types.optionSet. + options ? null } @ attrs: attrs // { _type = "option"; }; @@ -141,7 +143,7 @@ rec { docOption = rec { loc = opt.loc; name = showOption opt.loc; - description = opt.description or (throw "Option `${name}' has no description."); + description = opt.description or (lib.warn "Option `${name}' has no description." "This option has no description."); declarations = filter (x: x != unknownModule) opt.declarations; internal = opt.internal or false; visible = opt.visible or true; |