From 49a51d1c3bb8e4bbda202b3cb0674bf6de5848e4 Mon Sep 17 00:00:00 2001
From: Leona Maroni <lm@flyingcircus.io>
Date: Tue, 11 Nov 2025 13:05:48 +0100
Subject: [PATCH] knot-resolver: rename to knot-resolver_5 and move to by-name

---
 nixos/modules/services/networking/kresd.nix                 | 4 ++--
 .../default.nix => by-name/kn/knot-resolver_5/package.nix}  | 6 +++---
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 4 ----
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{servers/dns/knot-resolver/default.nix => by-name/kn/knot-resolver_5/package.nix} (98%)

diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 5c7facbcb530..f3cf1947d32e 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -71,8 +71,8 @@ in
         You can run `kresd-cli 1` and give commands interactively to kresd@1.service.
       '';
     };
-    package = lib.mkPackageOption pkgs "knot-resolver" {
-      example = "knot-resolver.override { extraFeatures = true; }";
+    package = lib.mkPackageOption pkgs "knot-resolver_5" {
+      example = "knot-resolver_5.override { extraFeatures = true; }";
     };
     extraConfig = lib.mkOption {
       type = lib.types.lines;
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix
similarity index 98%
rename from pkgs/servers/dns/knot-resolver/default.nix
rename to pkgs/by-name/kn/knot-resolver_5/package.nix
index a589b7fb93bb..0a592341ac3b 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/by-name/kn/knot-resolver_5/package.nix
@@ -15,7 +15,7 @@
   gnutls,
   lmdb,
   jemalloc,
-  systemd,
+  systemdMinimal,
   libcap_ng,
   dns-root-data,
   nghttp2, # optionals, in principle
@@ -34,7 +34,7 @@ let
   lua = luajitPackages;
 
   unwrapped = stdenv.mkDerivation rec {
-    pname = "knot-resolver";
+    pname = "knot-resolver_5";
     version = "5.7.6";
 
     src = fetchurl {
@@ -96,7 +96,7 @@ let
     ## the rest are optional dependencies
     ++ optionals stdenv.hostPlatform.isLinux [
       # lib
-      systemd
+      systemdMinimal
       libcap_ng
     ]
     ++ [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6b1ffb6a7324..62fd46aed46c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -781,6 +781,7 @@ mapAliases {
   kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
+  knot-resolver = warnAlias "'knot-resolver' is currently aliased to 'knot-resolver_5'. This will change with the knot-resolver 6 being declared as stable. Please explicitly use the 'knot-resolver_5' or 'knot-resolver_6' package until then." knot-resolver_5; # Added 2025-11-30
   kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27
   kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2025-10-27
   kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f75f8cc15b98..59b64434c5cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9225,10 +9225,6 @@ with pkgs;
     kanidmWithSecretProvisioning_1_8
     ;
 
-  knot-resolver = callPackage ../servers/dns/knot-resolver {
-    systemd = systemdMinimal; # in closure already anyway
-  };
-
   leafnode = callPackage ../servers/news/leafnode { };
 
   leafnode1 = callPackage ../servers/news/leafnode/1.nix { };