mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

Reapply "eval-config: set class"

Browse source 
All supported Nixpkgs versions now support this.

This reverts commit a5b09580e2.
This commit is contained in:
Emily 2024-06-13 13:52:29 +01:00
parent 5399270903
commit 2406909d7a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eval-config.nix
View file

@ -16,6 +16,7 @@ let
}; };
eval = lib.evalModules (builtins.removeAttrs args [ "lib" ] // { eval = lib.evalModules (builtins.removeAttrs args [ "lib" ] // {
class = "darwin";
modules = modules ++ [ argsModule ] ++ baseModules; modules = modules ++ [ argsModule ] ++ baseModules;
specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs; specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs;
}); });

9
modules/documentation/default.nix
View file

@ -11,9 +11,9 @@ let
regularConfig = config; regularConfig = config;
argsModule = { argsModule = {
config._module.args = regularConfig._module.args // { config._module.args = lib.mkForce (regularConfig._module.args // {
modules = [ ]; modules = [ ];
}; });
}; };
/* For the purpose of generating docs, evaluate options with each derivation /* For the purpose of generating docs, evaluate options with each derivation
@ -28,8 +28,9 @@ let
inherit (config.system) nixpkgsRevision; inherit (config.system) nixpkgsRevision;
options = options =
let let
scrubbedEval = evalModules { scrubbedEval = import ../../eval-config.nix {
modules = baseModules ++ [ argsModule ]; inherit lib;
modules = [ argsModule ];
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
}; };
scrubDerivations = namePrefix: pkgSet: mapAttrs scrubDerivations = namePrefix: pkgSet: mapAttrs