From b10d49ee09e486adfd264ba7dfc106fab4f0a53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 22:09:07 +0000 Subject: [PATCH] errbot: use python39 --- .../networking/errbot/default.nix | 32 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index f4a44275b693..d9f02941b43c 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -1,32 +1,12 @@ { 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 +, python39 }: -buildPythonApplication rec { +let + python3 = python39; +in python3.pkgs.buildPythonApplication rec { pname = "errbot"; version = "6.1.7"; @@ -41,7 +21,7 @@ buildPythonApplication rec { buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ ansi colorlog daemonize @@ -64,7 +44,7 @@ buildPythonApplication rec { webtest ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f3eadb8701b..722903738220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26079,7 +26079,7 @@ with pkgs; eq10q = callPackage ../applications/audio/eq10q { }; - errbot = python3Packages.callPackage ../applications/networking/errbot { }; + errbot = callPackage ../applications/networking/errbot { }; espeak-classic = callPackage ../applications/audio/espeak { };