From 9b5fafa4d3fc001b4e80524ee4890f8a9bf9b2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Nov 2022 03:31:17 +0100 Subject: [PATCH 1/2] python310Packages.apprise: 1.1.0 -> 1.2.0 --- .../development/python-modules/apprise/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 864dd570209e..0eca7e2e977f 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -7,30 +7,29 @@ , gntp , installShellFiles , markdown -, mock , paho-mqtt +, pytest-mock +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml , requests , requests-oauthlib -, slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A="; + hash = "sha256-bjGvoY9HRS6szVb7fug9kkUsU00V85JAftGg48RlJEs="; }; nativeBuildInputs = [ - babel installShellFiles ]; @@ -44,11 +43,12 @@ buildPythonPackage rec { ]; checkInputs = [ + babel gntp - mock paho-mqtt + pytest-mock + pytest-xdist pytestCheckHook - slixmpp ]; disabledTests = [ From 029bc7714a589476a4f2eae6e27d39b9638331ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Nov 2022 03:31:03 +0100 Subject: [PATCH 2/2] changedetection-io: 0.39.21.1 -> 0.39.22.1 --- .../web-apps/changedetection-io/default.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 888ccf675e96..ac09e5325889 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -31,14 +31,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.39.21.1"; + version = "0.39.22.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - sha256 = "sha256-cX2HwlsWOJ34msEnPP38jq+kzSxOM/spe0Ja2lZ/Q7w="; + sha256 = "sha256-qK44m64/skmeoBgHToTyOpeWUF2kgks10OHoAoLim+k="; }; postPatch = '' @@ -49,33 +49,35 @@ py.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with py.pkgs; [ - flask - flask-wtf + apprise + beautifulsoup4 + brotli + chardet + cryptography eventlet - validators - timeago - inscriptis feedgen + flask flask-login flask-restful + flask-wtf + inscriptis jinja2 jinja2-time - pytz - brotli - requests - urllib3 - chardet - wtforms jsonpath-ng jq - apprise - paho-mqtt - cryptography - beautifulsoup4 lxml - selenium - werkzeug + paho-mqtt + pillow playwright + pytz + requests + selenium + setuptools + timeago + urllib3 + validators + werkzeug + wtforms ] ++ requests.optional-dependencies.socks; # tests can currently not be run in one pytest invocation and without docker