From 93a0ec6b594ebcf2ce317fbfdb71efa661b4dd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Mar 2020 10:49:33 +0000
Subject: [PATCH 1/3] home-assistant: fix parse-requirements.py for newer
home-assistant versions
---
pkgs/servers/home-assistant/parse-requirements.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 65c2bcfbfd45..a5c6e9d09614 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -53,7 +53,7 @@ def get_version():
return m.group(1)
-def parse_components(version="master"):
+def parse_components(version: str = "master"):
components = {}
with tempfile.TemporaryDirectory() as tmp:
with urlopen(
@@ -61,14 +61,13 @@ def parse_components(version="master"):
) as response:
tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp)
# Use part of a script from the Home Assistant codebase
- sys.path.append(os.path.join(tmp, f"home-assistant-{version}"))
+ core_path = os.path.join(tmp, f"core-{version}")
+ sys.path.append(core_path)
from script.hassfest.model import Integration
integrations = Integration.load_dir(
pathlib.Path(
- os.path.join(
- tmp, f"home-assistant-{version}", "homeassistant/components"
- )
+ os.path.join(core_path, "homeassistant/components")
)
)
for domain in sorted(integrations):
From 3ed91d2f60b69be7a26be45a3b020ad14493a7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Mar 2020 10:51:33 +0000
Subject: [PATCH 2/3] homeassistant: 0.106.1 -> 0.106.6
---
pkgs/servers/home-assistant/component-packages.nix | 3 ++-
pkgs/servers/home-assistant/default.nix | 4 ++--
pkgs/servers/home-assistant/frontend.nix | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b2bdabc6265..6b18dd30f308 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.106.1";
+ version = "0.106.6";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"acer_projector" = ps: with ps; [ pyserial];
@@ -124,6 +124,7 @@
"configurator" = ps: with ps; [ ];
"conversation" = ps: with ps; [ aiohttp-cors];
"coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet
+ "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus
"counter" = ps: with ps; [ ];
"cover" = ps: with ps; [ ];
"cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 9f7b3fed4a56..2b571fe96bfc 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.106.1";
+ hassVersion = "0.106.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -84,7 +84,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
- sha256 = "0i261hzjfhqnq7j8dwsnj2h2vmr4vnxkvk2ff910am1knzni3a2z";
+ sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb";
};
propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index f297212442c3..1446518fbc5c 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20200220.4";
+ version = "20200220.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0cb8b6xizxz1q5r0qgwsqs53va9bxdqnp4vwf5lh8ppv9zy7hssc";
+ sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1";
};
# no Python tests implemented
From d315674a899d0a7d4cc83773ee2c2f2e182205da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 12 Mar 2020 15:02:47 +0000
Subject: [PATCH 3/3] python3.pkgs.pyicloud: 0.9.2 -> 0.9.4
---
pkgs/development/python-modules/pyicloud/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 1c6fe286db5a..7bc52f74701c 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "pyicloud";
- version = "0.9.2";
+ version = "0.9.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd";
+ sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si";
};
propagatedBuildInputs = [