b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make manual generation not depend on the user's configuration

Browse source 
Previously changing the value of certain options in configuration.nix
would cause the manual to be regenerated, because some option defaults
depend on the configuration.  This is undesirable because rebuilding
the manual is kind of slow.  So now the manual reflects an empty
configuration.

The downside is that this requires another call to fixMergeModules,
which adds about 14% to evaluation time.  Probably worth it.
This commit is contained in:
Eelco Dolstra 2013-10-17 13:43:40 +02:00
parent b33657df03
commit 82ad8c5ce0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/misc/nixos-manual.nix
View file

@ -3,7 +3,7 @@
# of the virtual consoles. The latter is useful for the installation
# CD.
{ config, pkgs, options, ... }:
{ config, pkgs, baseModules, ... } @ extraArgs:
with pkgs.lib;
@ -13,7 +13,11 @@ let
manual = import ../../../doc/manual {
inherit (cfg) revision;
inherit pkgs options;
inherit pkgs;
options = (fixMergeModules baseModules
(removeAttrs extraArgs ["config" "options"]) // {
modules = [ ];
}).options;
};
entry = "${manual.manual}/share/doc/nixos/manual.html";