python3.pkgs.xmpppy: remove + dependent packages

This commit is contained in:
Jörg Thalheim 2021-02-21 18:41:02 +01:00
parent e8c545f2b2
commit 819873f29e
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
7 changed files with 3 additions and 139 deletions

View file

@ -1,26 +0,0 @@
{ lib, buildPythonPackage, fetchurl, isPy3k }:
buildPythonPackage rec {
pname = "xmpp.py";
version = "0.5.0rc1";
patches = [ ./ssl.patch ];
src = fetchurl {
url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
};
preInstall = ''
mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
'';
disabled = isPy3k;
meta = with lib; {
description = "XMPP python library";
homepage = "http://xmpppy.sourceforge.net/";
license = licenses.gpl3;
maintainers = [ maintainers.mic92 ];
};
}

View file

@ -1,25 +0,0 @@
diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py
--- xmpppy-0.5.0rc1/xmpp/transports.py 2009-04-07 12:34:09.000000000 +0400
+++ xmpppy-0.5.0rc1.q/xmpp/transports.py 2015-05-08 13:06:03.049252065 +0300
@@ -27,7 +27,7 @@
Also exception 'error' is defined to allow capture of this module specific exceptions.
"""
-import socket,select,base64,dispatcher,sys
+import socket,ssl,select,base64,dispatcher,sys
from simplexml import ustr
from client import PlugIn
from protocol import *
@@ -312,9 +312,9 @@
""" Immidiatedly switch socket to TLS mode. Used internally."""
""" Here we should switch pending_data to hint mode."""
tcpsock=self._owner.Connection
- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None)
- tcpsock._sslIssuer = tcpsock._sslObj.issuer()
- tcpsock._sslServer = tcpsock._sslObj.server()
+ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None)
+ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
+ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
tcpsock._recv = tcpsock._sslObj.read
tcpsock._send = tcpsock._sslObj.write

View file

@ -1,41 +0,0 @@
{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } :
stdenv.mkDerivation rec {
pname = "pyIRCt";
version = "0.4";
src = fetchurl {
url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz";
sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
};
buildInputs = [ pythonPackages.wrapPython ];
pythonPath = [
xmpppy pythonIRClib
];
# phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
installPhase = ''
mkdir -p $out/bin $out/share/${pname}-${version}
sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
sed -e '/configFiles/iimport os' -i config.py
cp * $out/share/${pname}-${version}
cat > $out/bin/pyIRCt <<EOF
#!${runtimeShell}
cd $out/share/${pname}-${version}
./irc.py \"$@\"
EOF
chmod a+rx $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py
wrapPythonPrograms
'';
meta = with lib; {
description = "IRC transport module for XMPP";
platforms = platforms.unix;
license = licenses.gpl2;
};
}

View file

@ -1,39 +0,0 @@
{ lib, stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } :
stdenv.mkDerivation rec {
pname = "pyMAILt";
version = "20090101";
src = fetchcvs {
cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
module = "xmpppy/mail-transport";
date = "2009-01-01";
sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
};
pythonPath = [ xmpppy ];
buildInputs = [ pythonPackages.wrapPython ];
installPhase = ''
cd mail-transport
mkdir -p $out/bin $out/share/${pname}-${version}
sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
sed -e '/configFiles/iimport os' -i config.py
cp * $out/share/$name
cat > $out/bin/pyMAILt <<EOF
#!${runtimeShell}
cd $out/share/${pname}-${version}
./mail.py \"$@\"
EOF
chmod a+rx $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py
wrapPythonPrograms
'';
meta = with lib; {
description = "Email transport module for XMPP";
platforms = platforms.unix;
license = licenses.gpl2;
};
}

View file

@ -769,6 +769,9 @@ mapAliases ({
xbmcPlain = kodiPlain; # added 2018-04-25
xbmcPlugins = kodiPlugins; # added 2018-04-25
xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only";
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained"
+ "and is broken. Working alternatives are libinput and synaptics.");

View file

@ -9212,8 +9212,6 @@ in
w3m = w3m-batch;
};
xmpppy = pythonPackages.xmpppy;
xiccd = callPackage ../tools/misc/xiccd { };
xidlehook = callPackage ../tools/X11/xidlehook {
@ -18451,10 +18449,6 @@ in
pure-ftpd = callPackage ../servers/ftp/pure-ftpd { };
pyIRCt = callPackage ../servers/xmpp/pyIRCt {};
pyMAILt = callPackage ../servers/xmpp/pyMAILt {};
pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { };
qpid-cpp = callPackage ../servers/amqp/qpid-cpp {

View file

@ -8508,8 +8508,6 @@ in {
xmodem = callPackage ../development/python-modules/xmodem { };
xmpppy = callPackage ../development/python-modules/xmpppy { };
xnd = callPackage ../development/python-modules/xnd { };
xpybutil = callPackage ../development/python-modules/xpybutil { };