mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-13 20:30:02 +00:00
Code Activity

Merge pull request #747 from LnL7/revert-744-set-module-class

Browse source 
Revert "eval-config: set `class`"
This commit is contained in:
Emily 2023-07-24 23:51:24 +01:00 • committed by GitHub
commit 6ed4eb544f
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" ] // {
class = "darwin";
modules = modules ++ [ argsModule ] ++ baseModules;
specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs;
});

9
modules/documentation/default.nix
View file

@ -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