From a13528fd73c2ef5facdbabd7033503c8e3360449 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 16:28:45 +0000 Subject: [PATCH 1/3] python312Packages.pytelegrambotapi: 4.16.0 -> 4.17.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 496ebc4e8fa7..43f066a2b6a4 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.16.0"; + version = "4.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-w039aPK+PdOiiOj5ZZAUfyHQ6QDrKySVIijcOw+GIOk="; + hash = "sha256-Asw6wpZs0FgsUYLVQ4u4qQgIFdvShcsN3XvgHn48cbI="; }; nativeBuildInputs = [ From b87dadf0303559d94aa2e64b429577739ae9c589 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 20:05:15 +0200 Subject: [PATCH 2/3] python312Packages.pytelegrambotapi: refactor --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 43f066a2b6a4..b66bcb405fde 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { hash = "sha256-Asw6wpZs0FgsUYLVQ4u4qQgIFdvShcsN3XvgHn48cbI="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; From 919cbfa5dce9fc15d1b125dee2823311a24c60b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 20:05:51 +0200 Subject: [PATCH 3/3] python312Packages.pytelegrambotapi: format with nixfmt --- .../pyTelegramBotAPI/default.nix | 86 +++++++------------ 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index b66bcb405fde..90b623c35ef4 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -1,20 +1,21 @@ -{ lib -, aiohttp -, aioredis -, buildPythonPackage -, coloredlogs -, fastapi -, fetchFromGitHub -, hatchling -, pillow -, psutil -, pytestCheckHook -, pythonOlder -, redis -, requests -, ujson -, uvicorn -, watchdog +{ + lib, + aiohttp, + aioredis, + buildPythonPackage, + coloredlogs, + fastapi, + fetchFromGitHub, + hatchling, + pillow, + psutil, + pytestCheckHook, + pythonOlder, + redis, + requests, + ujson, + uvicorn, + watchdog, }: buildPythonPackage rec { @@ -31,52 +32,27 @@ buildPythonPackage rec { hash = "sha256-Asw6wpZs0FgsUYLVQ4u4qQgIFdvShcsN3XvgHn48cbI="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; passthru.optional-dependencies = { - json = [ - ujson - ]; - PIL = [ - pillow - ]; - redis = [ - redis - ]; - aioredis = [ - aioredis - ]; - aiohttp = [ - aiohttp - ]; - fastapi = [ - fastapi - ]; - uvicorn = [ - uvicorn - ]; - psutil = [ - psutil - ]; - coloredlogs = [ - coloredlogs - ]; - watchdog = [ - watchdog - ]; + json = [ ujson ]; + PIL = [ pillow ]; + redis = [ redis ]; + aioredis = [ aioredis ]; + aiohttp = [ aiohttp ]; + fastapi = [ fastapi ]; + uvicorn = [ uvicorn ]; + psutil = [ psutil ]; + coloredlogs = [ coloredlogs ]; + watchdog = [ watchdog ]; }; checkInputs = [ pytestCheckHook requests - ] ++ passthru.optional-dependencies.watchdog - ++ passthru.optional-dependencies.aiohttp; + ] ++ passthru.optional-dependencies.watchdog ++ passthru.optional-dependencies.aiohttp; - pythonImportsCheck = [ - "telebot" - ]; + pythonImportsCheck = [ "telebot" ]; meta = with lib; { description = "Python implementation for the Telegram Bot API";