From 6a749203b00cdd8877db9a2ff66da5b2d56ca6eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Apr 2021 15:20:34 +0200 Subject: [PATCH 1/3] python3Packages.freebox-api: 0.0.9 -> 0.0.10 --- .../python-modules/freebox-api/default.nix | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index 2e5215e2222..54a6ce8662e 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -2,29 +2,47 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, poetry -, pythonOlder +, fetchpatch +, importlib-metadata +, poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "freebox-api"; - version = "0.0.9"; + version = "0.0.10"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "0qn7jqfbp850aqgfsxjfv14myi6idz6sf7024p6wpqpa2xk0vfiq"; + sha256 = "sha256-yUcHdSHSgWxZl0z7Ue0MestvGhiXkDsxArNoDk0ZkR4="; }; - nativeBuildInputs = [ poetry ]; + patches = [ + # Switch to poetry-core, https://github.com/hacf-fr/freebox-api/pull/187 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/hacf-fr/freebox-api/commit/07356ac65483bc24fb1ed32612e77f2c2eed0134.patch"; + sha256 = "1zwricrwsqy01pmhrjy41gh4kxb3gki8z8yxlpywd66y7gid547r"; + }) + ]; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "freebox_api" ]; meta = with lib; { From 208a6213f0b06f1865ac9278740332c97f1dcc0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Apr 2021 08:57:40 +0200 Subject: [PATCH 2/3] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f41c5556d71..622208b5c4c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -277,7 +277,7 @@ "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: freebox-api + "freebox" = ps: with ps; [ aiohttp-cors freebox-api netdisco zeroconf ]; "freedns" = ps: with ps; [ ]; "fritz" = ps: with ps; [ fritzconnection ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; From 7522509a97af2558080694ef84071e50612ceff8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Apr 2021 09:01:29 +0200 Subject: [PATCH 3/3] home-assistant: enable freebox tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e667378af5b..e2474ccb276 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -213,6 +213,7 @@ in with py.pkgs; buildPythonApplication rec { "flux" "folder" "folder_watcher" + "freebox" "fritzbox" "fritzbox_callmonitor" "frontend"