From a5b09580e2d0bbc52b338afe4f1f1d46178e6bbf Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Jul 2023 23:24:20 +0100 Subject: Revert "eval-config: set `class`" --- modules/documentation/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'modules/documentation') diff --git a/modules/documentation/default.nix b/modules/documentation/default.nix index 49bba72..2f3bb9a 100644 --- a/modules/documentation/default.nix +++ b/modules/documentation/default.nix @@ -11,9 +11,9 @@ let regularConfig = config; argsModule = { - config._module.args = lib.mkForce (regularConfig._module.args // { + config._module.args = regularConfig._module.args // { modules = [ ]; - }); + }; }; /* For the purpose of generating docs, evaluate options with each derivation @@ -28,9 +28,8 @@ let inherit (config.system) nixpkgsRevision; options = let - scrubbedEval = import ../../eval-config.nix { - inherit lib; - modules = [ argsModule ]; + scrubbedEval = evalModules { + modules = baseModules ++ [ argsModule ]; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; }; scrubDerivations = namePrefix: pkgSet: mapAttrs -- cgit v1.2.3