Skip to content
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.

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

prosody: remove deprecated libevent #256738

Merged
merged 1 commit into from
Nov 5, 2023

Conversation

toastal
Copy link
Contributor

@toastal toastal commented Sep 22, 2023

use_libevent config option has been deprecated as there are 3 networking back-ends (see: https://prosody.im/doc/network_backend). It is probably unwise to stray from the defaults (epoll).

Description of changes

Info for this change provided by @Zash & @K900

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
'';

passthru = {
withLibevent = withLibevent;
Copy link
Member

Choose a reason for hiding this comment

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

do we need this?

Copy link
Member

Choose a reason for hiding this comment

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

I don't think so

Suggested change
withLibevent = withLibevent;

Comment on lines 782 to 785
${ optionalString cfg.package.withLibevent ''
-- libevent was opted into (default is "epoll")
network_backend = "event"
'' }
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
${ optionalString cfg.package.withLibevent ''
-- libevent was opted into (default is "epoll")
network_backend = "event"
'' }

we might as well remove this

@@ -779,8 +779,10 @@ in

admins = ${toLua cfg.admins}

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change

@@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
'';

passthru = {
withLibevent = withLibevent;
Copy link
Member

Choose a reason for hiding this comment

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

I don't think so

Suggested change
withLibevent = withLibevent;

@@ -2,7 +2,7 @@
, icu
, lua
, nixosTests
, withLibevent ? true
, withLibevent ? false
Copy link
Member

Choose a reason for hiding this comment

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

I think we can even go as far and just drop that option entirely

`use_libevent` config option has been deprecated as there are 3
networking back-ends (see: https://prosody.im/doc/network_backend). It
is probably unwise to stray from the defaults (epoll).

Review instructed to flat-out remove it versus previously making it opt-in.
@toastal
Copy link
Contributor Author

toastal commented Oct 15, 2023

@SuperSandro2000 made adjustments. Could help until the rewrite is approved.

@aanderse
Copy link
Member

Yes I agree we should go forward with this PR. We're to close to next release to merge the other PR at this point.

@toastal toastal changed the title prosody: use default network, opt-in libevent, config deprecated prosody: remove deprecated libevent Oct 15, 2023
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

LGTM

@toastal
Copy link
Contributor Author

toastal commented Nov 5, 2023

Is this good?

@aanderse aanderse merged commit a707831 into NixOS:master Nov 5, 2023
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants