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

nixos/documentation: Fix disabledModules being rendered

Browse Source 
Previously disabledModules would not be disabled for the manual
This commit is contained in:
Silvan Mosberger 2020-01-03 02:54:05 +01:00
parent de5f73d434
commit 7167985e34
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/misc/documentation.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, baseModules, extraModules, modules, ... }: { config, lib, pkgs, baseModules, extraModules, modules, modulesPath, ... }:
with lib; with lib;
@ -22,7 +22,10 @@ let
scrubbedEval = evalModules { scrubbedEval = evalModules {
modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ manualModules; modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ manualModules;
args = (config._module.args) // { modules = [ ]; }; args = (config._module.args) // { modules = [ ]; };
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; specialArgs = {
pkgs = scrubDerivations "pkgs" pkgs;
inherit modulesPath;
};
}; };
scrubDerivations = namePrefix: pkgSet: mapAttrs scrubDerivations = namePrefix: pkgSet: mapAttrs
(name: value: (name: value: