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

Revert "eval-config: set class"

Browse source
This commit is contained in:
Emily 2023-07-24 23:24:20 +01:00 committed by GitHub
parent 8f0e02cfc8
commit a5b09580e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eval-config.nix
View file

@ -16,7 +16,6 @@ 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 = lib.mkForce (regularConfig._module.args // { config._module.args = 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,9 +28,8 @@ let
inherit (config.system) nixpkgsRevision; inherit (config.system) nixpkgsRevision;
options = options =
let let
scrubbedEval = import ../../eval-config.nix { scrubbedEval = evalModules {
inherit lib; modules = baseModules ++ [ argsModule ];
modules = [ argsModule ];
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
}; };
scrubDerivations = namePrefix: pkgSet: mapAttrs scrubDerivations = namePrefix: pkgSet: mapAttrs