From 30436d55b8ec8ae4c93658ad72d5517ace42f692 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 08:12:16 +0200 Subject: [PATCH 1/3] python311Packages.fritzconnection: add optional-dependencies --- .../python-modules/fritzconnection/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 1f359dfdf7c3..fb45e5ad040e 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , requests +, segno }: buildPythonPackage rec { @@ -11,7 +12,7 @@ buildPythonPackage rec { version = "1.12.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kbr"; @@ -24,6 +25,12 @@ buildPythonPackage rec { requests ]; + passthru.optional-dependencies = { + qr = [ + segno + ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; From de90967c94aaa1ac91a85329b55fd12e8819d6d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 08:15:22 +0200 Subject: [PATCH 2/3] python311Packages.fritzconnection: 1.12.2 -> 1.13.1 Changelog: https://fritzconnection.readthedocs.io/en/1.13.1/sources/version_history.html --- .../python-modules/fritzconnection/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index fb45e5ad040e..9fc2beef2c0d 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.12.2"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e+w3ce6KdvbYzH48XPEQTiBgtjbKWNdQj8ie4yw0rzE="; + hash = "sha256-FTg5LHjti6Srmz1LcPU0bepNzn2tpmdSBM3Y2BzZEms="; }; propagatedBuildInputs = [ @@ -43,6 +43,11 @@ buildPythonPackage rec { "fritzconnection" ]; + disabledTestPaths = [ + # Functional tests require network access + "fritzconnection/tests/test_functional.py" + ]; + meta = with lib; { description = "Python module to communicate with the AVM Fritz!Box"; homepage = "https://github.com/kbr/fritzconnection"; From 72a37d934dbe0e5477e6ff0ca54bedb5eb44e367 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 08:16:29 +0200 Subject: [PATCH 3/3] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 13637663d6ce..97a49f22143e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1344,13 +1344,15 @@ psutil-home-assistant sqlalchemy xmltodict - ]; # missing inputs: fritzconnection.optional-dependencies.qr + ] + ++ fritzconnection.optional-dependencies.qr; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection - ]; # missing inputs: fritzconnection.optional-dependencies.qr + ] + ++ fritzconnection.optional-dependencies.qr; "fronius" = ps: with ps; [ pyfronius ]; @@ -5028,7 +5030,9 @@ "freebox" "freedns" "freedompro" + "fritz" "fritzbox" + "fritzbox_callmonitor" "fronius" "frontend" "frontier_silicon"