gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/kresd, nixos/knot-resolver: fix assertion format

Browse Source 
These bad assertions were added in PR #463467
This commit is contained in:
Vladimír Čunát
2025-12-06 09:31:09 +01:00
parent a22b289c52
commit 09aa6e1f3b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/knot-resolver.nix
+9 -2
View File
@@ -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 = {
nixos/modules/services/networking/kresd.nix
+8 -2
View File
@@ -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