diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-05-06 20:16:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 20:16:34 +0200 |
| commit | 216315c6c47cd94070e02e57e53931864ffe05ea (patch) | |
| tree | 7ceafad53ff50a1040a40ec6f4a76f0b82e7c544 /nixos | |
| parent | 835ae7b308e8204d8f6e877effec73a212a1ed4b (diff) | |
| parent | eab660d91e5d7a2796bc6e4b94b5939ed593db29 (diff) | |
Merge pull request #197547 from hercules-ci/module-class-and-flake-import
module system: Improve error messages around faulty imports
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/eval-cacheable-options.nix | 1 | ||||
| -rw-r--r-- | nixos/lib/eval-config-minimal.nix | 1 | ||||
| -rw-r--r-- | nixos/lib/testing/default.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/nixos/lib/eval-cacheable-options.nix b/nixos/lib/eval-cacheable-options.nix index c3ba2ce663758..d26967ebe09b8 100644 --- a/nixos/lib/eval-cacheable-options.nix +++ b/nixos/lib/eval-cacheable-options.nix @@ -33,6 +33,7 @@ let ]; specialArgs = { inherit config pkgs utils; + class = "nixos"; }; }; docs = import "${nixosPath}/doc/manual" { diff --git a/nixos/lib/eval-config-minimal.nix b/nixos/lib/eval-config-minimal.nix index d45b9ffd42618..036389121973d 100644 --- a/nixos/lib/eval-config-minimal.nix +++ b/nixos/lib/eval-config-minimal.nix @@ -38,6 +38,7 @@ let # is experimental. lib.evalModules { inherit prefix modules; + class = "nixos"; specialArgs = { modulesPath = builtins.toString ../modules; } // specialArgs; diff --git a/nixos/lib/testing/default.nix b/nixos/lib/testing/default.nix index 9d4f9dbc43d76..a89f734b1e645 100644 --- a/nixos/lib/testing/default.nix +++ b/nixos/lib/testing/default.nix @@ -1,7 +1,10 @@ { lib }: let - evalTest = module: lib.evalModules { modules = testModules ++ [ module ]; }; + evalTest = module: lib.evalModules { + modules = testModules ++ [ module ]; + class = "nixosTest"; + }; runTest = module: (evalTest ({ config, ... }: { imports = [ module ]; result = config.test; })).config.result; testModules = [ diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index e0c6af4abe106..31486a2216ad0 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -38,6 +38,7 @@ let modules = [ { _module.check = false; } ] ++ docModules.eager; + class = "nixos"; specialArgs = specialArgs // { pkgs = scrubDerivations "pkgs" pkgs; # allow access to arbitrary options for eager modules, eg for getting |