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

lib/modules: Use module-builtin assertions for mkRemovedOptionModule and co.

Browse Source
This commit is contained in:
Silvan Mosberger 2020-09-02 15:43:16 +02:00
parent 9523df7eb6
commit 20131348db
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/modules.nix
View File

@ -924,14 +924,16 @@ rec {
visible = false; visible = false;
apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}"; apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}";
}); });
config.assertions = config._module.assertions =
let opt = getAttrFromPath optionName options; in [{ let opt = getAttrFromPath optionName options; in {
assertion = !opt.isDefined; ${showOption optionName} = {
enable = mkDefault opt.isDefined;
message = '' message = ''
The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it. The option definition `${showOption optionName}' in ${showFiles opt.files} no longer has any effect; please remove it.
${replacementInstructions} ${replacementInstructions}
''; '';
}]; };
};
}; };
/* Return a module that causes a warning to be shown if the /* Return a module that causes a warning to be shown if the
@ -992,14 +994,19 @@ rec {
})) from); })) from);
config = { config = {
warnings = filter (x: x != "") (map (f: _module.assertions =
let val = getAttrFromPath f config; let warningMessages = map (f:
opt = getAttrFromPath f options; let val = getAttrFromPath f config;
in opt = getAttrFromPath f options;
optionalString in {
(val != "_mkMergedOptionModule") ${showOption f} = {
"The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly." enable = mkDefault (val != "_mkMergedOptionModule");
) from); type = "warning";
message = "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly.";
};
}
) from;
in mkMerge warningMessages;
} // setAttrByPath to (mkMerge } // setAttrByPath to (mkMerge
(optional (optional
(any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from)
@ -1058,8 +1065,11 @@ rec {
}); });
config = mkMerge [ config = mkMerge [
{ {
warnings = optional (warn && fromOpt.isDefined) _module.assertions.${showOption from} = {
"The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'."; enable = mkDefault (warn && fromOpt.isDefined);
type = "warning";
message = "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
};
} }
(if withPriority (if withPriority
then mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt then mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt