Revert "eval-config: set class"

This commit is contained in:
Emily
2023-07-24 23:24:20 +01:00
committed by GitHub
parent 8f0e02cfc8
commit a5b09580e2
2 changed files with 4 additions and 6 deletions
-1
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;
});
+4 -5
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