BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixos/avahi: rename remaining config options

Browse source 
services.avahi.nssmdns got split into services.avahi.nssmdns{4,6},
nothing should access the old alias anymore so there's no eval warnings.

Reported in https://github.com/NixOS/nixpkgs/pull/258424#issuecomment-1849428869
This commit is contained in:
Florian Klink 2023-12-11 09:33:11 +02:00
parent e97b3e4186
commit 1c09cb43ce
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/networking/avahi-daemon.nix
View file

@ -272,7 +272,7 @@ in
users.groups.avahi = { }; users.groups.avahi = { };
system.nssModules = optional cfg.nssmdns pkgs.nssmdns; system.nssModules = optional (cfg.nssmdns4 || cfg.nssmdns6) pkgs.nssmdns;
system.nssDatabases.hosts = let system.nssDatabases.hosts = let
mdnsMinimal = if (cfg.nssmdns4 && cfg.nssmdns6) then mdnsMinimal = if (cfg.nssmdns4 && cfg.nssmdns6) then
"mdns_minimal" "mdns_minimal"

2
nixos/tests/avahi.nix
View file

@ -16,7 +16,7 @@ import ./make-test-python.nix {
cfg = { ... }: { cfg = { ... }: {
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
publish.addresses = true; publish.addresses = true;
publish.domain = true; publish.domain = true;
publish.enable = true; publish.enable = true;

2
nixos/tests/guix/publish.nix
View file

@ -16,7 +16,7 @@ in {
# substitute server which requires Avahi. # substitute server which requires Avahi.
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
userServices = true; userServices = true;

2
pkgs/applications/misc/keylight-controller-mschneider82/default.nix
View file

@ -37,7 +37,7 @@ buildGoModule rec {
longDescription = '' longDescription = ''
Requires having: Requires having:
* Elgato's Keylight paired to local wifi network. * Elgato's Keylight paired to local wifi network.
* Service avahi with nssmdns enabled. * Service avahi with nssmdns4 enabled.
''; '';
license = licenses.mit; license = licenses.mit;
homepage = "https://github.com/mschneider82/keylight-control"; homepage = "https://github.com/mschneider82/keylight-control";

2
pkgs/misc/drivers/epson-escpr/default.nix
View file

@ -42,7 +42,7 @@ in stdenv.mkDerivation {
hostname resolvable: hostname resolvable:
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
};''; };'';
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ artuuge ]; maintainers = with maintainers; [ artuuge ];