From 2a850511d78f7b01fcb80896495fb730c5450de1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 28 Nov 2025 16:06:25 +0000 Subject: [PATCH] avahi: move package to by-name and add avahi-compat override - Move avahi package from pkgs/development/libraries to pkgs/by-name/av/avahi (rename path for consistency with by-name layout). - Add avahi-compat overlay at pkgs/by-name/av/avahi-compat that enables withLibdnssdCompat via avahi.override. - Remove the old avahi and avahi-compat entries from top-level all-packages.nix. This keeps the package index organized under by-name and provides a convenient avahi-compat alias for consumers that need libdnssd compatibility. --- pkgs/by-name/av/avahi-compat/package.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/av/avahi-compat/package.nix diff --git a/pkgs/by-name/av/avahi-compat/package.nix b/pkgs/by-name/av/avahi-compat/package.nix new file mode 100644 index 000000000000..063e403381e0 --- /dev/null +++ b/pkgs/by-name/av/avahi-compat/package.nix @@ -0,0 +1,11 @@ +{ + avahi, + ... +}@args: + +avahi.override ( + { + withLibdnssdCompat = true; + } + // removeAttrs args [ "avahi" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5675f04cf75c..04c958b870b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1565,10 +1565,6 @@ with pkgs; apprise = with python3Packages; toPythonApplication apprise; - avahi-compat = callPackage ../by-name/av/avahi/package.nix { - withLibdnssdCompat = true; - }; - babelfish = callPackage ../shells/fish/babelfish.nix { }; bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras));