htop: fix deprecation warnings (#2026)

Previous patch on deprecation warnings broke use of old options due to function
call with too many arguments. This fixes the arguments so deprecation warnings
are properly traced while preserving old configuration options.
This commit is contained in:
Bart Bakker 2021-05-19 09:38:14 +00:00 committed by GitHub
parent b449cb77b1
commit 3d18912f5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -587,7 +587,7 @@ in {
warn' = warn
"htop: programs.htop.${optionKey} is deprecated; please is programs.htop.settings.${settingsKey} instead";
in if !isNull optionValue then
warn' settingsKey optionKey optionValue
warn' optionValue
else if hasAttr settingsKey cfg.settings then
cfg.settings.${settingsKey}
else