From 7e2c738a2ea9b8f573fc79a96e42a6112eaf2b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 14 Jul 2023 18:42:34 -0700
Subject: [PATCH] errbot: 6.1.7 -> 6.1.9

Diff: https://github.com/errbotio/errbot/compare/6.1.7...6.1.9

Changelog: https://github.com/errbotio/errbot/blob/6.1.9/CHANGES.rst
---
 .../networking/errbot/default.nix             | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 54d0b862b891..7085ac5f38ba 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,25 +1,26 @@
 { lib
 , fetchFromGitHub
-, glibcLocales
-, python39
+, python3
 }:
 
-let
-  python3 = python39;
-in python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "errbot";
-  version = "6.1.7";
+  version = "6.1.9";
+
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "errbotio";
     repo = "errbot";
     rev = version;
-    sha256 = "02h44qd3d91zy657hyqsw3gskgxg31848pw6zpb8dhd1x84z5y77";
+    hash = "sha256-BmHChLWWnrtg0p4WH8bANwpo+p4RTwjYbXfyPnz6mp8=";
   };
 
-  LC_ALL = "en_US.utf8";
+  nativeBuildInputs = with python3.pkgs; [
+    pythonRelaxDepsHook
+  ];
 
-  buildInputs = [ glibcLocales ];
+  pythonRelaxDeps = true;
 
   propagatedBuildInputs = with python3.pkgs; [
     ansi
@@ -28,7 +29,6 @@ in python3.pkgs.buildPythonApplication rec {
     deepmerge
     dulwich
     flask
-    hypchat
     irc
     jinja2
     markdown
@@ -38,9 +38,8 @@ in python3.pkgs.buildPythonApplication rec {
     pygments-markdown-lexer
     pyopenssl
     requests
-    slackclient
-    sleekxmpp
-    telegram
+    slixmpp
+    python-telegram-bot
     webtest
   ];
 
@@ -49,18 +48,20 @@ in python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  # Slack backend test has an import issue
+  # errbot-backend-slackv3 has not been packaged
   pytestFlagsArray = [ "--ignore=tests/backend_tests/slack_test.py" ];
 
   disabledTests = [
-    "backup"
-    "broken_plugin"
-    "plugin_cycle"
+    # require networking
+    "test_backup"
+    "test_broken_plugin"
+    "test_plugin_cycle"
   ];
 
   pythonImportsCheck = [ "errbot" ];
 
   meta = with lib; {
+    changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst";
     description = "Chatbot designed to be simple to extend with plugins written in Python";
     homepage = "http://errbot.io/";
     maintainers = with maintainers; [ globin ];