summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-09-07 13:36:32 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-09-08 10:58:03 +0200
commitb24287dde88c21108880d08bdd5dbc03240bd900 (patch)
tree03c8c37a15a9c31e264e35915b5ad66d654d7819
parentc5c4ba3280302d83f62efd8da21f9065d4396be6 (diff)
downloadnixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.tar
nixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.tar.gz
nixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.tar.bz2
nixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.tar.lz
nixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.tar.xz
nixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.tar.zst
nixpkgs-b24287dde88c21108880d08bdd5dbc03240bd900.zip
home-assistant: 2023.8.4 -> 2023.9.0
https://github.com/home-assistant/core/releases/tag/2023.9.0
-rw-r--r--pkgs/servers/home-assistant/component-packages.nix64
-rw-r--r--pkgs/servers/home-assistant/default.nix6
-rw-r--r--pkgs/servers/home-assistant/frontend.nix4
-rw-r--r--pkgs/servers/home-assistant/patches/ffmpeg-path.patch120
-rw-r--r--pkgs/servers/home-assistant/tests.nix8
5 files changed, 132 insertions, 70 deletions
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index eec01449137..78829b1b001 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 = "2023.8.4";
+  version = "2023.9.0";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -638,6 +638,9 @@
     ];
     "comed_hourly_pricing" = ps: with ps; [
     ];
+    "comelit" = ps: with ps; [
+      aiocomelit
+    ];
     "comfoconnect" = ps: with ps; [
       pycomfoconnect
     ];
@@ -648,6 +651,8 @@
     ];
     "concord232" = ps: with ps; [
     ]; # missing inputs: concord232
+    "coned" = ps: with ps; [
+    ];
     "config" = ps: with ps; [
       aiohttp-cors
     ];
@@ -1049,7 +1054,7 @@
       enocean
     ];
     "enphase_envoy" = ps: with ps; [
-      envoy-reader
+      pyenphase
     ];
     "entur_public_transport" = ps: with ps; [
       enturclient
@@ -1678,6 +1683,25 @@
     ];
     "homeassistant_alerts" = ps: with ps; [
     ];
+    "homeassistant_green" = ps: with ps; [
+      aiohttp-cors
+      bellows
+      fnv-hash-fast
+      janus
+      pillow
+      psutil-home-assistant
+      pyserial
+      pyserial-asyncio
+      pyudev
+      sqlalchemy
+      universal-silabs-flasher
+      zha-quirks
+      zigpy
+      zigpy-deconz
+      zigpy-xbee
+      zigpy-zigate
+      zigpy-znp
+    ];
     "homeassistant_hardware" = ps: with ps; [
       aiohttp-cors
       bellows
@@ -1689,6 +1713,7 @@
       pyserial-asyncio
       pyudev
       sqlalchemy
+      universal-silabs-flasher
       zha-quirks
       zigpy
       zigpy-deconz
@@ -1707,6 +1732,7 @@
       pyserial-asyncio
       pyudev
       sqlalchemy
+      universal-silabs-flasher
       zha-quirks
       zigpy
       zigpy-deconz
@@ -1725,6 +1751,7 @@
       pyserial-asyncio
       pyudev
       sqlalchemy
+      universal-silabs-flasher
       zha-quirks
       zigpy
       zigpy-deconz
@@ -2183,6 +2210,8 @@
     "laundrify" = ps: with ps; [
       laundrify-aio
     ];
+    "lawn_mower" = ps: with ps; [
+    ];
     "lcn" = ps: with ps; [
       pypck
     ];
@@ -2988,6 +3017,8 @@
     ];
     "oru" = ps: with ps; [
     ]; # missing inputs: oru
+    "oru_opower" = ps: with ps; [
+    ];
     "orvibo" = ps: with ps; [
       orvibo
     ];
@@ -3007,6 +3038,7 @@
       python-otbr-api
       pyudev
       sqlalchemy
+      universal-silabs-flasher
       zeroconf
       zha-quirks
       zigpy
@@ -3445,7 +3477,8 @@
       rtsp-to-webrtc
     ];
     "ruckus_unleashed" = ps: with ps; [
-      pyruckus
+      aioruckus
+      xmltodict
     ];
     "russound_rio" = ps: with ps; [
     ]; # missing inputs: russound-rio
@@ -3537,6 +3570,9 @@
     ];
     "schedule" = ps: with ps; [
     ];
+    "schlage" = ps: with ps; [
+      pyschlage
+    ];
     "schluter" = ps: with ps; [
     ]; # missing inputs: py-schluter
     "scrape" = ps: with ps; [
@@ -4321,6 +4357,9 @@
       pytradfri
     ]
     ++ pytradfri.optional-dependencies.async;
+    "trafikverket_camera" = ps: with ps; [
+      pytrafikverket
+    ];
     "trafikverket_ferry" = ps: with ps; [
       pytrafikverket
     ];
@@ -4505,6 +4544,9 @@
     "vlc_telnet" = ps: with ps; [
       aiovlc
     ];
+    "vodafone_station" = ps: with ps; [
+      aiovodafone
+    ];
     "voicerss" = ps: with ps; [
     ];
     "voip" = ps: with ps; [
@@ -4534,11 +4576,13 @@
     "wake_on_lan" = ps: with ps; [
       wakeonlan
     ];
+    "wake_word" = ps: with ps; [
+    ];
     "wallbox" = ps: with ps; [
       wallbox
     ];
     "waqi" = ps: with ps; [
-      waqiasync
+      aiowaqi
     ];
     "water_heater" = ps: with ps; [
     ];
@@ -4551,7 +4595,7 @@
       aiowatttime
     ];
     "waze_travel_time" = ps: with ps; [
-      wazeroutecalculator
+      pywaze
     ];
     "weather" = ps: with ps; [
     ];
@@ -4729,6 +4773,8 @@
     ];
     "yandextts" = ps: with ps; [
     ];
+    "yardian" = ps: with ps; [
+    ]; # missing inputs: pyyardian
     "yeelight" = ps: with ps; [
       aiohttp-cors
       async-upnp-client
@@ -4797,6 +4843,7 @@
       pyserial-asyncio
       pyudev
       sqlalchemy
+      universal-silabs-flasher
       zha-quirks
       zigpy
       zigpy-deconz
@@ -4929,6 +4976,7 @@
     "cloudflare"
     "co2signal"
     "color_extractor"
+    "comelit"
     "comfoconnect"
     "command_line"
     "compensation"
@@ -5098,6 +5146,7 @@
     "home_plus_control"
     "homeassistant"
     "homeassistant_alerts"
+    "homeassistant_green"
     "homeassistant_hardware"
     "homeassistant_sky_connect"
     "homeassistant_yellow"
@@ -5169,6 +5218,7 @@
     "lastfm"
     "launch_library"
     "laundrify"
+    "lawn_mower"
     "lcn"
     "ld2410_ble"
     "led_ble"
@@ -5378,6 +5428,7 @@
     "samsungtv"
     "scene"
     "schedule"
+    "schlage"
     "scrape"
     "screenlogic"
     "script"
@@ -5497,6 +5548,7 @@
     "trace"
     "tractive"
     "tradfri"
+    "trafikverket_camera"
     "trafikverket_ferry"
     "trafikverket_train"
     "trafikverket_weatherstation"
@@ -5537,12 +5589,14 @@
     "vilfo"
     "vizio"
     "vlc_telnet"
+    "vodafone_station"
     "voicerss"
     "volumio"
     "volvooncall"
     "vulcan"
     "vultr"
     "wake_on_lan"
+    "wake_word"
     "wallbox"
     "water_heater"
     "watttime"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c6f7703718e..76450b9d4ed 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -296,7 +296,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2023.8.4";
+  hassVersion = "2023.9.0";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec {
   # Primary source is the pypi sdist, because it contains translations
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Mu3DyCtF/bTrTvRKPLVEGSZfWZrF7QQy/ZvBi5IIH3s=";
+    hash = "sha256-XdZYVv60ZCkK0fKmt2kmThRxhv+hfJMtHwgBu3iaW9w=";
   };
 
   # Secondary source is git for tests
@@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-N06e2QSt34l4T0hulndZR/czjaPcmw8YXF0iAN/XmgQ=";
+    hash = "sha256-B+GdUXRvQyBMR7PbVGEZr7hZm7wslBskUTB23APJLIU=";
   };
 
   nativeBuildInputs = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 249559bf083..72da8c22120 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 = "20230802.1";
+  version = "20230906.1";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-kG2FGX78pd1vbRH6DtB2rXV0AlcUfaHO0z5Vft0hswE=";
+    hash = "sha256-wR/v49K4bKNnzkRltvdFjVYgZ+jU8PVBJHCF765NY5U=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch
index a4177a35f48..8a83618b1a4 100644
--- a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch
+++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch
@@ -11,11 +11,69 @@ index a98766c78c..1c47bb1f80 100644
  
  CONFIG_SCHEMA = vol.Schema(
      {
+diff --git a/tests/components/ffmpeg/test_binary_sensor.py b/tests/components/ffmpeg/test_binary_sensor.py
+index 6eec115d6f..c55b4fb26c 100644
+--- a/tests/components/ffmpeg/test_binary_sensor.py
++++ b/tests/components/ffmpeg/test_binary_sensor.py
+@@ -24,7 +24,7 @@ async def test_noise_setup_component(hass: HomeAssistant) -> None:
+         await async_setup_component(hass, "binary_sensor", CONFIG_NOISE)
+     await hass.async_block_till_done()
+ 
+-    assert hass.data["ffmpeg"].binary == "ffmpeg"
++    assert hass.data["ffmpeg"].binary == "@ffmpeg@"
+     assert hass.states.get("binary_sensor.ffmpeg_noise") is not None
+ 
+ 
+@@ -35,7 +35,7 @@ async def test_noise_setup_component_start(mock_start, hass: HomeAssistant):
+         await async_setup_component(hass, "binary_sensor", CONFIG_NOISE)
+     await hass.async_block_till_done()
+ 
+-    assert hass.data["ffmpeg"].binary == "ffmpeg"
++    assert hass.data["ffmpeg"].binary == "@ffmpeg@"
+     assert hass.states.get("binary_sensor.ffmpeg_noise") is not None
+ 
+     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
+@@ -55,7 +55,7 @@ async def test_noise_setup_component_start_callback(mock_ffmpeg, hass: HomeAssis
+         await async_setup_component(hass, "binary_sensor", CONFIG_NOISE)
+     await hass.async_block_till_done()
+ 
+-    assert hass.data["ffmpeg"].binary == "ffmpeg"
++    assert hass.data["ffmpeg"].binary == "@ffmpeg@"
+     assert hass.states.get("binary_sensor.ffmpeg_noise") is not None
+ 
+     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
+@@ -80,7 +80,7 @@ async def test_motion_setup_component(hass: HomeAssistant) -> None:
+         await async_setup_component(hass, "binary_sensor", CONFIG_MOTION)
+     await hass.async_block_till_done()
+ 
+-    assert hass.data["ffmpeg"].binary == "ffmpeg"
++    assert hass.data["ffmpeg"].binary == "@ffmpeg@"
+     assert hass.states.get("binary_sensor.ffmpeg_motion") is not None
+ 
+ 
+@@ -91,7 +91,7 @@ async def test_motion_setup_component_start(mock_start, hass: HomeAssistant):
+         await async_setup_component(hass, "binary_sensor", CONFIG_MOTION)
+     await hass.async_block_till_done()
+ 
+-    assert hass.data["ffmpeg"].binary == "ffmpeg"
++    assert hass.data["ffmpeg"].binary == "@ffmpeg@"
+     assert hass.states.get("binary_sensor.ffmpeg_motion") is not None
+ 
+     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
+@@ -111,7 +111,7 @@ async def test_motion_setup_component_start_callback(mock_ffmpeg, hass: HomeAssi
+         await async_setup_component(hass, "binary_sensor", CONFIG_MOTION)
+     await hass.async_block_till_done()
+ 
+-    assert hass.data["ffmpeg"].binary == "ffmpeg"
++    assert hass.data["ffmpeg"].binary == "@ffmpeg@"
+     assert hass.states.get("binary_sensor.ffmpeg_motion") is not None
+ 
+     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
 diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py
-index 521ac732e5..ab8a56934f 100644
+index 0c6ce300d0..ff74a5d7f7 100644
 --- a/tests/components/ffmpeg/test_init.py
 +++ b/tests/components/ffmpeg/test_init.py
-@@ -87,7 +87,7 @@ class TestFFmpegSetup:
+@@ -91,7 +91,7 @@ class TestFFmpegSetup:
          with assert_setup_component(1):
              setup_component(self.hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}})
  
@@ -24,61 +82,3 @@ index 521ac732e5..ab8a56934f 100644
  
      def test_setup_component_test_service(self):
          """Set up ffmpeg component test services."""
-diff --git a/tests/components/ffmpeg/test_sensor.py b/tests/components/ffmpeg/test_sensor.py
-index a6c9c1f441..f13091da1a 100644
---- a/tests/components/ffmpeg/test_sensor.py
-+++ b/tests/components/ffmpeg/test_sensor.py
-@@ -27,7 +27,7 @@ class TestFFmpegNoiseSetup:
-             setup_component(self.hass, "binary_sensor", self.config)
-         self.hass.block_till_done()
- 
--        assert self.hass.data["ffmpeg"].binary == "ffmpeg"
-+        assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
-         assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None
- 
-     @patch("haffmpeg.sensor.SensorNoise.open_sensor", return_value=mock_coro())
-@@ -37,7 +37,7 @@ class TestFFmpegNoiseSetup:
-             setup_component(self.hass, "binary_sensor", self.config)
-         self.hass.block_till_done()
- 
--        assert self.hass.data["ffmpeg"].binary == "ffmpeg"
-+        assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
-         assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None
- 
-         self.hass.start()
-@@ -53,7 +53,7 @@ class TestFFmpegNoiseSetup:
-             setup_component(self.hass, "binary_sensor", self.config)
-         self.hass.block_till_done()
- 
--        assert self.hass.data["ffmpeg"].binary == "ffmpeg"
-+        assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
-         assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None
- 
-         self.hass.start()
-@@ -89,7 +89,7 @@ class TestFFmpegMotionSetup:
-             setup_component(self.hass, "binary_sensor", self.config)
-         self.hass.block_till_done()
- 
--        assert self.hass.data["ffmpeg"].binary == "ffmpeg"
-+        assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
-         assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None
- 
-     @patch("haffmpeg.sensor.SensorMotion.open_sensor", return_value=mock_coro())
-@@ -99,7 +99,7 @@ class TestFFmpegMotionSetup:
-             setup_component(self.hass, "binary_sensor", self.config)
-         self.hass.block_till_done()
- 
--        assert self.hass.data["ffmpeg"].binary == "ffmpeg"
-+        assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
-         assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None
- 
-         self.hass.start()
-@@ -115,7 +115,7 @@ class TestFFmpegMotionSetup:
-             setup_component(self.hass, "binary_sensor", self.config)
-         self.hass.block_till_done()
- 
--        assert self.hass.data["ffmpeg"].binary == "ffmpeg"
-+        assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
-         assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None
- 
-         self.hass.start()
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 154f8dc2f27..f2c90446785 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -39,6 +39,14 @@ let
   };
 
   extraDisabledTests = {
+    mqtt = [
+      # Assert None is not None
+      "test_handle_logging_on_writing_the_entity_state"
+    ];
+    shell_command = [
+      # tries to retrieve file from github
+      "test_non_text_stdout_capture"
+    ];
     vesync = [
       # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration
       "test_async_get_config_entry_diagnostics__single_humidifier"