nixos/knot-resolver: remove separate .package option

It was confusing, as you couldn't just pass anything,
because the path to kresd binary is hard-coded
in the manager package already.
This commit is contained in:
Vladimír Čunát
2025-12-16 14:21:41 +01:00
parent dd21a60a31
commit bbebb813bf
2 changed files with 3 additions and 14 deletions
@@ -36,9 +36,8 @@ in
If you want to use knot-resolver 5, please use services.kresd.
'';
};
package = lib.mkPackageOption pkgs "knot-resolver-manager_6.kresd" { };
managerPackage = lib.mkPackageOption pkgs "knot-resolver-manager_6" {
example = "knot-resolver_6.override { extraFeatures = true; }";
example = "pkgs.knot-resolver-manager_6.override { extraFeatures = true; }";
};
settings = lib.mkOption {
type = lib.types.submodule {
@@ -113,16 +112,6 @@ in
users.groups.knot-resolver = { };
networking.resolvconf.useLocalResolver = lib.mkDefault true;
assertions = [
{
assertion = lib.versionAtLeast cfg.package.version "6.0.0";
message = ''
services.knot-resolver only works with knot-resolver 6 or later.
Please use services.kresd for knot-resolver 5.
'';
}
];
environment = {
etc."knot-resolver/config.yaml".source = configFile;
systemPackages = [
@@ -134,10 +123,9 @@ in
];
};
systemd.packages = [ cfg.package ]; # the unit gets patched a bit just below
systemd.packages = [ cfg.managerPackage.kresd ]; # the unit gets patched a bit just below
systemd.services."knot-resolver" = {
wantedBy = [ "multi-user.target" ];
path = [ (lib.getBin cfg.package) ];
stopIfChanged = false;
reloadTriggers = [
configFile
@@ -7,6 +7,7 @@
let
kresd = knot-resolver_6.finalPackage; # TODO: does the finalPackage help us?
in
assert lib.versionAtLeast kresd.version "6.0.0";
python3Packages.buildPythonPackage {
pname = "knot-resolver-manager_6";
inherit (kresd) version src;