From 819873f29e9a08c184656ef69e2234ce5417ff2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Feb 2021 18:41:02 +0100 Subject: [PATCH] python3.pkgs.xmpppy: remove + dependent packages --- .../python-modules/xmpppy/default.nix | 26 ------------ .../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 - 7 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 pkgs/development/python-modules/xmpppy/default.nix delete mode 100644 pkgs/development/python-modules/xmpppy/ssl.patch delete mode 100644 pkgs/servers/xmpp/pyIRCt/default.nix delete mode 100644 pkgs/servers/xmpp/pyMAILt/default.nix diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix deleted file mode 100644 index 65e2b3711fa..00000000000 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/development/python-modules/xmpppy/ssl.patch b/pkgs/development/python-modules/xmpppy/ssl.patch deleted file mode 100644 index 915602dc23e..00000000000 --- a/pkgs/development/python-modules/xmpppy/ssl.patch +++ /dev/null @@ -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 - diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix deleted file mode 100644 index ebb817f1645..00000000000 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ /dev/null @@ -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 < $out/bin/pyMAILt <