From 61f383851e9193186d5ecc08d41d5a3aef04ddc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Jan 2021 18:51:58 +0100 Subject: [PATCH 1/3] home-assistant: fix typo in parse-requirements.py --- pkgs/servers/home-assistant/parse-requirements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 4fa4b8a48ee..5bcab0a0d5b 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -30,7 +30,7 @@ from urllib.request import urlopen COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "python3Packages" -# If some requirements are matched by multiple python packages, +# If some requirements are matched by multiple Python packages, # the following can be used to choose one of them PKG_PREFERENCES = { # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl From a068a3b47c8690c1bf8bccd3c9a0fc991da40030 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Jan 2021 18:54:05 +0100 Subject: [PATCH 2/3] home-assistant: set preference for whois module in parse-requirements.py --- pkgs/servers/home-assistant/parse-requirements.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 5bcab0a0d5b..fc0e790bd6f 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -39,6 +39,7 @@ PKG_PREFERENCES = { "tensorflow-bin_2": "tensorflow", "tensorflowWithoutCuda": "tensorflow", "tensorflow-build_2": "tensorflow", + "whois": "python-whois", } From e128ef4c4c0dadb67d41e955fa22d46968fb512c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Jan 2021 18:56:16 +0100 Subject: [PATCH 3/3] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0fd33b5c31a..ca600591015 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -64,7 +64,7 @@ "avion" = ps: with ps; [ ]; # missing inputs: avion "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair - "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore + "aws" = ps: with ps; [ aiobotocore ]; "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub @@ -243,7 +243,7 @@ "familyhub" = ps: with ps; [ ]; # missing inputs: python-family-hub-local "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom - "feedreader" = ps: with ps; [ feedparser ]; + "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];