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

* Do not silently ignore broken "example" and "default" attributes

Browse Source 
when generating the documentation.  If they're broken, they should
  be fixed.

svn path=/nixpkgs/trunk/; revision=21738
This commit is contained in:
Eelco Dolstra 2010-05-12 09:31:46 +00:00
parent 55a322022c
commit da7e1fbea3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/lib/options.nix
View File

@ -251,12 +251,6 @@ 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
@ -268,8 +262,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;
} }
// optionalAttrs (opt ? example) { example = tryEval opt.example; } // optionalAttrs (opt ? example) { example = opt.example; }
// optionalAttrs (opt ? default) { default = tryEval opt.default; }; // optionalAttrs (opt ? default) { default = opt.default; };
subOptions = subOptions =
if opt ? options then if opt ? options then