diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 06b92c6ad71..ff1bd628ad2 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -422,6 +422,12 @@
It was not useful except for debugging purposes and was confusingly set as default in some circumstances.
+
+
+ The WeeChat plugin pkgs.weechatScripts.weechat-xmpp has been removed as it doesn't receive
+ any updates from upstream and depends on outdated Python2-based modules.
+
+
@@ -718,7 +724,14 @@
Note: There's been some issues with python-cherrypy, which is used by the dashboard
and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch.
-
+
+
+
+ pkgs.weechat is now compiled against pkgs.python3.
+ Weechat also recommends to use Python3
+ in their docs.
+
+
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 7ac1eb4940c..81ee484f3b3 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -1,10 +1,6 @@
{ callPackage, luaPackages }:
{
- weechat-xmpp = callPackage ./weechat-xmpp {
- inherit (pythonPackages) pydns;
- };
-
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi;
};
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
deleted file mode 100644
index dad5b9c5e02..00000000000
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }:
-
-stdenv.mkDerivation {
- name = "weechat-jabber-2017-08-30";
-
- src = fetchFromGitHub {
- repo = "weechat-xmpp";
- owner = "sleduc";
- sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv";
- rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843";
- };
-
- installPhase = ''
- mkdir -p $out/share
- cp jabber.py $out/share/jabber.py
- '';
-
- patches = [
- (substituteAll {
- src = ./libpath.patch;
- env = "${buildEnv {
- name = "weechat-xmpp-env";
- paths = [ pydns xmpppy ];
- }}/lib/python2.7/site-packages";
- })
- ];
-
- passthru.scripts = [ "jabber.py" ];
-
- meta = with stdenv.lib; {
- description = "A fork of the jabber plugin for weechat";
- homepage = "https://github.com/sleduc/weechat-xmpp";
- maintainers = with maintainers; [ ma27 ];
- license = licenses.gpl3Plus;
- };
-}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
deleted file mode 100644
index 372c83944a2..00000000000
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/jabber.py b/jabber.py
-index 27006a3..e53c2c0 100644
---- a/jabber.py
-+++ b/jabber.py
-@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME
- import re
- import warnings
-
-+import sys
-+
-+sys.path.append('@env@')
-+
-+
- import_ok = True
-
- try:
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b523d4a463d..ddd6c1d270b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -380,7 +380,6 @@ mapAliases ({
virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
- weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22