From a5b09580e2d0bbc52b338afe4f1f1d46178e6bbf Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Jul 2023 23:24:20 +0100 Subject: [PATCH] Revert "eval-config: set `class`" --- eval-config.nix | 1 - modules/documentation/default.nix | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/eval-config.nix b/eval-config.nix index 57a03814c..9663849a5 100644 --- a/eval-config.nix +++ b/eval-config.nix @@ -16,7 +16,6 @@ let }; eval = lib.evalModules (builtins.removeAttrs args [ "lib" ] // { - class = "darwin"; modules = modules ++ [ argsModule ] ++ baseModules; specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs; }); diff --git a/modules/documentation/default.nix b/modules/documentation/default.nix index 49bba7237..2f3bb9a4d 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