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

Replace optionDeclarations by options which is directly computed by

Browse Source 
moduleMerge.

svn path=/nixos/trunk/; revision=17166
This commit is contained in:
Nicolas Pierron
2009-09-15 14:09:18 +00:00
parent dd40d6196b
commit 10e9705a86
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
doc/manual/default.nix
View File

@@ -1,23 +1,17 @@
{ pkgs, optionDeclarations }:
{ pkgs, options }:
let
manualConfig =
{ environment.checkConfigurationOptions = false;
services.nixosManual.enable = false;
};
# To prevent infinite recursion, remove system.path from the
# options. Not sure why this happens.
optionDeclarations_ =
optionDeclarations //
{ system = removeAttrs optionDeclarations.system ["path"]; };
options_ =
options //
{ system = removeAttrs options.system ["path"]; };
options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
(builtins.toXML (pkgs.lib.optionAttrSetToDocList "" optionDeclarations_)));
optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
(builtins.toXML (pkgs.lib.optionAttrSetToDocList "" options_)));
optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${options}
${pkgs.libxslt}/bin/xsltproc -o $out ${./options-to-docbook.xsl} ${optionsXML}
'';
manual = pkgs.stdenv.mkDerivation {