Browse Source

Replace optionDeclarations by options which is directly computed by

moduleMerge.

svn path=/nixos/trunk/; revision=17166
nsd-state-dir
Nicolas Pierron 13 years ago
parent
commit
10e9705a86
  1. 20
      doc/manual/default.nix
  2. 5
      lib/eval-config.nix
  3. 7
      modules/services/misc/nixos-manual.nix
  4. 4
      release.nix

20
doc/manual/default.nix

@ -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 {

5
lib/eval-config.nix

@ -25,11 +25,12 @@ rec {
optionDefinitions = systemModule.config;
optionDeclarations = systemModule.options;
inherit (systemModule) options;
# These are the extra arguments passed to every module. In
# particular, Nixpkgs is passed through the "pkgs" argument.
extraArgs = extraArgs_ // {
inherit pkgs optionDeclarations;
inherit pkgs;
modulesPath = ../modules;
servicesPath = services;
};
@ -62,5 +63,5 @@ rec {
# option declarations.
config = pkgs.checker optionDefinitions
optionDefinitions.environment.checkConfigurationOptions
optionDeclarations optionDefinitions;
options optionDefinitions;
}

7
modules/services/misc/nixos-manual.nix

@ -3,7 +3,7 @@
# of the virtual consoles. The latter is useful for the installation
# CD.
{pkgs, config, optionDeclarations, ...}:
{pkgs, config, options, ...}:
let
@ -13,9 +13,8 @@ let
manual =
# We could speed up the evaluation of the manual expression by
# providing it the optionDeclarations of the current
# configuration.
import ../../../doc/manual {inherit pkgs optionDeclarations;};
# providing it the options of the current configuration.
import ../../../doc/manual {inherit pkgs options;};
in

4
release.nix

@ -74,11 +74,11 @@ let
import "${nixosSrc}/doc/manual" {
pkgs = import nixpkgs {};
optionDeclarations =
options =
(import lib/eval-config.nix {
inherit nixpkgs;
modules = [ ];
}).optionDeclarations;
}).options;
};

Loading…
Cancel
Save