errbot: 4.2.2 -> 4.3.3

This commit is contained in:
Robin Gloster 2016-09-28 19:26:47 +02:00
parent c2dc21ea85
commit c999094715
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
2 changed files with 9 additions and 22 deletions

View File

@ -2,22 +2,22 @@
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "errbot-${version}"; name = "errbot-${version}";
version = "4.2.2"; version = "4.3.3";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/e/errbot/${name}.tar.gz"; url = "mirror://pypi/e/errbot/${name}.tar.gz";
sha256 = "1f1nw4m58dvmw0a37gbnihgdxxr3sz0l39653jigq9ysh3nznifv"; sha256 = "1z6xcm8jx22i56gpcrjym85a82swvaxh09zkryd5pdksi6k41rb4";
}; };
disabled = !pythonPackages.isPy3k; disabled = !pythonPackages.isPy3k;
patches = [ postPatch = ''
./fix-dnspython.patch substituteInPlace setup.py \
]; --replace dnspython3 dnspython
'';
buildInputs = with pythonPackages; [ # tests folder is not included in release
pep8 mock pytest pytest_xdist doCheck = false;
];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
webtest bottle threadpool rocket-errbot requests jinja2 webtest bottle threadpool rocket-errbot requests jinja2
@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Chatbot designed to be simple to extend with plugins written in Python"; description = "Chatbot designed to be simple to extend with plugins written in Python";
homepage = http://errbot.io/; homepage = http://errbot.io/;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz globin ];
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
}; };

View File

@ -1,13 +0,0 @@
diff --git a/setup.py b/setup.py
index d57d4e8..9d036fc 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ if PY2:
'backports.functools_lru_cache',
'configparser>=3.5.0b2'] # This is a backport from Python 3
else:
- deps += ['dnspython3', ] # dnspython3 for SRV records
+ deps += ['dnspython', ] # dnspython for SRV records
if not PY35_OR_GREATER:
deps += ['typing', ] # backward compatibility for 3.3 and 3.4