about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/servers/home-assistant/component-packages.nix196
-rw-r--r--pkgs/servers/home-assistant/default.nix76
-rw-r--r--pkgs/servers/home-assistant/frontend.nix4
-rw-r--r--pkgs/servers/home-assistant/tests.nix2
4 files changed, 183 insertions, 95 deletions
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 71a928b9d856a..4137c42e99263 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 = "2022.9.7";
+  version = "2022.10.0";
   components = {
     "abode" = ps: with ps; [
       abodepy
@@ -84,9 +84,6 @@
     "amazon_polly" = ps: with ps; [
       boto3
     ];
-    "ambee" = ps: with ps; [
-      ambee
-    ];
     "amberelectric" = ps: with ps; [
       amberelectric
     ];
@@ -197,8 +194,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       yalexs-ble
       yalexs
     ];
@@ -292,8 +293,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "blueprint" = ps: with ps; [
     ];
@@ -307,8 +312,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "bluetooth_le_tracker" = ps: with ps; [
       aiohttp-cors
@@ -317,8 +326,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "bluetooth_tracker" = ps: with ps; [
       bt-proximity
@@ -368,8 +381,12 @@
       bluetooth-auto-recovery
       bthome-ble
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "buienradar" = ps: with ps; [
       buienradar
@@ -429,10 +446,6 @@
     ];
     "clicksend_tts" = ps: with ps; [
     ];
-    "climacell" = ps: with ps; [
-      pyclimacell
-      pytomorrowio
-    ];
     "climate" = ps: with ps; [
     ];
     "cloud" = ps: with ps; [
@@ -801,8 +814,12 @@
       bluetooth-auto-recovery
       construct
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ]; # missing inputs: python-eq3bt
     "escea" = ps: with ps; [
       pescea
@@ -815,9 +832,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
       ifaddr
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       zeroconf
     ];
     "etherscan" = ps: with ps; [
@@ -910,8 +931,12 @@
       bluetooth-auto-recovery
       dbus-fast
       fjaraskupan
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "fleetgo" = ps: with ps; [
       ritassist
@@ -936,9 +961,6 @@
     "flume" = ps: with ps; [
       pyflume
     ];
-    "flunearyou" = ps: with ps; [
-      pyflunearyou
-    ];
     "flux" = ps: with ps; [
     ];
     "flux_led" = ps: with ps; [
@@ -958,6 +980,8 @@
       forecast-solar
     ];
     "forked_daapd" = ps: with ps; [
+      aiohttp-cors
+      spotipy
     ]; # missing inputs: pyforked-daapd pylibrespot-java
     "fortios" = ps: with ps; [
       fortiosapi
@@ -1097,6 +1121,10 @@
     "google_pubsub" = ps: with ps; [
       google-cloud-pubsub
     ];
+    "google_sheets" = ps: with ps; [
+      aiohttp-cors
+      gspread
+    ];
     "google_translate" = ps: with ps; [
       gtts
     ];
@@ -1112,9 +1140,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
       govee-ble
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "gpsd" = ps: with ps; [
       gps3
@@ -1262,9 +1294,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
       ifaddr
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       zeroconf
     ];
     "homematic" = ps: with ps; [
@@ -1303,8 +1339,7 @@
       aiohue
     ];
     "huisbaasje" = ps: with ps; [
-      huisbaasje-client
-    ];
+    ]; # missing inputs: energyflip-client
     "humidifier" = ps: with ps; [
     ];
     "hunterdouglas_powerview" = ps: with ps; [
@@ -1327,6 +1362,21 @@
     "iaqualink" = ps: with ps; [
       iaqualink
     ];
+    "ibeacon" = ps: with ps; [
+      aiohttp-cors
+      bleak-retry-connector
+      bleak
+      bluetooth-adapters
+      bluetooth-auto-recovery
+      dbus-fast
+      fnvhash
+      home-assistant-frontend
+      ibeacon-ble
+      pillow
+      pyserial
+      pyudev
+      sqlalchemy
+    ];
     "icloud" = ps: with ps; [
       pyicloud
     ];
@@ -1371,9 +1421,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
       inkbird-ble
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "input_boolean" = ps: with ps; [
     ];
@@ -1477,12 +1531,42 @@
       aiokef
       getmac
     ];
+    "kegtron" = ps: with ps; [
+      aiohttp-cors
+      bleak-retry-connector
+      bleak
+      bluetooth-adapters
+      bluetooth-auto-recovery
+      dbus-fast
+      fnvhash
+      home-assistant-frontend
+      kegtron-ble
+      pillow
+      pyserial
+      pyudev
+      sqlalchemy
+    ];
     "keyboard" = ps: with ps; [
     ]; # missing inputs: pyuserinput
     "keyboard_remote" = ps: with ps; [
       aionotify
       evdev
     ];
+    "keymitt_ble" = ps: with ps; [
+      pymicrobot
+      aiohttp-cors
+      bleak-retry-connector
+      bleak
+      bluetooth-adapters
+      bluetooth-auto-recovery
+      dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
+      pyserial
+      pyudev
+      sqlalchemy
+    ];
     "kira" = ps: with ps; [
       pykira
     ];
@@ -1546,9 +1630,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
       led-ble
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "lg_netcast" = ps: with ps; [
       pylgnetcast
@@ -1556,6 +1644,9 @@
     "lg_soundbar" = ps: with ps; [
       temescal
     ];
+    "lidarr" = ps: with ps; [
+      aiopyarr
+    ];
     "life360" = ps: with ps; [
       life360
     ];
@@ -1713,8 +1804,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ]; # missing inputs: melnor-bluetooth
     "meraki" = ps: with ps; [
       aiohttp-cors
@@ -1786,9 +1881,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
       moat-ble
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "mobile_app" = ps: with ps; [
       pynacl
@@ -1953,6 +2052,9 @@
     ];
     "nfandroidtv" = ps: with ps; [
     ]; # missing inputs: notifications-android-tv
+    "nibe_heatpump" = ps: with ps; [
+      tenacity
+    ]; # missing inputs: nibe
     "nightscout" = ps: with ps; [
       py-nightscout
     ];
@@ -1980,6 +2082,9 @@
     ];
     "noaa_tides" = ps: with ps; [
     ]; # missing inputs: noaa-coops
+    "nobo_hub" = ps: with ps; [
+      pynobo
+    ];
     "norway_air" = ps: with ps; [
       pymetno
     ];
@@ -2291,9 +2396,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
       qingping-ble
+      sqlalchemy
     ];
     "qld_bushfire" = ps: with ps; [
       georss-qld-bushfire-alert-client
@@ -2323,6 +2432,7 @@
       rachiopy
     ];
     "radarr" = ps: with ps; [
+      aiopyarr
     ];
     "radio_browser" = ps: with ps; [
       radios
@@ -2541,9 +2651,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
       sensorpro-ble
+      sqlalchemy
     ];
     "sensorpush" = ps: with ps; [
       aiohttp-cors
@@ -2552,9 +2666,13 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
       sensorpush-ble
+      sqlalchemy
     ];
     "sentry" = ps: with ps; [
       sentry-sdk
@@ -2823,6 +2941,8 @@
     ];
     "switch_as_x" = ps: with ps; [
     ];
+    "switchbee" = ps: with ps; [
+    ]; # missing inputs: pyswitchbee
     "switchbot" = ps: with ps; [
       pyswitchbot
       aiohttp-cors
@@ -2831,8 +2951,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
     ];
     "switcher_kis" = ps: with ps; [
       aioswitcher
@@ -2937,8 +3061,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       thermobeacon-ble
     ];
     "thermopro" = ps: with ps; [
@@ -2948,8 +3076,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       thermopro-ble
     ];
     "thermoworks_smoke" = ps: with ps; [
@@ -2975,6 +3107,21 @@
     "tile" = ps: with ps; [
       pytile
     ];
+    "tilt_ble" = ps: with ps; [
+      aiohttp-cors
+      bleak-retry-connector
+      bleak
+      bluetooth-adapters
+      bluetooth-auto-recovery
+      dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
+      pyserial
+      pyudev
+      sqlalchemy
+      tilt-ble
+    ];
     "time_date" = ps: with ps; [
     ];
     "timer" = ps: with ps; [
@@ -3136,8 +3283,6 @@
       pyserial
       pyudev
     ];
-    "uscis" = ps: with ps; [
-    ]; # missing inputs: uscisstatus
     "usgs_earthquakes_feed" = ps: with ps; [
       aio-geojson-usgs-earthquakes
     ];
@@ -3329,8 +3474,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       xiaomi-ble
     ];
     "xiaomi_miio" = ps: with ps; [
@@ -3356,8 +3505,12 @@
       bluetooth-adapters
       bluetooth-auto-recovery
       dbus-fast
+      fnvhash
+      home-assistant-frontend
+      pillow
       pyserial
       pyudev
+      sqlalchemy
       yalexs-ble
     ];
     "yamaha" = ps: with ps; [
@@ -3481,7 +3634,6 @@
     "alert"
     "alexa"
     "almond"
-    "ambee"
     "amberelectric"
     "ambiclimate"
     "ambient_station"
@@ -3489,6 +3641,7 @@
     "android_ip_webcam"
     "androidtv"
     "apache_kafka"
+    "apcupsd"
     "api"
     "apple_tv"
     "application_credentials"
@@ -3537,7 +3690,6 @@
     "canary"
     "cast"
     "cert_expiry"
-    "climacell"
     "climate"
     "cloud"
     "cloudflare"
@@ -3583,6 +3735,7 @@
     "dnsip"
     "doorbird"
     "dsmr"
+    "dsmr_reader"
     "dte_energy_bridge"
     "duckdns"
     "dunehd"
@@ -3632,7 +3785,6 @@
     "flipr"
     "flo"
     "flume"
-    "flunearyou"
     "flux"
     "flux_led"
     "folder"
@@ -3670,6 +3822,7 @@
     "google_assistant"
     "google_domains"
     "google_pubsub"
+    "google_sheets"
     "google_translate"
     "google_travel_time"
     "google_wifi"
@@ -3712,13 +3865,13 @@
     "http"
     "huawei_lte"
     "hue"
-    "huisbaasje"
     "humidifier"
     "hunterdouglas_powerview"
     "hvv_departures"
     "hyperion"
     "ialarm"
     "iaqualink"
+    "ibeacon"
     "icloud"
     "ifttt"
     "ign_sismologia"
@@ -3751,6 +3904,8 @@
     "juicenet"
     "justnimbus"
     "keenetic_ndms2"
+    "kegtron"
+    "keymitt_ble"
     "kira"
     "kmtronic"
     "knx"
@@ -3765,6 +3920,7 @@
     "lcn"
     "led_ble"
     "lg_soundbar"
+    "lidarr"
     "life360"
     "lifx"
     "light"
@@ -3843,6 +3999,7 @@
     "nightscout"
     "nina"
     "no_ip"
+    "nobo_hub"
     "notify"
     "notify_events"
     "notion"
@@ -4036,6 +4193,7 @@
     "threshold"
     "tibber"
     "tile"
+    "tilt_ble"
     "time_date"
     "timer"
     "tod"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 357e381ac7417..58a03f3da7f4b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -57,28 +57,6 @@ let
     })
 
     (self: super: {
-      bleak = super.bleak.overridePythonAttrs (oldAttrs: rec {
-        version = "0.17.0";
-        src = fetchFromGitHub {
-          owner = "hbldh";
-          repo = "bleak";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-AnH23AWrLw2jq6gSbx9VoGD8QXeCH5dN7FSVVdj4b3w=";
-        };
-      });
-
-      bleak-retry-connector = super.bleak-retry-connector.overridePythonAttrs (oldAttrs: rec {
-        version = "1.17.1";
-        src = fetchFromGitHub {
-          owner = "Bluetooth-Devices";
-          repo = "bleak-retry-connector";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-FoQ1cDORQaJcr6y9JaO4MigqV6jiBbwKNIIdYDgFNxQ=";
-        };
-      });
-    })
-
-    (self: super: {
       blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec {
         version = "2.0.2";
         src = fetchFromGitHub {
@@ -91,19 +69,6 @@ let
     })
 
     (self: super: {
-      bluetooth-adapters = super.bluetooth-adapters.overridePythonAttrs (oldAttrs: rec {
-        version = "0.4.1";
-        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.dbus-fast ];
-        src = fetchFromGitHub {
-          owner = "Bluetooth-Devices";
-          repo = "bluetooth-adapters";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-LAT4r6RHJWTkrZvuL1aSQDiztvXiOJwGmNQKGFnvFB8=";
-        };
-      });
-    })
-
-    (self: super: {
       gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
         version = "4.0.0";
         src = fetchFromGitHub {
@@ -163,18 +128,6 @@ let
       });
     })
 
-    (self: super: {
-      plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec {
-        version = "0.20.1";
-        src = fetchFromGitHub {
-          owner = "plugwise";
-          repo = "python-plugwise";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng=";
-        };
-      });
-    })
-
     # Pinned due to API changes in 0.1.0
     (self: super: {
       poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec {
@@ -201,25 +154,11 @@ let
     })
 
     (self: super: {
-      pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec {
-        version = "6.2.4";
-        src = fetchFromGitHub {
-          owner = "jabesq";
-          repo = "pyatmo";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-VXkQByaNA02fwBO2yuf7w1ZF/oJwd/h21de1EQlCu2U=";
-        };
-        checkInputs = [ super.freezegun ];
-      });
-    })
-
-    (self: super: {
       pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
         doCheck = false; # requires pytest-aiohttp>=1.0.0
       });
     })
 
-
     (self: super: {
       python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
         pname = "python-slugify";
@@ -244,17 +183,6 @@ let
     })
 
     (self: super: {
-      solax = super.solax.overridePythonAttrs (oldAttrs: rec {
-        version = "0.2.9";
-        src = super.fetchPypi {
-          pname = "solax";
-          inherit version;
-          hash = "sha256-5m2wxdTshAsEfldPAyXqAYYtH1VjqERRBUGzX6pV85I=";
-        };
-      });
-    })
-
-    (self: super: {
       pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec {
         version = "0.0.10";
         src = super.fetchPypi {
@@ -333,7 +261,7 @@ let
   extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2022.9.7";
+  hassVersion = "2022.10.0";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -351,7 +279,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    hash = "sha256-V6/y5HnJh8AVwkSg3uanYQRNvDcD1P0L+wBu98NpDek=";
+    hash = "sha256-BTUuQ4qAP/O53P289ldYlMsLlaNek/FOeDYHwnjCwvE=";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 0807320ff1a62..87e49146ac077 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ 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 = "20220907.2";
+  version = "20221005.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    sha256 = "sha256-ykId53EMPRXmMmoS55ZtjF6UR/JVPtBXFqjwuK2E2F4=";
+    sha256 = "sha256-Tc6MxUPEdL7jOyUwGm1H0c3w7HC15NZ1FGyp681GRYw=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index feb7331f05de1..c40d9e71989c3 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -13,12 +13,14 @@ let
     config = [ pydispatcher ];
     generic = [ av ];
     google_translate = [ mutagen ];
+    google_sheets = [ oauth2client ];
     homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
     homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
     lovelace = [ PyChromecast ];
     nest = [ av ];
     onboarding = [ pymetno radios rpi-bad-power ];
     raspberry_pi = [ rpi-bad-power ];
+    tilt_ble = [ govee-ble ibeacon-ble ];
     tomorrowio = [ pyclimacell ];
     version = [ aioaseko ];
     xiaomi_miio = [ arrow ];