From ccb0f8712921956eb8345dc0d20a694c0bd4cff4 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 23 Sep 2023 01:03:44 +0700 Subject: [PATCH] prosody: use default network, remove libevent, config deprecated `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. --- nixos/modules/services/networking/prosody.nix | 3 --- pkgs/servers/xmpp/prosody/default.nix | 2 -- 2 files changed, 5 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 0066c77438f410a..038d574bd878575 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -779,9 +779,6 @@ in admins = ${toLua cfg.admins} - -- we already build with libevent, so we can just enable it for a more performant server - use_libevent = true - modules_enabled = { ${ lib.concatStringsSep "\n " (lib.mapAttrsToList diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 64ac2e8699ad102..0ea58951adbac8e 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -2,7 +2,6 @@ , icu , lua , nixosTests -, withLibevent ? true , withDBI ? true # use withExtraLibs to add additional dependencies of community modules , withExtraLibs ? [ ] @@ -16,7 +15,6 @@ let luaEnv = lua.withPackages(p: with p; [ luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 luaunbound ] - ++ lib.optional withLibevent p.luaevent ++ lib.optional withDBI p.luadbi ++ withExtraLuaPackages p );