JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #95718 from Infinisil/fixup-nonexistant-option-error

Browse Source 
lib/modules: Fix nonexistant option error
This commit is contained in:
Maximilian Bosch 2020-08-18 11:12:39 +02:00 committed by GitHub
commit 30842d0263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/modules.nix
View File

@ -115,8 +115,8 @@ rec {
checkUnmatched = checkUnmatched =
if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then
let inherit (head merged.unmatchedDefns) file prefix; let firstDef = head merged.unmatchedDefns;
in throw "The option `${showOption prefix}' defined in `${file}' does not exist." in throw "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."
else null; else null;
result = builtins.seq checkUnmatched { result = builtins.seq checkUnmatched {