diff options
| author | Emily <vcs@emily.moe> | 2024-06-13 13:52:29 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2024-06-13 14:35:20 +0100 |
| commit | 2406909d7a2aa50f907a82e553d6e923814e978a (patch) | |
| tree | fa497595717dc896078c2cb5cda30ee175faa06b | |
| parent | 5399270903f6e95e5a5b083391e910dfed226f3a (diff) | |
Reapply "eval-config: set `class`"
All supported Nixpkgs versions now support this.
This reverts commit a5b09580e2d0bbc52b338afe4f1f1d46178e6bbf.
| -rw-r--r-- | eval-config.nix | 1 | ||||
| -rw-r--r-- | modules/documentation/default.nix | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/eval-config.nix b/eval-config.nix index d2567a4..cd14493 100644 --- a/eval-config.nix +++ b/eval-config.nix @@ -16,6 +16,7 @@ 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 3259cfd..395e6e6 100644 --- a/modules/documentation/default.nix +++ b/modules/documentation/default.nix @@ -11,9 +11,9 @@ let regularConfig = config; argsModule = { - config._module.args = regularConfig._module.args // { + config._module.args = lib.mkForce (regularConfig._module.args // { modules = [ ]; - }; + }); }; /* For the purpose of generating docs, evaluate options with each derivation @@ -28,8 +28,9 @@ let inherit (config.system) nixpkgsRevision; options = let - scrubbedEval = evalModules { - modules = baseModules ++ [ argsModule ]; + scrubbedEval = import ../../eval-config.nix { + inherit lib; + modules = [ argsModule ]; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; }; scrubDerivations = namePrefix: pkgSet: mapAttrs |