* Allow the default for option values displayed in the manual to be

  overriden.  Some defaults should not be evaluated because they cause
  unnecessary evaluation or might cause evaluation errors
  (e.g. assertions).  For instance, the value of the
  `boot.kernelPackages' option is an attribute set.  Some packages in
  that set might not evaluate (e.g. AUFS2 on kernels that don't have
  the AUFS2 patch), and in any case it slows down nixos-rebuild to
  evaluate lots of packages that are not actually used in the
  configuration.

svn path=/nixpkgs/trunk/; revision=22043

1 files changed, 2 insertions, 1 deletions

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 3db9b671fe3..570be886552 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -263,7 +263,8 @@ rec {
             definitions = map (x: toString x.source) opt.definitions;
           }
           // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }
-          // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; };
+          // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }
+          // optionalAttrs (opt ? defaultText) { default = opt.defaultText; };
 
           subOptions =
             if opt ? options then