diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/sleekxmpp')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix | 24 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch | 55 |
2 files changed, 79 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix new file mode 100644 index 000000000000..426019fc8a97 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sleekxmpp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, dns, pyasn1 }: + +buildPythonPackage rec { + pname = "sleekxmpp"; + version = "1.3.3"; + + propagatedBuildInputs = [ dns pyasn1 ]; + + patches = [ + ./dnspython-ip6.patch + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569"; + }; + + meta = with stdenv.lib; { + description = "XMPP library for Python"; + license = licenses.mit; + homepage = "http://sleekxmpp.com/"; + }; + +} diff --git a/nixpkgs/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch b/nixpkgs/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch new file mode 100644 index 000000000000..d8d6eb106838 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch @@ -0,0 +1,55 @@ +--- a/sleekxmpp/xmlstream/resolver.py ++++ b/sleekxmpp/xmlstream/resolver.py +@@ -175,6 +175,9 @@ def get_A(host, resolver=None, use_dnspy + """ + log.debug("DNS: Querying %s for A records." % host) + ++ if isinstance(host, bytes): ++ host = host.decode("utf-8") ++ + # If not using dnspython, attempt lookup using the OS level + # getaddrinfo() method. + if resolver is None or not use_dnspython: +@@ -189,7 +192,10 @@ def get_A(host, resolver=None, use_dnspy + # Using dnspython: + try: + recs = resolver.query(host, dns.rdatatype.A) +- return [rec.to_text() for rec in recs] ++ if isinstance(recs[0].to_text(), bytes): ++ return [rec.to_text().decode("utf-8") for rec in recs] ++ else: ++ return [rec.to_text() for rec in recs] + except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): + log.debug("DNS: No A records for %s" % host) + return [] +@@ -222,6 +228,9 @@ def get_AAAA(host, resolver=None, use_dn + """ + log.debug("DNS: Querying %s for AAAA records." % host) + ++ if isinstance(host, bytes): ++ host = host.decode("utf-8") ++ + # If not using dnspython, attempt lookup using the OS level + # getaddrinfo() method. + if resolver is None or not use_dnspython: +@@ -240,7 +249,10 @@ def get_AAAA(host, resolver=None, use_dn + # Using dnspython: + try: + recs = resolver.query(host, dns.rdatatype.AAAA) +- return [rec.to_text() for rec in recs] ++ if isinstance(recs[0].to_text(), bytes): ++ return [rec.to_text().decode("utf-8") for rec in recs] ++ else: ++ return [rec.to_text() for rec in recs] + except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): + log.debug("DNS: No AAAA records for %s" % host) + return [] +@@ -324,6 +336,8 @@ def get_SRV(host, port, service, proto=' + if running_sum >= selected: + rec = sums[running_sum] + host = rec.target.to_text() ++ if isinstance(host, bytes): ++ host = host.decode("utf-8") + if host.endswith('.'): + host = host[:-1] + sorted_recs.append((host, rec.port)) |