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

Merge pull request #66407 from Infinisil/fix-option-rename 

lib/modules: Use options `apply` function even if no values are defined
This commit is contained in:
Silvan Mosberger 2019-08-27 22:06:23 +02:00 committed by GitHub
parent 35c1c170d7 de9cb24938
commit 91f6a681e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/modules.nix
View File

@ -323,16 +323,14 @@ rec {
else else
mergeDefinitions loc opt.type defs'; mergeDefinitions loc opt.type defs';
# Check whether the option is defined, and apply the ‘apply’
# function to the merged value. This allows options to yield a # The value with a check that it is defined
# value computed from the definitions. valueDefined = if res.isDefined then res.mergedValue else
value = throw "The option `${showOption loc}' is used but not defined.";
if !res.isDefined then
throw "The option `${showOption loc}' is used but not defined." # Apply the 'apply' function to the merged value. This allows options to
else if opt ? apply then # yield a value computed from the definitions
opt.apply res.mergedValue value = if opt ? apply then opt.apply valueDefined else valueDefined;
else
res.mergedValue;
in opt // in opt //
{ value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;