Skip to content

avahi: remove config.avahi#339339

Merged
philiptaron merged 1 commit intoNixOS:masterfrom
philiptaron:avahi-madness
Sep 3, 2024
Merged

avahi: remove config.avahi#339339
philiptaron merged 1 commit intoNixOS:masterfrom
philiptaron:avahi-madness

Conversation

@philiptaron
Copy link
Contributor

Description of changes

This was added in 6832a42, which replaced a call that qt4Support = config.avahi.qt4Support or false;.

As qt4 support is now out of the tree, so should this be as well.

See also:

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@philiptaron philiptaron requested review from emilazy and oxij September 3, 2024 21:01
@emilazy
Copy link
Member

emilazy commented Sep 3, 2024

I guess this would break config.avahi.gtk3Support = false;. Do we care?

@philiptaron
Copy link
Contributor Author

I guess this would break config.avahi.gtk3Support = false;. Do we care?

It would also break:

  • config.avahi.dbus = pkgs.dbus.override { patches = [ ./crazy-stuff.patch ]; }
  • config.avahi.expat = ...
  • config.avahi.fetchpatch = ...
  • config.avahi.fetchurl = ...
  • config.avahi.gettext = ...
  • config.avahi.glib = ...
  • config.avahi.gtk3 = ...
  • config.avahi.lib = ...
  • config.avahi.libdaemon = ...
  • config.avahi.libevent = ...
  • config.avahi.libiconv = ...
  • config.avahi.libpcap = ...
  • config.avahi.nixosTests = ...
  • config.avahi.pkg-config = ...
  • config.avahi.python = ...
  • config.avahi.qt5 = ...
  • config.avahi.qt5Support = boolean-expr
  • config.avahi.stdenv = ...
  • config.avahi.withLibdnssdCompat = boolean-exp
  • config.avahi.withPython = boolean-expr

I do indeed claim that we don't care.

@emilazy
Copy link
Member

emilazy commented Sep 3, 2024

I think the difference is that it was intentional that it would apply to the *Supports.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 3, 2024
@philiptaron
Copy link
Contributor Author

I added in a message.

Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable. Can you add a comment mentioning 24.11 so we know when we can safely drop it?

This was added in 6832a42, which
replaced an attrset with `qt4Support = config.avahi.qt4Support or false;`.

As qt4 support is now out of the tree, so should this be as well.
@philiptaron
Copy link
Contributor Author

Seems reasonable. Can you add a comment mentioning 24.11 so we know when we can safely drop it?

Done.

@philiptaron philiptaron merged commit 0c6f662 into NixOS:master Sep 3, 2024
@philiptaron philiptaron deleted the avahi-madness branch September 3, 2024 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants