From 689a50f3a2b10a660cbfe88e809383dfb901fa98 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 4 Sep 2019 18:13:50 +0200
Subject: [PATCH 1/2] weechat: build with python3 by default
WeeChat also supports Python3 for scripts which should be preferred as
CPython2 is about to get EOLed soon: https://weechat.org/scripts/python3/
---
pkgs/applications/networking/irc/weechat/default.nix | 6 +++---
.../networking/irc/weechat/scripts/default.nix | 10 +++-------
.../irc/weechat/scripts/wee-slack/default.nix | 6 +++---
.../irc/weechat/scripts/weechat-otr/default.nix | 8 ++++----
pkgs/applications/networking/irc/weechat/wrapper.nix | 6 +++---
5 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 3f8ad762218..31f2a7e6a27 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -6,21 +6,21 @@
, guileSupport ? true, guile
, luaSupport ? true, lua5
, perlSupport ? true, perl
-, pythonSupport ? true, pythonPackages
+, pythonSupport ? true, python3Packages
, rubySupport ? true, ruby
, tclSupport ? true, tcl
, extraBuildInputs ? []
}:
let
- inherit (pythonPackages) python;
+ inherit (python3Packages) python;
plugins = [
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
{ name = "ruby"; enabled = rubySupport; cmakeFlag = "ENABLE_RUBY"; buildInputs = [ ruby ]; }
{ name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
{ name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
- { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON"; buildInputs = [ python ]; }
+ { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; }
];
enabledPlugins = builtins.filter (p: p.enabled) plugins;
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 4b20c1046f9..7ac1eb4940c 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, luaPackages, pythonPackages }:
+{ callPackage, luaPackages }:
{
weechat-xmpp = callPackage ./weechat-xmpp {
@@ -9,13 +9,9 @@
inherit (luaPackages) cjson luaffi;
};
- wee-slack = callPackage ./wee-slack {
- inherit pythonPackages;
- };
+ wee-slack = callPackage ./wee-slack { };
weechat-autosort = callPackage ./weechat-autosort { };
- weechat-otr = callPackage ./weechat-otr {
- inherit pythonPackages;
- };
+ weechat-otr = callPackage ./weechat-otr { };
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 49616671507..6811cb164e0 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }:
+{ stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
pname = "wee-slack";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
src = ./libpath.patch;
env = "${buildEnv {
name = "wee-slack-env";
- paths = with pythonPackages; [ websocket_client six ];
- }}/${pythonPackages.python.sitePackages}";
+ paths = with python3Packages; [ websocket_client six ];
+ }}/${python3Packages.python.sitePackages}";
})
];
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
index c22903c0ece..9682aa3169a 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, pythonPackages, gmp }:
+{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }:
let
# pure-python-otr (potr) requires an older version of pycrypto, which is
@@ -6,7 +6,7 @@ let
# of pycrypto will be fetched from the Debian project.
# https://security-tracker.debian.org/tracker/source-package/python-crypto
- pycrypto = pythonPackages.buildPythonPackage rec {
+ pycrypto = python3Packages.buildPythonPackage rec {
pname = "pycrypto";
version = "2.6.1-10";
@@ -24,7 +24,7 @@ let
'';
};
- potr = pythonPackages.potr.overridePythonAttrs (oldAttrs: {
+ potr = python3Packages.potr.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs = [ pycrypto ];
});
in stdenv.mkDerivation rec {
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
env = "${buildEnv {
name = "weechat-otr-env";
paths = [ potr pycrypto ];
- }}/${pythonPackages.python.sitePackages}";
+ }}/${python3Packages.python.sitePackages}";
})
];
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index e6fa95488e1..5c06bb8517a 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -1,5 +1,5 @@
{ lib, runCommand, writeScriptBin, buildEnv
-, pythonPackages, perlPackages, runtimeShell
+, python3Packages, perlPackages, runtimeShell
}:
weechat:
@@ -17,11 +17,11 @@ let
in rec {
python = (simplePlugin "python") // {
extraEnv = ''
- export PATH="${pythonPackages.python}/bin:$PATH"
+ export PATH="${python3Packages.python}/bin:$PATH"
'';
withPackages = pkgsFun: (python // {
extraEnv = ''
- export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
+ export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}"
'';
});
};
From e4bc0e2b5f6bf96dfd3c69799918ddf7f67155cf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 5 Sep 2019 17:43:10 +0200
Subject: [PATCH 2/2] weechatScripts.weechat-xmpp: remove
This plugin is fairly outdated and depends on python2 libraries that
don't receive any updates either (xmpppy for instance[1]).
[1] https://pypi.org/project/xmpppy/
---
nixos/doc/manual/release-notes/rl-1909.xml | 15 +++++++-
.../irc/weechat/scripts/default.nix | 4 ---
.../weechat/scripts/weechat-xmpp/default.nix | 36 -------------------
.../scripts/weechat-xmpp/libpath.patch | 16 ---------
pkgs/top-level/aliases.nix | 1 -
5 files changed, 14 insertions(+), 58 deletions(-)
delete mode 100644 pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
delete mode 100644 pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
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.
</para>
</listitem>
+ <listitem>
+ <para>
+ The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive
+ any updates from upstream and depends on outdated Python2-based modules.
+ </para>
+ </listitem>
</itemizedlist>
</section>
@@ -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.
</para>
- </listitem>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>pkgs.weechat</literal> is now compiled against <literal>pkgs.python3</literal>.
+ Weechat also recommends <link xlink:href="https://weechat.org/scripts/python3/">to use Python3
+ in their docs.</link>
+ </para>
+ </listitem>
</itemizedlist>
</section>
</section>
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