From 3d18912f5ae7c98bd5249411d98cdf3b28fe1f09 Mon Sep 17 00:00:00 2001
From: Bart Bakker <bart@thesoftwarecraft.com>
Date: Wed, 19 May 2021 09:38:14 +0000
Subject: [PATCH] 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.
---
 modules/programs/htop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix
index 730bb5d52..b04366b12 100644
--- a/modules/programs/htop.nix
+++ b/modules/programs/htop.nix
@@ -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