Merge pull request #48545 from mayflower/poezio-bump

Update poezio
This commit is contained in:
Linus Heckemann
2018-10-17 18:10:05 +02:00
committed by GitHub
4 changed files with 55 additions and 65 deletions

View File

@@ -1,12 +0,0 @@
diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py
--- poezio-0.10.orig/plugins/gpg/__init__.py 2016-07-27 19:02:41.000000000 +0200
+++ poezio-0.10/plugins/gpg/__init__.py 2016-11-16 14:17:06.011128631 +0100
@@ -105,7 +105,7 @@
.. _XEP-0027: http://xmpp.org/extensions/xep-0027.html
"""
-from gpg import gnupg
+import slixmpp.thirdparty.gnupg as gnupg
from slixmpp.xmlstream.stanzabase import JID
from xml.etree import cElementTree as ET

View File

@@ -0,0 +1,25 @@
{ lib, buildPythonPackage, pythonOlder, fetchurl, aiodns, pyasn1, pyasn1-modules, gnupg }:
buildPythonPackage rec {
name = "slixmpp-${version}";
version = "1.4.0";
disabled = pythonOlder "3.4";
src = fetchurl {
url = "mirror://pypi/s/slixmpp/${name}.tar.gz";
sha256 = "155qxx4xlkkjb4hphc09nsi2mi4xi3m2akg0z7064kj3nbzkwjn2";
};
patchPhase = ''
substituteInPlace slixmpp/thirdparty/gnupg.py \
--replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'"
'';
propagatedBuildInputs = [ aiodns pyasn1 pyasn1-modules gnupg ];
meta = {
description = "Elegant Python library for XMPP";
license = lib.licenses.mit;
homepage = https://dev.louiz.org/projects/slixmpp;
};
}