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

mkRemovedOptionModule: assert on removed options (#69419) 

mkRemovedOptionModule: assert on removed options
This commit is contained in:
Silvan Mosberger 2019-09-30 16:39:40 +02:00 committed by GitHub
parent 1857783128 b08b0bcbbe
commit c75a18fea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/modules.nix
View File

@ -592,11 +592,14 @@ rec {
{ options = setAttrByPath optionName (mkOption { { options = setAttrByPath optionName (mkOption {
visible = false; visible = false;
}); });
config.warnings = config.assertions =
let opt = getAttrFromPath optionName options; in let opt = getAttrFromPath optionName options; in [{
optional opt.isDefined '' assertion = !opt.isDefined;
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

2
nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
View File

@ -49,6 +49,6 @@ in
(mkRemovedOptionModule [ "insecure" ] '' (mkRemovedOptionModule [ "insecure" ] ''
This option was replaced by 'prometheus.exporters.nginx.sslVerify'. This option was replaced by 'prometheus.exporters.nginx.sslVerify'.
'') '')
({ options.warnings = options.warnings; }) ({ options.warnings = options.warnings; options.assertions = options.assertions; })
]; ];
} }

2
nixos/modules/tasks/network-interfaces.nix
View File

@ -305,7 +305,7 @@ let
optional (defined ipv6Address && defined ipv6PrefixLength) optional (defined ipv6Address && defined ipv6PrefixLength)
{ address = ipv6Address; prefixLength = ipv6PrefixLength; })) { address = ipv6Address; prefixLength = ipv6PrefixLength; }))
({ options.warnings = options.warnings; }) ({ options.warnings = options.warnings; options.assertions = options.assertions; })
]; ];
}; };