From bbebb813bf490ffbc5972614bfbc91ab2938386c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 14 Dec 2025 08:15:12 +0100
Subject: [PATCH] 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.
---
 .../services/networking/knot-resolver.nix        | 16 ++--------------
 .../kn/knot-resolver-manager_6/package.nix       |  1 +
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix
index 09a57a692cdc..96b39745a02f 100644
--- a/nixos/modules/services/networking/knot-resolver.nix
+++ b/nixos/modules/services/networking/knot-resolver.nix
@@ -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
diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
index 52ce78356b56..890e71fdb362 100644
--- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix
@@ -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;