Skip to content

avahi: remove config.avahi #339339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philiptaron merged 1 commit into from
Sep 3, 2024
Merged

avahi: remove config.avahi #339339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/libraries/avahi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ fetchurl
, fetchpatch
, lib
, config
, stdenv
, pkg-config
, libdaemon
Expand All @@ -21,6 +22,9 @@
, withPython ? false
}:

# Added 2024-09-03. Drop this assertion after 24.11 is released.
assert lib.assertMsg (config.avahi or {} == {}) "config.avahi has been removed; please use an overlay or services.avahi.package to configure the avahi package.";

stdenv.mkDerivation rec {
pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}";
version = "0.8";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4029,11 +4029,11 @@ with pkgs;

autorandr = callPackage ../tools/misc/autorandr { };

avahi = callPackage ../development/libraries/avahi (config.avahi or {});
avahi = callPackage ../development/libraries/avahi { };

avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // {
avahi-compat = callPackage ../development/libraries/avahi {
withLibdnssdCompat = true;
});
};

avro-c = callPackage ../development/libraries/avro-c { };

Expand Down