From fb6a8404eec81cef77abe5418bf74f0dce26066a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 8 Jan 2026 09:53:54 -0600 Subject: [PATCH] redshift-gammastep: migrate to lib.cli.toCommandLineShellGNU Migrates from the deprecated toCommandLineShell to toCommandLineShellGNU. This changes the output format from space-separated short options (-c /path) to concatenated GNU-style options (-c/path). Both formats were verified to work correctly with redshift and gammastep. Signed-off-by: Austin Horstman --- modules/services/redshift-gammastep/lib/options.nix | 2 +- .../gammastep-basic-configuration-expected.service | 2 +- .../gammastep-tray-configuration-expected.service | 2 +- .../redshift-basic-configuration-expected.service | 2 +- .../redshift-tray-configuration-expected.service | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/services/redshift-gammastep/lib/options.nix b/modules/services/redshift-gammastep/lib/options.nix index 436dfc173..b0bee325d 100644 --- a/modules/services/redshift-gammastep/lib/options.nix +++ b/modules/services/redshift-gammastep/lib/options.nix @@ -239,7 +239,7 @@ in configFullPath = config.xdg.configHome + "/${xdgConfigFilePath}"; in "${cfg.package}/bin/${command} " - + lib.cli.toGNUCommandLineShell { } { + + lib.cli.toCommandLineShellGNU { } { v = cfg.enableVerboseLogging; c = configFullPath; }; diff --git a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service index a877b60f8..1762ad527 100644 --- a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service +++ b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@gammastep@/bin/gammastep -c /home/hm-user/.config/gammastep/config.ini +ExecStart=@gammastep@/bin/gammastep -c/home/hm-user/.config/gammastep/config.ini Restart=on-failure RestartSec=3 diff --git a/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service b/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service index fde728ded..530d18dad 100644 --- a/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service +++ b/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@gammastep@/bin/gammastep-indicator -c /home/hm-user/.config/gammastep/config.ini +ExecStart=@gammastep@/bin/gammastep-indicator -c/home/hm-user/.config/gammastep/config.ini Restart=on-failure RestartSec=3 diff --git a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service index 7177fab8f..62ec0b328 100644 --- a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service +++ b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@redshift@/bin/redshift -c /home/hm-user/.config/redshift/redshift.conf +ExecStart=@redshift@/bin/redshift -c/home/hm-user/.config/redshift/redshift.conf Restart=on-failure RestartSec=3 diff --git a/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service b/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service index db4b11c3b..d438b8aae 100644 --- a/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service +++ b/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@redshift@/bin/redshift-gtk -c /home/hm-user/.config/redshift/redshift.conf +ExecStart=@redshift@/bin/redshift-gtk -c/home/hm-user/.config/redshift/redshift.conf Restart=on-failure RestartSec=3