git.iko.soy/typeable/nixpkgs
on master help sign in
python3.pkgs.xmpppy: remove + dependent packages
commit819873f29e9a08c184656ef69e2234ce5417ff2a authorJörg Thalheim <joerg@thalheim.io> dateSun 21 Feb 2021, 18:41 (6 years ago) parente8c545f
7 files changed+3−139
pkgs/development/python-modules/xmpppy/default.nix−26 pkgs/development/python-modules/xmpppy/ssl.patch−25 pkgs/servers/xmpp/pyIRCt/default.nix−41 pkgs/servers/xmpp/pyMAILt/default.nix−39 pkgs/top-level/aliases.nix+3 pkgs/top-level/all-packages.nix−6 pkgs/top-level/python-packages.nix−2
pkgs/development/python-modules/xmpppy/default.nixdeleted−26
@@ -1,26 +0,0 @@
1−{ lib, buildPythonPackage, fetchurl, isPy3k }:
2−buildPythonPackage rec {
3− pname = "xmpp.py";
4− version = "0.5.0rc1";
5−
6− patches = [ ./ssl.patch ];
7−
8− src = fetchurl {
9− url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
10− sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
11− };
12−
13− preInstall = ''
14− mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
15− export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
16− '';
17−
18− disabled = isPy3k;
19−
20− meta = with lib; {
21− description = "XMPP python library";
22− homepage = "http://xmpppy.sourceforge.net/";
23− license = licenses.gpl3;
24− maintainers = [ maintainers.mic92 ];
25− };
26−}
pkgs/development/python-modules/xmpppy/ssl.patchdeleted−25
@@ -1,25 +0,0 @@
1−diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py
2−--- xmpppy-0.5.0rc1/xmpp/transports.py 2009-04-07 12:34:09.000000000 +0400
3−+++ xmpppy-0.5.0rc1.q/xmpp/transports.py 2015-05-08 13:06:03.049252065 +0300
4−@@ -27,7 +27,7 @@
5− Also exception 'error' is defined to allow capture of this module specific exceptions.
6− """
7−
8−-import socket,select,base64,dispatcher,sys
9−+import socket,ssl,select,base64,dispatcher,sys
10− from simplexml import ustr
11− from client import PlugIn
12− from protocol import *
13−@@ -312,9 +312,9 @@
14− """ Immidiatedly switch socket to TLS mode. Used internally."""
15− """ Here we should switch pending_data to hint mode."""
16− tcpsock=self._owner.Connection
17−- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None)
18−- tcpsock._sslIssuer = tcpsock._sslObj.issuer()
19−- tcpsock._sslServer = tcpsock._sslObj.server()
20−+ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None)
21−+ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
22−+ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
23− tcpsock._recv = tcpsock._sslObj.read
24− tcpsock._send = tcpsock._sslObj.write
25−
pkgs/servers/xmpp/pyIRCt/default.nixdeleted−41
@@ -1,41 +0,0 @@
1−{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } :
2−
3−stdenv.mkDerivation rec {
4− pname = "pyIRCt";
5− version = "0.4";
6−
7− src = fetchurl {
8− url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz";
9− sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
10− };
11−
12− buildInputs = [ pythonPackages.wrapPython ];
13−
14− pythonPath = [
15− xmpppy pythonIRClib
16− ];
17−
18− # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
19−
20− installPhase = ''
21− mkdir -p $out/bin $out/share/${pname}-${version}
22− sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
23− sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
24− sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
25− sed -e '/configFiles/iimport os' -i config.py
26− cp * $out/share/${pname}-${version}
27− cat > $out/bin/pyIRCt <<EOF
28− #!${runtimeShell}
29− cd $out/share/${pname}-${version}
30− ./irc.py \"$@\"
31− EOF
32− chmod a+rx $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py
33− wrapPythonPrograms
34− '';
35−
36− meta = with lib; {
37− description = "IRC transport module for XMPP";
38− platforms = platforms.unix;
39− license = licenses.gpl2;
40− };
41−}
pkgs/servers/xmpp/pyMAILt/default.nixdeleted−39
@@ -1,39 +0,0 @@
1−{ lib, stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } :
2−
3−stdenv.mkDerivation rec {
4− pname = "pyMAILt";
5− version = "20090101";
6−
7− src = fetchcvs {
8− cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
9− module = "xmpppy/mail-transport";
10− date = "2009-01-01";
11− sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
12− };
13−
14− pythonPath = [ xmpppy ];
15− buildInputs = [ pythonPackages.wrapPython ];
16−
17− installPhase = ''
18− cd mail-transport
19− mkdir -p $out/bin $out/share/${pname}-${version}
20− sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
21− sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
22− sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
23− sed -e '/configFiles/iimport os' -i config.py
24− cp * $out/share/$name
25− cat > $out/bin/pyMAILt <<EOF
26− #!${runtimeShell}
27− cd $out/share/${pname}-${version}
28− ./mail.py \"$@\"
29− EOF
30− chmod a+rx $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py
31− wrapPythonPrograms
32− '';
33−
34− meta = with lib; {
35− description = "Email transport module for XMPP";
36− platforms = platforms.unix;
37− license = licenses.gpl2;
38− };
39−}
pkgs/top-level/aliases.nix+3
@@ -769,6 +769,9 @@ mapAliases ({
769769 xbmcPlain = kodiPlain; # added 2018-04-25
770770 xbmcPlugins = kodiPlugins; # added 2018-04-25
771771 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
772+ xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
773+ pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
774+ pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only";
772775 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
773776 xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained"
774777 + "and is broken. Working alternatives are libinput and synaptics.");
pkgs/top-level/all-packages.nix−6
@@ -9212,8 +9212,6 @@ in
92129212 w3m = w3m-batch;
92139213 };
92149214
9215− xmpppy = pythonPackages.xmpppy;
9216−
92179215 xiccd = callPackage ../tools/misc/xiccd { };
92189216
92199217 xidlehook = callPackage ../tools/X11/xidlehook {
@@ -18451,10 +18449,6 @@ in
1845118449
1845218450 pure-ftpd = callPackage ../servers/ftp/pure-ftpd { };
1845318451
18454− pyIRCt = callPackage ../servers/xmpp/pyIRCt {};
18455−
18456− pyMAILt = callPackage ../servers/xmpp/pyMAILt {};
18457−
1845818452 pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { };
1845918453
1846018454 qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
pkgs/top-level/python-packages.nix−2
@@ -8508,8 +8508,6 @@ in {
85088508
85098509 xmodem = callPackage ../development/python-modules/xmodem { };
85108510
8511− xmpppy = callPackage ../development/python-modules/xmpppy { };
8512−
85138511 xnd = callPackage ../development/python-modules/xnd { };
85148512
85158513 xpybutil = callPackage ../development/python-modules/xpybutil { };