diff options
| author | Robin Gloster <mail@glob.in> | 2016-09-28 19:26:47 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-30 21:25:56 +0200 |
| commit | c9990947150fa9f7a1bd1809192bb27e5666202c (patch) | |
| tree | c560610a937f2cdebb3ede41b853f0109d560011 /pkgs/applications/networking/errbot | |
| parent | c2dc21ea85033f9d757ab61a7303ebb4e64857d4 (diff) | |
| download | nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.tar nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.tar.gz nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.tar.bz2 nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.tar.lz nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.tar.xz nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.tar.zst nixpkgs-c9990947150fa9f7a1bd1809192bb27e5666202c.zip | |
errbot: 4.2.2 -> 4.3.3
Diffstat (limited to 'pkgs/applications/networking/errbot')
| -rw-r--r-- | pkgs/applications/networking/errbot/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/applications/networking/errbot/fix-dnspython.patch | 13 |
2 files changed, 9 insertions, 22 deletions
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index e2b5844429f..8af502660ee 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -2,22 +2,22 @@ pythonPackages.buildPythonApplication rec { name = "errbot-${version}"; - version = "4.2.2"; + version = "4.3.3"; src = fetchurl { url = "mirror://pypi/e/errbot/${name}.tar.gz"; - sha256 = "1f1nw4m58dvmw0a37gbnihgdxxr3sz0l39653jigq9ysh3nznifv"; + sha256 = "1z6xcm8jx22i56gpcrjym85a82swvaxh09zkryd5pdksi6k41rb4"; }; disabled = !pythonPackages.isPy3k; - patches = [ - ./fix-dnspython.patch - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace dnspython3 dnspython + ''; - buildInputs = with pythonPackages; [ - pep8 mock pytest pytest_xdist - ]; + # tests folder is not included in release + doCheck = false; propagatedBuildInputs = with pythonPackages; [ webtest bottle threadpool rocket-errbot requests jinja2 @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = http://errbot.io/; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/errbot/fix-dnspython.patch b/pkgs/applications/networking/errbot/fix-dnspython.patch deleted file mode 100644 index 7e2b037d78d..00000000000 --- a/pkgs/applications/networking/errbot/fix-dnspython.patch +++ /dev/null @@ -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 |