Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

7 files changed, 306 insertions, 195 deletions

diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 88fb52a14320..521f73dbb72e 100644
--- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2023.6.0";
+  version = "2023.8.1";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -21,8 +21,8 @@
     "actiontec" = ps: with ps; [
     ];
     "adax" = ps: with ps; [
-      adax-local
       adax
+      adax-local
     ];
     "adguard" = ps: with ps; [
       adguardhome
@@ -62,8 +62,9 @@
       aioruuvigateway
       aioshelly
       airthings-ble
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -107,8 +108,8 @@
     "alert" = ps: with ps; [
     ];
     "alexa" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
     ];
     "alpha_vantage" = ps: with ps; [
       alpha-vantage
@@ -156,7 +157,7 @@
       androidtvremote2
     ];
     "anel_pwrctrl" = ps: with ps; [
-    ]; # missing inputs: anel_pwrctrl-homeassistant
+    ]; # missing inputs: anel-pwrctrl-homeassistant
     "anova" = ps: with ps; [
     ]; # missing inputs: anova-wifi
     "anthemav" = ps: with ps; [
@@ -198,15 +199,16 @@
       aqualogic
     ];
     "aquostv" = ps: with ps; [
-    ]; # missing inputs: sharp_aquos_rc
+    ]; # missing inputs: sharp-aquos-rc
     "aranet" = ps: with ps; [
       aioesphomeapi
       aiohttp-cors
       aioruuvigateway
       aioshelly
       aranet4
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -265,12 +267,14 @@
     "aten_pe" = ps: with ps; [
       atenpdu
     ];
+    "atlanticcityelectric" = ps: with ps; [
+    ];
     "atome" = ps: with ps; [
       pyatome
     ];
     "august" = ps: with ps; [
-      yalexs-ble
       yalexs
+      yalexs-ble
     ];
     "august_ble" = ps: with ps; [
     ];
@@ -335,7 +339,9 @@
     "bbox" = ps: with ps; [
     ]; # missing inputs: pybbox
     "beewi_smartclim" = ps: with ps; [
-    ]; # missing inputs: beewi_smartclim
+    ]; # missing inputs: beewi-smartclim
+    "bge" = ps: with ps; [
+    ];
     "binary_sensor" = ps: with ps; [
     ];
     "bitcoin" = ps: with ps; [
@@ -369,8 +375,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluemaestro-ble
       bluetooth-adapters
       bluetooth-auto-recovery
@@ -396,8 +403,8 @@
     ];
     "bluetooth" = ps: with ps; [
       aiohttp-cors
-      bleak-retry-connector
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -413,8 +420,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -437,8 +445,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -511,8 +520,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -547,15 +557,14 @@
       aiohttp-cors
     ];
     "camera" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
     ];
     "canary" = ps: with ps; [
       ha-ffmpeg
       py-canary
     ];
     "cast" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       fnv-hash-fast
       hass-nabucasa
@@ -568,6 +577,7 @@
       plexwebsocket
       psutil-home-assistant
       pychromecast
+      pyturbojpeg
       sqlalchemy
       webrtcvad
       zeroconf
@@ -602,12 +612,12 @@
     "climate" = ps: with ps; [
     ];
     "cloud" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
+      pyturbojpeg
       webrtcvad
     ];
     "cloudflare" = ps: with ps; [
@@ -623,6 +633,8 @@
     "color_extractor" = ps: with ps; [
       colorthief
     ];
+    "comed" = ps: with ps; [
+    ];
     "comed_hourly_pricing" = ps: with ps; [
     ];
     "comfoconnect" = ps: with ps; [
@@ -705,21 +717,19 @@
       bluepy
     ]; # missing inputs: decora
     "decora_wifi" = ps: with ps; [
-    ]; # missing inputs: decora_wifi
+    ]; # missing inputs: decora-wifi
     "default_config" = ps: with ps; [
-      pynacl
-      pyturbojpeg
       aiodiscover
       aiohttp-cors
       async-upnp-client
-      bleak-retry-connector
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
       dbus-fast
       fnv-hash-fast
-      av
+      ha-av
       hass-nabucasa
       hassil
       home-assistant-frontend
@@ -730,7 +740,9 @@
       numpy
       pillow
       psutil-home-assistant
+      pynacl
       pyserial
+      pyturbojpeg
       pyudev
       scapy
       securetar
@@ -741,6 +753,8 @@
     "delijn" = ps: with ps; [
       pydelijn
     ];
+    "delmarva" = ps: with ps; [
+    ];
     "deluge" = ps: with ps; [
       deluge-client
     ];
@@ -805,15 +819,8 @@
     "discord" = ps: with ps; [
       nextcord
     ];
-    "discovery" = ps: with ps; [
-      aiohttp-cors
-      fnv-hash-fast
-      ifaddr
-      netdisco
-      psutil-home-assistant
-      sqlalchemy
-      zeroconf
-    ];
+    "discovergy" = ps: with ps; [
+    ]; # missing inputs: pydiscovergy
     "dlib_face_detect" = ps: with ps; [
       face-recognition
     ];
@@ -862,8 +869,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -886,6 +894,9 @@
     ]; # missing inputs: dovado
     "downloader" = ps: with ps; [
     ];
+    "dremel_3d_printer" = ps: with ps; [
+      dremel3dpy
+    ];
     "dsmr" = ps: with ps; [
       dsmr-parser
     ];
@@ -903,6 +914,8 @@
     "dunehd" = ps: with ps; [
       pdunehd
     ];
+    "duotecno" = ps: with ps; [
+    ]; # missing inputs: pyduotecno
     "dwd_weather_warnings" = ps: with ps; [
       dwdwfsapi
     ];
@@ -917,7 +930,7 @@
       pillow
       psutil-home-assistant
       sqlalchemy
-    ]; # missing inputs: dynalite_panel
+    ]; # missing inputs: dynalite-panel
     "eafm" = ps: with ps; [
       aioeafm
     ];
@@ -944,7 +957,6 @@
       aiohttp-cors
     ];
     "eddystone_temperature" = ps: with ps; [
-      construct
     ]; # missing inputs: beacontools
     "edimax" = ps: with ps; [
       pyedimax
@@ -962,7 +974,13 @@
       pyeight
     ];
     "electrasmart" = ps: with ps; [
-    ]; # missing inputs: pyelectra
+    ]; # missing inputs: pyElectra
+    "electric_kiwi" = ps: with ps; [
+      aiohttp-cors
+      fnv-hash-fast
+      psutil-home-assistant
+      sqlalchemy
+    ]; # missing inputs: electrickiwi-api
     "elgato" = ps: with ps; [
       elgato
     ];
@@ -1053,8 +1071,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1081,8 +1100,9 @@
     "esphome" = ps: with ps; [
       aioesphomeapi
       aiohttp-cors
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1110,8 +1130,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1130,6 +1151,10 @@
       webrtcvad
       zeroconf
     ];
+    "event" = ps: with ps; [
+    ];
+    "evergy" = ps: with ps; [
+    ];
     "everlights" = ps: with ps; [
       pyeverlights
     ];
@@ -1217,8 +1242,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1318,13 +1344,13 @@
       psutil-home-assistant
       sqlalchemy
       xmltodict
-    ];
+    ]; # missing inputs: fritzconnection.optional-dependencies.qr
     "fritzbox" = ps: with ps; [
       pyfritzhome
     ];
     "fritzbox_callmonitor" = ps: with ps; [
       fritzconnection
-    ];
+    ]; # missing inputs: fritzconnection.optional-dependencies.qr
     "fronius" = ps: with ps; [
       pyfronius
     ];
@@ -1351,6 +1377,31 @@
     "garages_amsterdam" = ps: with ps; [
       odp-amsterdam
     ];
+    "gardena_bluetooth" = ps: with ps; [
+      aioesphomeapi
+      aiohttp-cors
+      aioruuvigateway
+      aioshelly
+      async-interrupt
+      bleak
+      bleak-retry-connector
+      bluetooth-adapters
+      bluetooth-auto-recovery
+      bluetooth-data-tools
+      dbus-fast
+      esphome-dashboard-api
+      fnv-hash-fast
+      hassil
+      home-assistant-intents
+      ifaddr
+      mutagen
+      psutil-home-assistant
+      pyserial
+      pyudev
+      sqlalchemy
+      webrtcvad
+      zeroconf
+    ]; # missing inputs: gardena_bluetooth
     "gaviota" = ps: with ps; [
     ];
     "gc100" = ps: with ps; [
@@ -1360,7 +1411,7 @@
     ];
     "generic" = ps: with ps; [
       aiohttp-cors
-      av
+      ha-av
       pillow
     ];
     "generic_hygrostat" = ps: with ps; [
@@ -1429,8 +1480,8 @@
       sqlalchemy
     ];
     "google_assistant" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
     ];
     "google_assistant_sdk" = ps: with ps; [
       aiohttp-cors
@@ -1446,9 +1497,10 @@
     ];
     "google_generative_ai_conversation" = ps: with ps; [
       aiohttp-cors
+      google-generativeai
       hassil
       home-assistant-intents
-    ]; # missing inputs: google-generativeai
+    ];
     "google_mail" = ps: with ps; [
       aiohttp-cors
       fnv-hash-fast
@@ -1482,8 +1534,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1580,7 +1633,7 @@
     "hi_kumo" = ps: with ps; [
     ];
     "hikvision" = ps: with ps; [
-    ]; # missing inputs: pyhik
+    ]; # missing inputs: pyHik
     "hikvisioncam" = ps: with ps; [
       hikvision
     ];
@@ -1628,16 +1681,16 @@
       janus
       pillow
       psutil-home-assistant
-      pyserial-asyncio
       pyserial
+      pyserial-asyncio
       pyudev
       sqlalchemy
       zha-quirks
+      zigpy
       zigpy-deconz
       zigpy-xbee
       zigpy-zigate
       zigpy-znp
-      zigpy
     ];
     "homeassistant_sky_connect" = ps: with ps; [
       aiohttp-cors
@@ -1646,16 +1699,16 @@
       janus
       pillow
       psutil-home-assistant
-      pyserial-asyncio
       pyserial
+      pyserial-asyncio
       pyudev
       sqlalchemy
       zha-quirks
+      zigpy
       zigpy-deconz
       zigpy-xbee
       zigpy-zigate
       zigpy-znp
-      zigpy
     ];
     "homeassistant_yellow" = ps: with ps; [
       aiohttp-cors
@@ -1664,27 +1717,27 @@
       janus
       pillow
       psutil-home-assistant
-      pyserial-asyncio
       pyserial
+      pyserial-asyncio
       pyudev
       sqlalchemy
       zha-quirks
+      zigpy
       zigpy-deconz
       zigpy-xbee
       zigpy-zigate
       zigpy-znp
-      zigpy
     ];
     "homekit" = ps: with ps; [
-      hap-python
-      pyqrcode
-      pyturbojpeg
       aiohttp-cors
       base36
       fnv-hash-fast
       ha-ffmpeg
+      hap-python
       ifaddr
       psutil-home-assistant
+      pyqrcode
+      pyturbojpeg
       sqlalchemy
       zeroconf
     ];
@@ -1694,8 +1747,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1764,8 +1818,7 @@
       pygti
     ];
     "hydrawise" = ps: with ps; [
-      hydrawiser
-    ];
+    ]; # missing inputs: pydrawise
     "hyperion" = ps: with ps; [
       hyperion-py
     ];
@@ -1773,7 +1826,8 @@
       pyialarm
     ];
     "iammeter" = ps: with ps; [
-    ]; # missing inputs: iammeter
+      iammeter
+    ];
     "iaqualink" = ps: with ps; [
       h2
       iaqualink
@@ -1783,8 +1837,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1820,9 +1875,12 @@
     "ihc" = ps: with ps; [
       defusedxml
     ]; # missing inputs: ihcsdk
+    "image" = ps: with ps; [
+      aiohttp-cors
+    ];
     "image_processing" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
     ];
     "image_upload" = ps: with ps; [
       aiohttp-cors
@@ -1840,16 +1898,17 @@
       incomfort-client
     ];
     "influxdb" = ps: with ps; [
-      influxdb-client
       influxdb
+      influxdb-client
     ];
     "inkbird" = ps: with ps; [
       aioesphomeapi
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -1987,8 +2046,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2010,17 +2070,17 @@
     "keyboard" = ps: with ps; [
     ]; # missing inputs: pyuserinput
     "keyboard_remote" = ps: with ps; [
-      aionotify
+      asyncinotify
       evdev
     ];
     "keymitt_ble" = ps: with ps; [
-      pymicrobot
       aioesphomeapi
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2032,6 +2092,7 @@
       ifaddr
       mutagen
       psutil-home-assistant
+      pymicrobot
       pyserial
       pyudev
       sqlalchemy
@@ -2125,8 +2186,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2150,8 +2212,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2266,6 +2329,15 @@
     "lookin" = ps: with ps; [
       aiolookin
     ];
+    "loqed" = ps: with ps; [
+      aiohttp-cors
+      hass-nabucasa
+      hassil
+      home-assistant-intents
+      mutagen
+      pyturbojpeg
+      webrtcvad
+    ]; # missing inputs: loqedAPI
     "lovelace" = ps: with ps; [
     ];
     "luci" = ps: with ps; [
@@ -2347,7 +2419,7 @@
     ];
     "media_extractor" = ps: with ps; [
       aiohttp-cors
-      youtube-dl-light
+      yt-dlp
     ];
     "media_player" = ps: with ps; [
       aiohttp-cors
@@ -2368,8 +2440,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2416,18 +2489,16 @@
     "microsoft" = ps: with ps; [
     ]; # missing inputs: pycsspeechtts
     "microsoft_face" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
     ];
     "microsoft_face_detect" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
     ];
     "microsoft_face_identify" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
-    ];
-    "miflora" = ps: with ps; [
+      pyturbojpeg
     ];
     "mijndomein_energie" = ps: with ps; [
     ];
@@ -2448,8 +2519,6 @@
     "minio" = ps: with ps; [
       minio
     ];
-    "mitemp_bt" = ps: with ps; [
-    ];
     "mjpeg" = ps: with ps; [
     ];
     "moat" = ps: with ps; [
@@ -2457,8 +2526,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2478,8 +2548,6 @@
       zeroconf
     ];
     "mobile_app" = ps: with ps; [
-      pynacl
-      pyturbojpeg
       aiohttp-cors
       fnv-hash-fast
       hass-nabucasa
@@ -2488,6 +2556,8 @@
       mutagen
       pillow
       psutil-home-assistant
+      pynacl
+      pyturbojpeg
       sqlalchemy
       webrtcvad
     ];
@@ -2523,8 +2593,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2651,11 +2722,9 @@
       google-nest-sdm
       ha-ffmpeg
       psutil-home-assistant
-      python-nest
       sqlalchemy
     ];
     "netatmo" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       fnv-hash-fast
       hass-nabucasa
@@ -2664,6 +2733,7 @@
       mutagen
       psutil-home-assistant
       pyatmo
+      pyturbojpeg
       sqlalchemy
       webrtcvad
     ];
@@ -2824,9 +2894,9 @@
       onkyo-eiscp
     ];
     "onvif" = ps: with ps; [
-      wsdiscovery
       ha-ffmpeg
       onvif-zeep-async
+      wsdiscovery
     ];
     "open_meteo" = ps: with ps; [
       open-meteo
@@ -2863,7 +2933,8 @@
       opensensemap-api
     ];
     "opensky" = ps: with ps; [
-    ]; # missing inputs: python-opensky
+      python-opensky
+    ];
     "opentherm_gw" = ps: with ps; [
       pyotgw
     ];
@@ -2876,16 +2947,22 @@
     "opnsense" = ps: with ps; [
       pyopnsense
     ];
-    "opple" = ps: with ps; [
-      pyoppleio
+    "opower" = ps: with ps; [
+      fnv-hash-fast
+      opower
+      psutil-home-assistant
+      sqlalchemy
     ];
+    "opple" = ps: with ps; [
+    ]; # missing inputs: pyoppleio-legacy
     "oralb" = ps: with ps; [
       aioesphomeapi
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -2920,18 +2997,18 @@
       pillow
       psutil-home-assistant
       pyroute2
-      pyserial-asyncio
       pyserial
+      pyserial-asyncio
       python-otbr-api
       pyudev
       sqlalchemy
       zeroconf
       zha-quirks
+      zigpy
       zigpy-deconz
       zigpy-xbee
       zigpy-zigate
       zigpy-znp
-      zigpy
     ];
     "otp" = ps: with ps; [
       pyotp
@@ -2943,8 +3020,6 @@
       ovoenergy
     ];
     "owntracks" = ps: with ps; [
-      pynacl
-      pyturbojpeg
       aiohttp-cors
       hass-nabucasa
       hassil
@@ -2952,6 +3027,8 @@
       janus
       mutagen
       paho-mqtt
+      pynacl
+      pyturbojpeg
       webrtcvad
     ];
     "p1_monitor" = ps: with ps; [
@@ -2989,15 +3066,23 @@
     "peco" = ps: with ps; [
       peco
     ];
+    "peco_opower" = ps: with ps; [
+    ];
+    "pegel_online" = ps: with ps; [
+    ]; # missing inputs: aiopegelonline
     "pencom" = ps: with ps; [
       pencompy
     ];
+    "pepco" = ps: with ps; [
+    ];
     "persistent_notification" = ps: with ps; [
     ];
     "person" = ps: with ps; [
       aiohttp-cors
       pillow
     ];
+    "pge" = ps: with ps; [
+    ];
     "philips_js" = ps: with ps; [
       ha-philipsjs
     ];
@@ -3021,13 +3106,13 @@
     "pjlink" = ps: with ps; [
     ]; # missing inputs: pypjlink2
     "plaato" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
       pyplaato
+      pyturbojpeg
       webrtcvad
     ];
     "plant" = ps: with ps; [
@@ -3065,7 +3150,7 @@
       pyprof2calltree
     ];
     "progettihwsw" = ps: with ps; [
-    ]; # missing inputs: progettihwsw
+    ]; # missing inputs: ProgettiHWSW
     "proliphix" = ps: with ps; [
     ]; # missing inputs: proliphix
     "prometheus" = ps: with ps; [
@@ -3090,6 +3175,8 @@
     ];
     "ps4" = ps: with ps; [
     ]; # missing inputs: pyps4-2ndscreen
+    "pse" = ps: with ps; [
+    ];
     "pulseaudio_loopback" = ps: with ps; [
       pulsectl
     ];
@@ -3128,8 +3215,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3173,12 +3261,12 @@
       pyqwikswitch
     ];
     "rachio" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
+      pyturbojpeg
       rachiopy
       webrtcvad
     ];
@@ -3211,8 +3299,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3269,6 +3358,8 @@
     "renault" = ps: with ps; [
       renault-api
     ];
+    "renson" = ps: with ps; [
+    ]; # missing inputs: renson-endura-delta
     "reolink" = ps: with ps; [
       aiohttp-cors
       reolink-aio
@@ -3344,22 +3435,22 @@
     "rtorrent" = ps: with ps; [
     ];
     "rtsp_to_webrtc" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
+      pyturbojpeg
       rtsp-to-webrtc
     ];
     "ruckus_unleashed" = ps: with ps; [
       pyruckus
     ];
     "russound_rio" = ps: with ps; [
-    ]; # missing inputs: russound_rio
+    ]; # missing inputs: russound-rio
     "russound_rnet" = ps: with ps; [
     ]; # missing inputs: russound
     "ruuvi_gateway" = ps: with ps; [
       aiohttp-cors
       aioruuvigateway
-      bleak-retry-connector
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3375,8 +3466,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3401,7 +3493,6 @@
       pysabnzbd
     ];
     "safe_mode" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       fnv-hash-fast
       hass-nabucasa
@@ -3412,6 +3503,7 @@
       mutagen
       pillow
       psutil-home-assistant
+      pyturbojpeg
       sqlalchemy
       webrtcvad
     ];
@@ -3435,7 +3527,7 @@
     ++ samsungtvws.optional-dependencies.async
     ++ samsungtvws.optional-dependencies.encrypted;
     "satel_integra" = ps: with ps; [
-    ]; # missing inputs: satel_integra
+    ]; # missing inputs: satel-integra
     "scene" = ps: with ps; [
     ];
     "schedule" = ps: with ps; [
@@ -3474,9 +3566,6 @@
     "sense" = ps: with ps; [
       sense-energy
     ];
-    "senseme" = ps: with ps; [
-      aiosenseme
-    ];
     "sensibo" = ps: with ps; [
       pysensibo
     ];
@@ -3485,8 +3574,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3517,8 +3607,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3542,8 +3633,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3597,8 +3689,8 @@
     "shelly" = ps: with ps; [
       aiohttp-cors
       aioshelly
-      bleak-retry-connector
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3688,7 +3780,6 @@
     "smarther" = ps: with ps; [
     ];
     "smartthings" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       hass-nabucasa
       hassil
@@ -3696,6 +3787,7 @@
       mutagen
       pysmartapp
       pysmartthings
+      pyturbojpeg
       webrtcvad
     ];
     "smarttub" = ps: with ps; [
@@ -3725,8 +3817,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3805,7 +3898,7 @@
       spiderpy
     ];
     "splunk" = ps: with ps; [
-    ]; # missing inputs: hass_splunk
+    ]; # missing inputs: hass-splunk
     "spotify" = ps: with ps; [
       aiohttp-cors
       fnv-hash-fast
@@ -3870,10 +3963,10 @@
     "stookwijzer" = ps: with ps; [
     ]; # missing inputs: stookwijzer
     "stream" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
-      av
+      ha-av
       numpy
+      pyturbojpeg
     ];
     "streamlabswater" = ps: with ps; [
       streamlabswater
@@ -3911,13 +4004,13 @@
       pyswitchbee
     ];
     "switchbot" = ps: with ps; [
-      pyswitchbot
       aioesphomeapi
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -3930,6 +4023,7 @@
       mutagen
       psutil-home-assistant
       pyserial
+      pyswitchbot
       pyudev
       sqlalchemy
       webrtcvad
@@ -3939,7 +4033,7 @@
       aioswitcher
     ];
     "switchmate" = ps: with ps; [
-    ]; # missing inputs: pySwitchmate
+    ]; # missing inputs: PySwitchmate
     "symfonisk" = ps: with ps; [
     ];
     "syncthing" = ps: with ps; [
@@ -4006,13 +4100,13 @@
       xmltodict
     ];
     "telegram" = ps: with ps; [
-      pysocks
       aiohttp-cors
+      pysocks
       python-telegram-bot
     ];
     "telegram_bot" = ps: with ps; [
-      pysocks
       aiohttp-cors
+      pysocks
       python-telegram-bot
     ];
     "tellduslive" = ps: with ps; [
@@ -4045,8 +4139,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -4072,8 +4167,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -4094,7 +4190,7 @@
     ];
     "thermoworks_smoke" = ps: with ps; [
       stringcase
-    ]; # missing inputs: thermoworks_smoke
+    ]; # missing inputs: thermoworks-smoke
     "thethingsnetwork" = ps: with ps; [
     ];
     "thingspeak" = ps: with ps; [
@@ -4131,8 +4227,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -4174,12 +4271,12 @@
       pytomorrowio
     ];
     "toon" = ps: with ps; [
-      pyturbojpeg
       aiohttp-cors
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
+      pyturbojpeg
       toonapi
       webrtcvad
     ];
@@ -4198,7 +4295,7 @@
       psutil-home-assistant
       python-kasa
       sqlalchemy
-    ];
+    ]; # missing inputs: python-kasa.optional-dependencies.speedups
     "tplink_lte" = ps: with ps; [
     ]; # missing inputs: tp-connected
     "tplink_omada" = ps: with ps; [
@@ -4282,8 +4379,6 @@
     "ukraine_alarm" = ps: with ps; [
       uasiren
     ];
-    "ultraloq" = ps: with ps; [
-    ];
     "unifi" = ps: with ps; [
       aiounifi
     ];
@@ -4504,7 +4599,7 @@
       wled
     ];
     "wolflink" = ps: with ps; [
-    ]; # missing inputs: wolf_smartset
+    ]; # missing inputs: wolf-smartset
     "workday" = ps: with ps; [
       holidays
     ];
@@ -4539,21 +4634,15 @@
     ];
     "xiaomi_aqara" = ps: with ps; [
       pyxiaomigateway
-      aiohttp-cors
-      fnv-hash-fast
-      ifaddr
-      netdisco
-      psutil-home-assistant
-      sqlalchemy
-      zeroconf
     ];
     "xiaomi_ble" = ps: with ps; [
       aioesphomeapi
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -4595,8 +4684,9 @@
       aiohttp-cors
       aioruuvigateway
       aioshelly
-      bleak-retry-connector
+      async-interrupt
       bleak
+      bleak-retry-connector
       bluetooth-adapters
       bluetooth-auto-recovery
       bluetooth-data-tools
@@ -4662,10 +4752,9 @@
     "youtube" = ps: with ps; [
       aiohttp-cors
       fnv-hash-fast
-      google-api-python-client
       psutil-home-assistant
       sqlalchemy
-    ];
+    ]; # missing inputs: youtubeaio
     "zabbix" = ps: with ps; [
       py-zabbix
     ];
@@ -4698,19 +4787,19 @@
       janus
       pillow
       psutil-home-assistant
-      pyserial-asyncio
       pyserial
+      pyserial-asyncio
       pyudev
       sqlalchemy
       zha-quirks
+      zigpy
       zigpy-deconz
       zigpy-xbee
       zigpy-zigate
       zigpy-znp
-      zigpy
     ];
     "zhong_hong" = ps: with ps; [
-    ]; # missing inputs: zhong_hong_hvac
+    ]; # missing inputs: zhong-hong-hvac
     "ziggo_mediabox_xl" = ps: with ps; [
     ]; # missing inputs: ziggo-mediabox-xl
     "zodiac" = ps: with ps; [
@@ -4867,12 +4956,12 @@
     "dialogflow"
     "directv"
     "discord"
-    "discovery"
     "dlna_dmr"
     "dlna_dms"
     "dnsip"
     "doorbird"
     "dormakaba_dkey"
+    "dremel_3d_printer"
     "dsmr"
     "dsmr_reader"
     "dte_energy_bridge"
@@ -4903,6 +4992,7 @@
     "escea"
     "esphome"
     "eufylife_ble"
+    "event"
     "everlights"
     "evil_genius_labs"
     "ezviz"
@@ -4938,9 +5028,7 @@
     "freebox"
     "freedns"
     "freedompro"
-    "fritz"
     "fritzbox"
-    "fritzbox_callmonitor"
     "fronius"
     "frontend"
     "frontier_silicon"
@@ -4967,6 +5055,7 @@
     "google_assistant"
     "google_assistant_sdk"
     "google_domains"
+    "google_generative_ai_conversation"
     "google_mail"
     "google_pubsub"
     "google_sheets"
@@ -5023,6 +5112,7 @@
     "icloud"
     "ifttt"
     "ign_sismologia"
+    "image"
     "image_processing"
     "image_upload"
     "imap"
@@ -5140,6 +5230,7 @@
     "my"
     "myq"
     "mysensors"
+    "mystrom"
     "mythicbeastsdns"
     "nam"
     "namecheapdns"
@@ -5186,10 +5277,13 @@
     "openexchangerates"
     "opengarage"
     "openhardwaremonitor"
+    "openhome"
+    "opensky"
     "opentherm_gw"
     "openuv"
     "openweathermap"
     "opnsense"
+    "opower"
     "oralb"
     "otbr"
     "overkiz"
@@ -5228,6 +5322,7 @@
     "python_script"
     "qingping"
     "qld_bushfire"
+    "qnap"
     "qnap_qsw"
     "qwikswitch"
     "rachio"
@@ -5280,7 +5375,6 @@
     "season"
     "select"
     "sense"
-    "senseme"
     "sensibo"
     "sensirion_ble"
     "sensor"
@@ -5387,7 +5481,6 @@
     "tomorrowio"
     "toon"
     "totalconnect"
-    "tplink"
     "tplink_omada"
     "traccar"
     "trace"
@@ -5474,7 +5567,6 @@
     "yeelight"
     "yolink"
     "youless"
-    "youtube"
     "zamg"
     "zeroconf"
     "zerproc"
diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix
index b186ea46bb32..9c074cf090cc 100644
--- a/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -76,6 +76,16 @@ let
         doCheck = false;
       });
 
+      ha-av = super.av.overridePythonAttrs (oldAttrs: rec {
+        pname = "ha-av";
+        version = "10.1.1";
+
+        src = fetchPypi {
+          inherit pname version;
+          hash = "sha256-QaMFVvglipN0kG1+ZQNKk7WTydSyIPn2qa32UtvLidw=";
+        };
+      });
+
       jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec {
         version = "3.3.0";
         src = fetchFromGitHub {
@@ -85,17 +95,6 @@ let
         };
       });
 
-      # Pinned due to API changes in 10.0
-      mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec {
-        version = "9.3.0";
-        src = fetchFromGitHub {
-          owner = "py-mine";
-          repo = "mcstatus";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0=";
-        };
-      });
-
       # moto tests are a nuissance
       moto = super.moto.overridePythonAttrs (_: {
         doCheck = false;
@@ -163,6 +162,15 @@ let
         };
       });
 
+      pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec {
+        version = "0.4.8";
+        src = fetchPypi {
+          inherit (oldAttrs) pname;
+          inherit version;
+          hash = "sha256-rvd8n7lKOsWI6HhBIIvexGRHHZhxvVBQoofMmkdc0Lo=";
+        };
+      });
+
       # Pinned due to API changes >0.3.5.3
       pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec {
         version = "0.3.5.3";
@@ -231,15 +239,6 @@ let
         doCheck = false;
       });
 
-      sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
-        version = "2.0.12";
-        src = fetchPypi {
-          pname = "SQLAlchemy";
-          inherit version;
-          hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w=";
-        };
-      });
-
       # Pinned due to API changes in 0.3.0
       tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
         version = "0.2.0";
@@ -296,7 +295,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2023.6.0";
+  hassVersion = "2023.8.1";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -312,7 +311,7 @@ in python.pkgs.buildPythonApplication rec {
   # Primary source is the pypi sdist, because it contains translations
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dEszA95EIwGMR2Ztpe7P8weh4FbqGJBkso7nCvTkPDc=";
+    hash = "sha256-u20hEdVoxp2MzLo6OonQZnkoxqK+myt4LwqB+mz3ipE=";
   };
 
   # Secondary source is git for tests
@@ -320,7 +319,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk=";
+    hash = "sha256-CrfVokUk3KnkavM+/ci70ela7aJ60TSNymoCzZdxaIY=";
   };
 
   nativeBuildInputs = with python.pkgs; [
@@ -356,6 +355,7 @@ in python.pkgs.buildPythonApplication rec {
       "pip"
       "PyJWT"
       "pyOpenSSL"
+      "PyYAML"
       "requests"
       "typing-extensions"
       "voluptuous-serialize"
diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix
index ff33cc8cee91..172d9f7c9659 100644
--- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix
+++ b/nixpkgs/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 = "20230607.0";
+  version = "20230802.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-O3hAF3QgZHm6q+manxlqWZLlSDxHMr86B3GdwMClxEk=";
+    hash = "sha256-fggFSpcdHRgqHKruWvGJ97DkhdgRTSu0V3YmzVNCm4A=";
   };
 
   # there is nothing to strip in this package
diff --git a/nixpkgs/pkgs/servers/home-assistant/intents.nix b/nixpkgs/pkgs/servers/home-assistant/intents.nix
index ae247b9e7a08..0255d97da6b6 100644
--- a/nixpkgs/pkgs/servers/home-assistant/intents.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/intents.nix
@@ -19,25 +19,19 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2023.6.5";
+  version = "2023.8.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "home-assistant";
-    repo = "intents";
+    repo = "intents-package";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZfPOxTFPQNdZ3Tq8p410RHlLGej+FOqhafD+91MRbRo=";
+    hash = "sha256-pNLH3GGfY8upKi7uYGZ466cIQkpdA16tR1tjwuiQ3JI=";
+    fetchSubmodules = true;
   };
 
-  sourceRoot = "source/package";
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "2023.4.26" "${version}"
-  '';
-
   nativeBuildInputs = [
     hassil
     jinja2
@@ -48,7 +42,7 @@ buildPythonPackage rec {
   ];
 
   postInstall = ''
-    pushd ..
+    pushd intents
     # https://github.com/home-assistant/intents/blob/main/script/package#L18
     ${python.pythonForBuild.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data
     popd
@@ -60,7 +54,12 @@ buildPythonPackage rec {
   ];
 
   pytestFlagsArray = [
-    "../tests"
+    "intents/tests"
+  ];
+
+  disabledTests = [
+    # AssertionError: Recognition failed for 'put apples on the list'
+    "test_shopping_list_HassShoppingListAddItem"
   ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
index 142f09163428..1df4d98fb45d 100755
--- a/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
+++ b/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py
@@ -40,10 +40,9 @@ PKG_SET = "home-assistant.python.pkgs"
 # following can be used to choose the correct one
 PKG_PREFERENCES = {
     "fiblary3": "fiblary3-fork",  # https://github.com/home-assistant/core/issues/66466
-    "ha-av": "av",
     "HAP-python": "hap-python",
     "tensorflow": "tensorflow",
-    "youtube_dl": "youtube-dl-light",
+    "yt-dlp": "yt-dlp",
 }
 
 # Some dependencies are loaded dynamically at runtime, and are not
@@ -263,13 +262,13 @@ def main() -> None:
             available, extras, missing = deps
             f.write(f'    "{component}" = ps: with ps; [')
             if available:
-                f.write("\n      " + "\n      ".join(available))
+                f.write("\n      " + "\n      ".join(sorted(available)))
             f.write("\n    ]")
             if extras:
-                f.write("\n    ++ " + "\n    ++ ".join(extras))
+                f.write("\n    ++ " + "\n    ++ ".join(sorted(extras)))
             f.write(";")
             if len(missing) > 0:
-                f.write(f" # missing inputs: {' '.join(missing)}")
+                f.write(f" # missing inputs: {' '.join(sorted(missing))}")
             f.write("\n")
         f.write("  };\n")
         f.write("  # components listed in tests/components for which all dependencies are packaged\n")
diff --git a/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/nixpkgs/pkgs/servers/home-assistant/stubs.nix
index 90168a5a8698..0f06de8f7dce 100644
--- a/nixpkgs/pkgs/servers/home-assistant/stubs.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2023.6.0";
+  version = "2023.8.0";
   format = "pyproject";
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-efwrTHWc4m4biP7b39OU1GRifoKm49hEUTtIfrNGUeA=";
+    hash = "sha256-znnNWQpoJ+omYt7keW14Nc7FDqiCpZNsEWL0hEijtsI=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,6 @@ buildPythonPackage rec {
     substituteInPlace pyproject.toml --replace \
       'homeassistant = "${version}"' \
       'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"'
-    cat pyproject.toml
   '';
 
   pythonImportsCheck = [
diff --git a/nixpkgs/pkgs/servers/home-assistant/tests.nix b/nixpkgs/pkgs/servers/home-assistant/tests.nix
index 91a902a8a2d7..154f8dc2f279 100644
--- a/nixpkgs/pkgs/servers/home-assistant/tests.nix
+++ b/nixpkgs/pkgs/servers/home-assistant/tests.nix
@@ -47,6 +47,9 @@ let
   };
 
   extraPytestFlagsArray = {
+    conversation = [
+      "--deselect tests/components/conversation/test_init.py::test_get_agent_list"
+    ];
     dnsip = [
       # Tries to resolve DNS entries
       "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
@@ -55,6 +58,12 @@ let
       # Flaky: AssertionError: assert '0.0' == '12.0'
       "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed"
     ];
+    jellyfin = [
+      # AssertionError: assert 'audio/x-flac' == 'audio/flac'
+      "--deselect tests/components/jellyfin/test_media_source.py::test_resolve"
+      # AssertionError: assert [+ received] == [- snapshot]
+      "--deselect tests/components/jellyfin/test_media_source.py::test_music_library"
+    ];
     modbus = [
       # homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception
       "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail"
@@ -63,10 +72,23 @@ let
       # aioserial mock produces wrong state
       "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry"
     ];
+    sonos = [
+      # KeyError: 'sonos_media_player'
+      "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings"
+      "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3"
+    ];
     unifiprotect = [
       # "TypeError: object Mock can't be used in 'await' expression
       "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix"
     ];
+    xiaomi_ble = [
+      # assert 0 == 1"
+      "--deselect tests/components/xiaomi_ble/test_sensor.py::test_xiaomi_consumable"
+    ];
+    zha = [
+      "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp"
+      "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp"
+    ];
   };
 in lib.listToAttrs (map (component: lib.nameValuePair component (
   home-assistant.overridePythonAttrs (old: {