From d6e86c8183ae99e786cd7905099ae5b4e7f00e0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Jan 2022 14:25:36 +0100 Subject: [PATCH 1/4] python3Packages.micloud: 0.4 -> 0.5 --- pkgs/development/python-modules/micloud/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix index 8fdc7910fe83..07db8906c5d3 100644 --- a/pkgs/development/python-modules/micloud/default.nix +++ b/pkgs/development/python-modules/micloud/default.nix @@ -2,23 +2,25 @@ , buildPythonPackage , fetchFromGitHub , click +, pycryptodome , requests , tzlocal }: buildPythonPackage rec { pname = "micloud"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "Squachen"; repo = "micloud"; rev = "v_${version}"; - sha256 = "01z1qfln6f7pnxb4ssmyygyamnfgh36fzgn85s8axdwy8wrch20x"; + sha256 = "sha256-1qtOsEH+G5ASsRyVCa4U0WQ/9kDRn1WpPNkvuvWFovQ="; }; propagatedBuildInputs = [ click + pycryptodome requests tzlocal ]; From 98f919522abb069e756f74bfc4ccde691309b9cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Jan 2022 14:25:57 +0100 Subject: [PATCH 2/4] python3Packages.python-smarttub: 0.0.28 -> 0.0.29 --- pkgs/development/python-modules/python-smarttub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index dc266e0e2075..2fcb578a8e56 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.28"; + version = "0.0.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dAwOi1hhjGhBGKEp5u3qW5WL1GLHBFac0drIc1Zk6ok="; + sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU="; }; propagatedBuildInputs = [ From d0e7ab6fcc49642ceb5be0d36a08e96c73440de1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Jan 2022 14:27:12 +0100 Subject: [PATCH 3/4] home-assistant: 2021.12.7 -> 2021.12.8 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 906c9f7bafbc..4bb791a410fb 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 = "2021.12.7"; + version = "2021.12.8"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2179f958765e..c3175f1ee3e4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -265,7 +265,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.7"; + hassVersion = "2021.12.8"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -282,7 +282,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:0jcnk43wm3xwvsfyvbswq681v2c3xmki1bakn0l12j6paida784y"; + hash = "sha256:HxSEXaqNHh2hSr1fmu3xpC212PXhzvnD4CwR1Ulw9ok="; }; # leave this in, so users don't have to constantly update their downstream patch handling From feb634ba0c13266df9c5ca916dbf2ea39a68387c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Jan 2022 15:08:05 +0100 Subject: [PATCH 4/4] home-assistant: handle disabled components --- pkgs/servers/home-assistant/component-packages.nix | 2 -- pkgs/servers/home-assistant/default.nix | 1 - pkgs/servers/home-assistant/parse-requirements.py | 3 ++- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4bb791a410fb..59939f411fe3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -217,7 +217,6 @@ "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ pysml ]; - "ee_brightbox" = ps: with ps; [ eebrightbox ]; "efergy" = ps: with ps; [ pyefergy ]; "egardia" = ps: with ps; [ pythonegardia ]; "eight_sleep" = ps: with ps; [ pyeight ]; @@ -335,7 +334,6 @@ "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket-client ]; "gpsd" = ps: with ps; [ gps3 ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c3175f1ee3e4..63075eb2df55 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -466,7 +466,6 @@ in with py.pkgs; buildPythonApplication rec { "eafm" "ecobee" "econet" - "ee_brightbox" "efergy" "elgato" "elkm1" diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 2cdc44caaae9..4a2c42ff370c 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -79,7 +79,8 @@ def parse_components(version: str = "master"): ) for domain in sorted(integrations): integration = integrations[domain] - components[domain] = integration.manifest + if not integration.disabled: + components[domain] = integration.manifest return components