diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2023-04-17 19:48:53 +0200 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2023-05-06 18:32:58 +0200 |
| commit | 8054785157119ea12e526481924d6676427904bb (patch) | |
| tree | d62be0513289427454c94acc1ef86444249c21f8 /nixos | |
| parent | 8f02e95aff2b9cb94470ec379e2a3f55858cb03d (diff) | |
lib/modules: Move class out of specialArgs
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/eval-config-minimal.nix | 5 | ||||
| -rw-r--r-- | nixos/lib/testing/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/nixos/lib/eval-config-minimal.nix b/nixos/lib/eval-config-minimal.nix index 7e28f43051271..036389121973d 100644 --- a/nixos/lib/eval-config-minimal.nix +++ b/nixos/lib/eval-config-minimal.nix @@ -38,11 +38,10 @@ let # is experimental. lib.evalModules { inherit prefix modules; + class = "nixos"; specialArgs = { modulesPath = builtins.toString ../modules; - } // specialArgs // { - class = "nixos"; - }; + } // specialArgs; }; in diff --git a/nixos/lib/testing/default.nix b/nixos/lib/testing/default.nix index 1bd6278ce6844..a89f734b1e645 100644 --- a/nixos/lib/testing/default.nix +++ b/nixos/lib/testing/default.nix @@ -3,7 +3,7 @@ let evalTest = module: lib.evalModules { modules = testModules ++ [ module ]; - specialArgs.class = "nixosTest"; + class = "nixosTest"; }; runTest = module: (evalTest ({ config, ... }: { imports = [ module ]; result = config.test; })).config.result; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 1821dd866cb13..31486a2216ad0 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -38,8 +38,8 @@ let modules = [ { _module.check = false; } ] ++ docModules.eager; + class = "nixos"; specialArgs = specialArgs // { - class = "nixos"; pkgs = scrubDerivations "pkgs" pkgs; # allow access to arbitrary options for eager modules, eg for getting # option types from lazy modules |