From 6930dd3deefeadc703c5b202da54271439260d37 Mon Sep 17 00:00:00 2001 From: Tomas Kala Date: Wed, 3 Jul 2024 10:25:42 +0200 Subject: [PATCH] nixos/blocky: Add an option for the package to be used Previously, the blocky package was hardcoded to the one in pkgs. This change allows to set it, so the user can configure the blocky service to run blocky from nixpkgs-unstable, for example. --- nixos/modules/services/networking/blocky.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix index b98c8b7bdb73..4bc6ffa3f46a 100644 --- a/nixos/modules/services/networking/blocky.nix +++ b/nixos/modules/services/networking/blocky.nix @@ -12,6 +12,8 @@ in options.services.blocky = { enable = mkEnableOption "blocky, a fast and lightweight DNS proxy as ad-blocker for local network with many features"; + package = mkPackageOption pkgs "blocky" { }; + settings = mkOption { type = format.type; default = { }; @@ -30,7 +32,7 @@ in serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + ExecStart = "${getExe cfg.package} --config ${configFile}"; Restart = "on-failure"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];