From e2a85731a071811457c151d2da385f9bb4ea5cdb Mon Sep 17 00:00:00 2001 From: Henrique Goncalves Date: Mon, 8 Jul 2024 16:36:31 -0300 Subject: [PATCH] nextdns: fix argument handling --- modules/services/nextdns/default.nix | 2 +- tests/services-nextdns.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/services/nextdns/default.nix b/modules/services/nextdns/default.nix index 23120965b..adc9823e9 100644 --- a/modules/services/nextdns/default.nix +++ b/modules/services/nextdns/default.nix @@ -31,7 +31,7 @@ in { launchd.daemons.nextdns = { path = [ nextdns ]; serviceConfig.ProgramArguments = - [ "${pkgs.nextdns}/bin/nextdns" "run" (escapeShellArgs cfg.arguments) ]; + [ "${pkgs.nextdns}/bin/nextdns" "run" ] ++ cfg.arguments; serviceConfig.KeepAlive = true; serviceConfig.RunAtLoad = true; }; diff --git a/tests/services-nextdns.nix b/tests/services-nextdns.nix index 4d6224f24..02ce1a589 100644 --- a/tests/services-nextdns.nix +++ b/tests/services-nextdns.nix @@ -12,6 +12,7 @@ in { echo >&2 "checking nextdns service in ~/Library/LaunchDaemons" grep "org.nixos.nextdns" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist grep "/bin/nextdns" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist - grep "'-config' '10.0.3.0/24=abcdef'" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist + grep -- "-config" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist + grep "10.0.3.0/24=abcdef" ${config.out}/Library/LaunchDaemons/org.nixos.nextdns.plist ''; }