errbot: 6.1.1 -> 6.1.7

pkgs/applications/networking/errbot/default.nix

@@ -1,75 +1,90 @@
-{ lib, fetchFromGitHub, python, glibcLocales }:
+{ lib
+, ansi
+, buildPythonApplication
+, colorlog
+, daemonize
+, deepmerge
+, dulwich
+, fetchFromGitHub
+, flask
+, glibcLocales
+, hypchat
+, irc
+, jinja2
+, markdown
+, mock
+, pyasn1
+, pyasn1-modules
+, pygments
+, pygments-markdown-lexer
+, pyopenssl
+, pytestCheckHook
+, requests
+, slackclient
+, sleekxmpp
+, telegram
+, webtest
+}:
 
-let
+buildPythonApplication rec {
-  py = python.override {
-    packageOverrides = self: super: {
-      # errbot requires markdown<3, and is not compatible with it either.
-      markdown = super.markdown.overridePythonAttrs (oldAttrs: rec {
-        version = "2.6.11";
-        src = super.fetchPypi {
-          pname = "Markdown";
-          inherit version;
-          sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8";
-        };
-      });
-
-      # errbot requires slackclient 1.x, see https://github.com/errbotio/errbot/pull/1367
-      # latest 1.x release would be 1.3.2, but it requires an older websocket_client than the one in nixpkgs
-      # so let's just vendor the known-working version until they've migrated to 2.x.
-      slackclient = super.slackclient.overridePythonAttrs (oldAttrs: rec {
-        version = "1.2.1";
-        pname = "slackclient";
-        src = fetchFromGitHub {
-          owner  = "slackapi";
-          repo   = "python-slackclient";
-          rev    = version;
-          sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0";
-        };
-
-        propagatedBuildInputs = with self; [ websocket_client requests six ];
-
-        checkInputs = with self; [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ];
-        # test_server.py fails because it needs connection (I think);
-        checkPhase = ''
-          py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py
-        '';
-      });
-    };
-  };
-
-in
-py.pkgs.buildPythonApplication rec {
   pname = "errbot";
-  version = "6.1.1";
+  version = "6.1.7";
 
   src = fetchFromGitHub {
     owner = "errbotio";
     repo = "errbot";
     rev = version;
-    sha256 = "1s4dl1za5imwsv6j3y7m47dy91hmqd5n221kkqm9ni4mpzgpffz0";
+    sha256 = "02h44qd3d91zy657hyqsw3gskgxg31848pw6zpb8dhd1x84z5y77";
   };
 
   LC_ALL = "en_US.utf8";
 
   buildInputs = [ glibcLocales ];
-  propagatedBuildInputs = with py.pkgs; [
+
-    webtest requests jinja2 flask dulwich
+  propagatedBuildInputs = [
-    pyopenssl colorlog markdown ansi pygments
+    ansi
-    daemonize pygments-markdown-lexer telegram irc slackclient
+    colorlog
-    sleekxmpp pyasn1 pyasn1-modules hypchat
+    daemonize
+    deepmerge
+    dulwich
+    flask
+    hypchat
+    irc
+    jinja2
+    markdown
+    pyasn1
+    pyasn1-modules
+    pygments
+    pygments-markdown-lexer
+    pyopenssl
+    requests
+    slackclient
+    sleekxmpp
+    telegram
+    webtest
   ];
 
-  checkInputs = with py.pkgs; [ mock pytest ];
+  checkInputs = [
-  # avoid tests that do network calls
+    mock
-  checkPhase = ''
+    pytestCheckHook
-    pytest tests -k 'not backup and not broken_plugin and not plugin_cycle'
+  ];
-  '';
+
+  # Slack backend test has an import issue
+  pytestFlagsArray = [ "--ignore=tests/backend_tests/slack_test.py" ];
+
+  disabledTests = [
+    "backup"
+    "broken_plugin"
+    "plugin_cycle"
+  ];
+
+  pythonImportsCheck = [ "errbot" ];
 
   meta = with lib; {
     description = "Chatbot designed to be simple to extend with plugins written in Python";
     homepage = "http://errbot.io/";
     maintainers = with maintainers; [ fpletz globin ];
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     # flaky on darwin, "RuntimeError: can't start new thread"
   };

pkgs/top-level/all-packages.nix

@@ -21834,9 +21834,7 @@ in
 
   eq10q = callPackage ../applications/audio/eq10q { };
 
-  errbot = callPackage ../applications/networking/errbot {
+  errbot = python3Packages.callPackage ../applications/networking/errbot { };
-    python = python3;
-  };
 
   espeak-classic = callPackage ../applications/audio/espeak { };