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

Merge pull request #76857 from Infinisil/recursive-disableModules

Browse Source 
Apply `disabledModules` recursively
This commit is contained in:
Silvan Mosberger
2020-01-09 18:20:12 +01:00
committed by GitHub
parent 4052aa377e a6462a4a8b
commit e9c16ec186
10 changed files with 120 additions and 31 deletions
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;
@@ -22,7 +22,10 @@ let
scrubbedEval = evalModules {
modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ manualModules;
args = (config._module.args) // { modules = [ ]; };
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
specialArgs = {
pkgs = scrubDerivations "pkgs" pkgs;
inherit modulesPath;
};
};
scrubDerivations = namePrefix: pkgSet: mapAttrs
(name: value: