From 09aa6e1f3b2b856cd9c00eba13f5133c890ed0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 6 Dec 2025 08:59:43 +0100
Subject: [PATCH] nixos/kresd, nixos/knot-resolver: fix assertion format

These bad assertions were added in PR #463467
---
 nixos/modules/services/networking/knot-resolver.nix | 11 +++++++++--
 nixos/modules/services/networking/kresd.nix         | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix
index f669aa3db383..9ae940182a30 100644
--- a/nixos/modules/services/networking/knot-resolver.nix
+++ b/nixos/modules/services/networking/knot-resolver.nix
@@ -112,8 +112,15 @@ in
     };
     users.groups.knot-resolver = { };
     networking.resolvconf.useLocalResolver = lib.mkDefault true;
-    assertions = lib.optionals (lib.versions.major cfg.package.version == 5) [
-      "services.knot-resolver only works with knot-resolver 6 or later. Please use services.kresd for knot-resolver 5."
+
+    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 = {
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 88f6526d19d7..0dc8050c2e29 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -135,8 +135,14 @@ in
 
   ###### implementation
   config = lib.mkIf cfg.enable {
-    assertions = lib.optionals (lib.versions.major cfg.package.version > 5) [
-      "services.kresd only works with knot-resolver 5. Please use services.knot-resolver for knot-resolver 6 and newer."
+    assertions = [
+      {
+        assertion = lib.versionOlder cfg.package.version "6.0.0";
+        message = ''
+          services.kresd only works with knot-resolver 5.
+          Please use services.knot-resolver for knot-resolver 6 and newer.
+        '';
+      }
     ];
     environment = {
       etc."knot-resolver/kresd.conf".source = configFile; # not required