From 4619234604ecb0b870cfd903fb8343d736dee3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Dec 2025 02:31:44 +0100 Subject: [PATCH] nixos/knot-resolver: default package to the passed through and overwritten package of the manager --- nixos/modules/services/networking/knot-resolver.nix | 2 +- pkgs/by-name/kn/knot-resolver-manager_6/package.nix | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix index 9ae940182a30..acf3a74cd937 100644 --- a/nixos/modules/services/networking/knot-resolver.nix +++ b/nixos/modules/services/networking/knot-resolver.nix @@ -36,7 +36,7 @@ in If you want to use knot-resolver 5, please use services.kresd. ''; }; - package = lib.mkPackageOption pkgs "knot-resolver_6" { + package = lib.mkPackageOption pkgs "knot-resolver-manager_6.knot-resolver" { example = "knot-resolver_6.override { extraFeatures = true; }"; }; managerPackage = lib.mkPackageOption pkgs "knot-resolver-manager_6" { }; 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 d9242a886a32..0f10f208e7be 100644 --- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -71,6 +71,10 @@ python3Packages.buildPythonPackage { "test_proxy_rehandshake_tls12" ]; + passthru = { + inherit knot-resolver; + }; + meta = knot-resolver.meta // { mainProgram = "knot-resolver"; };