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

Report bad default values which would have cause a build failure if they

Browse Source 
were used to build a NixOS system.

svn path=/nixpkgs/trunk/; revision=17286
This commit is contained in:
Nicolas Pierron 2009-09-19 22:10:11 +00:00
parent 854293fc7b
commit 6041b78fa4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/lib/options.nix
View File

@ -235,6 +235,12 @@ rec {
# the set generated with filterOptionSets. # the set generated with filterOptionSets.
optionAttrSetToDocList = ignore: newOptionAttrSetToDocList; optionAttrSetToDocList = ignore: newOptionAttrSetToDocList;
newOptionAttrSetToDocList = attrs: newOptionAttrSetToDocList = attrs:
let tryEval = v:
let res = builtins.tryEval v; in
if builtins ? tryEval then
if res.success then res.value else "<error>"
else v;
in
let options = collect isOption attrs; in let options = collect isOption attrs; in
fold (opt: rest: fold (opt: rest:
let let
@ -246,8 +252,8 @@ rec {
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;
} }
// (if opt ? example then {inherit(opt) example;} else {}) // optionalAttrs (opt ? example) { example = tryEval opt.example; }
// (if opt ? default then {inherit(opt) default;} else {}); // optionalAttrs (opt ? default) { default = tryEval opt.default; };
subOptions = subOptions =
if opt ? options then if opt ? options then