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

nixos/documentation: Use new extendModules instead of legacy args

Browse source
This commit is contained in:
Robert Hensing 2021-12-02 18:19:56 +00:00
parent 0b5aea2b27
commit 1a223857ab
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
nixos/modules/misc/documentation.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, baseModules, extraModules, modules, modulesPath, ... }: { config, lib, pkgs, extendModules, noUserModules, ... }:
with lib; with lib;
@ -6,11 +6,8 @@ let
cfg = config.documentation; cfg = config.documentation;
manualModules = /* Modules for which to show options even when not imported. */
baseModules extraDocModules = [ ../virtualisation/qemu-vm.nix ];
# Modules for which to show options even when not imported
++ [ ../virtualisation/qemu-vm.nix ]
++ optionals cfg.nixos.includeAllModules (extraModules ++ modules);
/* For the purpose of generating docs, evaluate options with each derivation /* For the purpose of generating docs, evaluate options with each derivation
in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}". in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
@ -24,13 +21,10 @@ let
extraSources = cfg.nixos.extraModuleSources; extraSources = cfg.nixos.extraModuleSources;
options = options =
let let
scrubbedEval = evalModules { extendNixOS = if cfg.nixos.includeAllModules then extendModules else noUserModules.extendModules;
modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ manualModules; scrubbedEval = extendNixOS {
args = (config._module.args) // { modules = [ ]; }; modules = extraDocModules;
specialArgs = { specialArgs.pkgs = scrubDerivations "pkgs" pkgs;
pkgs = scrubDerivations "pkgs" pkgs;
inherit modulesPath;
};
}; };
scrubDerivations = namePrefix: pkgSet: mapAttrs scrubDerivations = namePrefix: pkgSet: mapAttrs
(name: value: (name: value: