Merge pull request #125445 from mweinelt/home-assistant

2021-06-11 22:15:30 +02:00 · 2021-06-11 22:15:30 +02:00 · b73c304dce
commit b73c304dce
parent 2c31bc7f20 f8a97bf9d8
28 changed files with 363 additions and 104 deletions
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , cryptography
 , fetchFromGitHub
-, poetry
+, poetry-core
 , pytest-aiohttp
 , pytestCheckHook
 , pythonAtLeast
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "aiohomekit";
-  version = "0.2.62";
+  version = "0.2.67";
  format = "pyproject";
  disabled = pythonAtLeast "3.9";

@ -19,10 +19,12 @@ buildPythonPackage rec {
    owner = "Jc2k";
    repo = pname;
    rev = version;
-    sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs=";
+    sha256 = "04421p0dq7xh7rhx8ip177g2b91lhlc2yziqxbs9yxd1qyzwiqj1";
  };

-  nativeBuildInputs = [ poetry ];
+  nativeBuildInputs = [
+    poetry-core
+  ];

  propagatedBuildInputs = [
    cryptography
@ -34,11 +36,9 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  # Some test requires network access
-  disabledTests = [
-    "test_remove_pairing"
-    "test_pair"
-    "test_add_and_remove_pairings"
+  disabledTestPaths = [
+    # Tests require network access
+    "tests/test_ip_pairing.py"
  ];

  pythonImportsCheck = [ "aiohomekit" ];
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "aiohue";
-  version = "2.3.1";
+  version = "2.5.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm";
+    sha256 = "sha256-4q5JvkUmEoOomcwblXhvB/5Qdr6aMR0lDb4t4bjDjw8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/aiolyric/default.nix
+++ b/pkgs/development/python-modules/aiolyric/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "aiolyric";
-  version = "1.0.6";
+  version = "1.0.7";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "timmo001";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx";
+    sha256 = "sha256-3UyWUsamluJclwrQD+MuUPLhNJoNU4/8w1m92OLWyrg=";
  };

  propagatedBuildInputs = [ aiohttp ];
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "aiorecollect";
-  version = "1.0.4";
+  version = "1.0.5";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "bachya";
    repo = pname;
    rev = version;
-    sha256 = "sha256-A4qk7eo4maCRP4UmtWrRCPvG6YrLVSOiOcfN8pEj5Po=";
+    sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, getmac
+, pythonOlder
+, requests
+, zeroconf
+}:
+
+buildPythonPackage rec {
+  pname = "boschshcpy";
+  version = "0.2.18";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "tschamm";
+    repo = pname;
+    rev = version;
+    sha256 = "08bfg3g0hifjaa17d4zmws2ikbijdm0b98svgj8jdcl8v0nlqx69";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+    getmac
+    requests
+    zeroconf
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "boschshcpy" ];
+
+  meta = with lib; {
+    description = "Python module to work with the Bosch Smart Home Controller API";
+    homepage = "https://github.com/tschamm/boschshcpy";
+    license = with licenses; [ bsd3 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@ -1,20 +1,25 @@
-{ lib, fetchFromGitHub, buildPythonPackage, isPy27, requests }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, requests
+}:

 buildPythonPackage rec {
  pname = "bravia-tv";
-  version = "1.0.8";
-  disabled = isPy27;
+  version = "1.0.11";
+  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "dcnielsen90";
    repo = "python-bravia-tv";
    rev = "v${version}";
-    sha256 = "0djwy4z1y173q3mnbngp754yrwzmm6h3x0rshvrvd64b78x1bsmp";
+    sha256 = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U=";
  };

  propagatedBuildInputs = [ requests ];

-  # package does not include tests
+  # Package does not include tests
  doCheck = false;

  pythonImportsCheck = [ "bravia_tv" ];
--- a/pkgs/development/python-modules/garages-amsterdam/default.nix
+++ b/pkgs/development/python-modules/garages-amsterdam/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "garages-amsterdam";
-  version = "2.1.0";
+  version = "2.1.1";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "klaasnicolaas";
    repo = "garages_amsterdam";
    rev = version;
-    sha256 = "1lg66g0im6v0m294j82229n2b7bhs6kkrp0d9nh87k2rz7zgllil";
+    sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/gios/default.nix
+++ b/pkgs/development/python-modules/gios/default.nix
@ -0,0 +1,55 @@
+{ lib
+, aiohttp
+, aioresponses
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytest-error-for-skips
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "gios";
+  version = "1.0.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "bieniu";
+    repo = pname;
+    rev = version;
+    sha256 = "031z5j1j961pcw8s4ajj5z2xn2jxb2hyfn3x3bxbaagwl9a5qkvn";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  checkInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-error-for-skips
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "--cov --cov-report term-missing " ""
+    substituteInPlace setup.py \
+      --replace "pytest-runner" ""
+  '';
+
+  disabledTests = [
+    # Test requires network access
+    "test_invalid_station_id"
+  ];
+
+  pythonImportsCheck = [ "gios" ];
+
+  meta = with lib; {
+    description = "Python client for getting air quality data from GIOS";
+    homepage = "https://github.com/bieniu/gios";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/growattserver/default.nix
+++ b/pkgs/development/python-modules/growattserver/default.nix
@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "growattserver";
+  version = "1.0.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "indykoning";
+    repo = "PyPi_GrowattServer";
+    rev = version;
+    sha256 = "1vgb92axlz1kkszmamjbsqgi74afnbr2mc1np3pmbn3bx5rmk1d9";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  postPatch = ''
+    # https://github.com/indykoning/PyPi_GrowattServer/issues/2
+    substituteInPlace setup.py \
+      --replace "tag = os.environ['LATEST_TAG']" "" \
+      --replace "version=tag," 'version="${version}",'
+  '';
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "growattServer" ];
+
+  meta = with lib; {
+    description = "Python package to retrieve information from Growatt units";
+    homepage = "https://github.com/indykoning/PyPi_GrowattServer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/hap-python/default.nix
+++ b/pkgs/development/python-modules/hap-python/default.nix
@ -16,16 +16,16 @@
 }:

 buildPythonPackage rec {
-  pname = "HAP-python";
-  version = "3.4.1";
+  pname = "hap-python";
+  version = "3.5.0";
  disabled = pythonOlder "3.5";

  # pypi package does not include tests
  src = fetchFromGitHub {
    owner = "ikalchev";
-    repo = pname;
+    repo = "HAP-python";
    rev = "v${version}";
-    sha256 = "sha256-tZ6Zwlx5J62Xqpxxmt8Phdd9ngtKYhP/p3uor1dRfK8=";
+    sha256 = "1vzlfx0gpidl0rzv4z94pziwm6rj4lrilly5pykgq984y708pcqf";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/ismartgate/default.nix
+++ b/pkgs/development/python-modules/ismartgate/default.nix
@ -0,0 +1,60 @@
+{ lib
+, asynctest
+, buildPythonPackage
+, click
+, defusedxml
+, dicttoxml
+, fetchFromGitHub
+, httpx
+, pycryptodome
+, pytest-asyncio
+, pytest-raises
+, pytestCheckHook
+, pythonOlder
+, respx
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "ismartgate";
+  version = "4.0.1";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "bdraco";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1kxlcjnppsk8m93gfcpy3asig1frhp1k5rfqx3rszhkcxmni95m2";
+  };
+
+  propagatedBuildInputs = [
+    click
+    defusedxml
+    dicttoxml
+    httpx
+    pycryptodome
+    typing-extensions
+  ];
+
+  checkInputs = [
+    asynctest
+    pytest-asyncio
+    pytest-raises
+    pytestCheckHook
+    respx
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"pytest-runner>=5.2",' ""
+  '';
+
+  pythonImportsCheck = [ "ismartgate" ];
+
+  meta = with lib; {
+    description = "Python module to work with the ismartgate and gogogate2 API";
+    homepage = "https://github.com/bdraco/ismartgate";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "nexia";
-  version = "0.9.6";
+  version = "0.9.7";
  disabled = pythonOlder "3.5";

  src = fetchFromGitHub {
    owner = "bdraco";
    repo = pname;
    rev = version;
-    sha256 = "1k8h1p2zqm8gghff03jh8q3zik7jw2l686cyyg36r3qrgz6zi19q";
+    sha256 = "sha256-1oBrDr8QAUe6LLBliR/sNwDlLuisxOWPeI9sxuJtGxU=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "openhomedevice";
-  version = "1.0.0";
+  version = "2.0.1";
  disabled = pythonOlder "3.5";

  src = fetchFromGitHub {
    owner = "bazwilliams";
    repo = pname;
    rev = version;
-    sha256 = "04qdlyzc8xsk7qxyn9l59pbwnlw49zknw0r5lqwx402va12g4ra0";
+    sha256 = "sha256-BQgwXg15+xEGfPm0HJWpKXbNuCgc0VcAD5AuVSDXd8g=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@ -2,24 +2,26 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, aiohttp
 , oauthlib
 , requests
 , requests_oauthlib
 , freezegun
+, pytest-asyncio
 , pytestCheckHook
 , requests-mock
 }:

 buildPythonPackage rec {
  pname = "pyatmo";
-  version = "4.2.3";
+  version = "5.0.1";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "jabesq";
    repo = "pyatmo";
    rev = "v${version}";
-    sha256 = "sha256-hbs+1x/pwv00dhm+1Yj1effddJZHDjs2K3oeBmdCY+k=";
+    sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh";
  };

  postPatch = ''
@ -29,6 +31,7 @@ buildPythonPackage rec {
  '';

  propagatedBuildInputs = [
+    aiohttp
    oauthlib
    requests
    requests_oauthlib
@ -36,6 +39,7 @@ buildPythonPackage rec {

  checkInputs = [
    freezegun
+    pytest-asyncio
    pytestCheckHook
    requests-mock
  ];
--- a/pkgs/development/python-modules/pydroid-ipcam/default.nix
+++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "pydroid-ipcam";
-  version = "unstable-2021-04-16";
+  version = "unstable-2021-06-01";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "home-assistant-libs";
    repo = pname;
-    rev = "9f22682c6f9182aa5e42762f52223337b8b6909c";
-    sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6";
+    rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1";
+    sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "python-smarttub";
-  version = "0.0.24";
+  version = "0.0.25";
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "mdz";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-XWZbfPNZ1cPsDwtJRuOwIPTHmNBMzFSYHDDcbBrXjtk=";
+    sha256 = "13yf75vmn15g2hrbiv78mws96qbk40p5pz7vc6ljyp41y2lc9wpm";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@ -11,14 +11,14 @@
 }:

 buildPythonPackage rec {
-  pname = "pyroon";
+  pname = "roonapi";
  version = "0.0.37";
  format = "pyproject";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "pavoni";
-    repo = pname;
+    repo = "pyroon";
    rev = version;
    sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz";
  };
--- a/pkgs/development/python-modules/simplisafe-python/default.nix
+++ b/pkgs/development/python-modules/simplisafe-python/default.nix
@ -6,45 +6,37 @@
 , fetchFromGitHub
 , poetry-core
 , pytest-asyncio
-, pytest-cov
 , pytestCheckHook
-, python-engineio
-, python-socketio
 , pythonOlder
 , pytz
 , voluptuous
-, websockets
 }:

 buildPythonPackage rec {
  pname = "simplisafe-python";
-  version = "9.6.10";
+  version = "10.0.0";
  format = "pyproject";
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "bachya";
    repo = pname;
    rev = version;
-    sha256 = "0cc5kxxishxhkg1nqmgbh36yxs8yjfynmimzjnaqkqfrs9iq46mr";
+    sha256 = "sha256-VF8R+dty54GuWvYs/OqWhfGtOVieuxtfndQUxHhu5lc=";
  };

  nativeBuildInputs = [ poetry-core ];

  propagatedBuildInputs = [
    aiohttp
-    python-engineio
-    python-socketio
    pytz
    voluptuous
-    websockets
  ];

  checkInputs = [
    aresponses
    asynctest
    pytest-asyncio
-    pytest-cov
    pytestCheckHook
  ];

@ -52,6 +44,8 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "simplipy" ];

+  __darwinAllowLocalNetworking = true;
+
  meta = with lib; {
    description = "Python library the SimpliSafe API";
    homepage = "https://simplisafe-python.readthedocs.io/";
--- a/pkgs/development/python-modules/systembridge/default.nix
+++ b/pkgs/development/python-modules/systembridge/default.nix
@ -1,5 +1,6 @@
 { lib
 , aiohttp
+, websockets
 , buildPythonPackage
 , fetchFromGitHub
 }:
@ -17,6 +18,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    aiohttp
+    websockets
  ];

  # Project has no tests
--- a/pkgs/development/python-modules/venstarcolortouch/default.nix
+++ b/pkgs/development/python-modules/venstarcolortouch/default.nix
@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "venstarcolortouch";
-  version = "0.13";
+  version = "0.14";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "04y9gmxb0vsmc5c930x9ziis5v83b29kfzsgjlww3pssj69lmw1s";
+    sha256 = "sha256-wrsu1SffD4/RvDiE6yABfZN/oSDH8Ao/RJK7yL2QKy8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "xknx";
-  version = "0.18.3";
+  version = "0.18.4";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "XKNX";
    repo = pname;
    rev = version;
-    sha256 = "sha256-IXzmVAxxFOfU8ptixZLeyM64Fm1xSIlEDbR09f77JKM=";
+    sha256 = "sha256-gKt3VDPsHjd3QNqD63MY0Pe+eLR3YmKidoAE5lbqCZQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/zwave-js-server-python/default.nix
+++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "zwave-js-server-python";
-  version = "0.25.0";
+  version = "0.26.1";
  disabled = pythonOlder "3.8";


@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "home-assistant-libs";
    repo = pname;
    rev = version;
-    sha256 = "sha256-frhmyla3neFVZILDy7HnKloMqNLRjm3gxS88xZdu29w=";
+    sha256 = "1rh6wim5hr9lygvgria7lr6x61sdyrv3drrrirgv9p9gl3rxcj6m";
  };

  propagatedBuildInputs = [
--- 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.5.5";
+  version = "2021.6.3";
  components = {
    "abode" = ps: with ps; [ abodepy ];
    "accuweather" = ps: with ps; [ accuweather ];
@ -40,7 +40,7 @@
    "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
    "api" = ps: with ps; [ aiohttp-cors ];
    "apns" = ps: with ps; [ ]; # missing inputs: apns2
-    "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv pyroute2 zeroconf ];
+    "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr netdisco pyatv zeroconf ];
    "apprise" = ps: with ps; [ apprise ];
    "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib
    "aqualogic" = ps: with ps; [ aqualogic ];
@ -96,6 +96,7 @@
    "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
    "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
    "bond" = ps: with ps; [ ]; # missing inputs: bond-api
+    "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ];
    "braviatv" = ps: with ps; [ bravia-tv ];
    "broadlink" = ps: with ps; [ broadlink ];
    "brother" = ps: with ps; [ brother ];
@ -110,7 +111,7 @@
    "calendar" = ps: with ps; [ aiohttp-cors ];
    "camera" = ps: with ps; [ aiohttp-cors ];
    "canary" = ps: with ps; [ ha-ffmpeg py-canary ];
-    "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ];
+    "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ];
    "cert_expiry" = ps: with ps; [ ];
    "channels" = ps: with ps; [ pychannels ];
    "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
@ -156,7 +157,7 @@
    "deconz" = ps: with ps; [ pydeconz ];
    "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
    "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
-    "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ];
+    "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa ifaddr netdisco pillow scapy sqlalchemy zeroconf ];
    "delijn" = ps: with ps; [ pydelijn ];
    "deluge" = ps: with ps; [ deluge-client ];
    "demo" = ps: with ps; [ aiohttp-cors ];
@ -167,7 +168,7 @@
    "device_automation" = ps: with ps; [ ];
    "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
    "device_tracker" = ps: with ps; [ ];
-    "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api pyroute2 zeroconf ];
+    "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api ifaddr zeroconf ];
    "dexcom" = ps: with ps; [ pydexcom ];
    "dhcp" = ps: with ps; [ aiodiscover scapy ];
    "dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht
@ -177,7 +178,7 @@
    "directv" = ps: with ps; [ ]; # missing inputs: directv
    "discogs" = ps: with ps; [ discogs_client ];
    "discord" = ps: with ps; [ discordpy ];
-    "discovery" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ];
+    "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ];
    "dlib_face_detect" = ps: with ps; [ face_recognition ];
    "dlib_face_identify" = ps: with ps; [ face_recognition ];
    "dlink" = ps: with ps; [ ]; # missing inputs: pyW215
@ -197,7 +198,7 @@
    "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ];
    "dweet" = ps: with ps; [ ]; # missing inputs: dweepy
    "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
-    "dyson" = ps: with ps; [ aiohttp-cors libpurecool pyroute2 zeroconf ];
+    "dyson" = ps: with ps; [ aiohttp-cors ifaddr libpurecool zeroconf ];
    "eafm" = ps: with ps; [ aioeafm ];
    "ebox" = ps: with ps; [ ]; # missing inputs: pyebox
    "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
@ -234,7 +235,7 @@
    "epson" = ps: with ps; [ ]; # missing inputs: epson-projector
    "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter
    "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt
-    "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors pyroute2 zeroconf ];
+    "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ];
    "essent" = ps: with ps; [ ]; # missing inputs: PyEssent
    "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
    "eufy" = ps: with ps; [ ]; # missing inputs: lakeside
@ -256,7 +257,7 @@
    "fido" = ps: with ps; [ pyfido ];
    "file" = ps: with ps; [ ];
    "filesize" = ps: with ps; [ ];
-    "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+    "filter" = ps: with ps; [ sqlalchemy ];
    "fints" = ps: with ps; [ fints ];
    "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota
    "firmata" = ps: with ps; [ pymata-express ];
@ -264,7 +265,7 @@
    "fixer" = ps: with ps; [ fixerio ];
    "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist
    "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit
-    "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant
+    "flic" = ps: with ps; [ ]; # missing inputs: pyflic
    "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick
    "flo" = ps: with ps; [ aioflo ];
    "flock" = ps: with ps; [ ];
@ -282,7 +283,7 @@
    "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
    "freebox" = ps: with ps; [ freebox-api ];
    "freedns" = ps: with ps; [ ];
-    "fritz" = ps: with ps; [ fritzconnection xmltodict ];
+    "fritz" = ps: with ps; [ fritzconnection ];
    "fritzbox" = ps: with ps; [ pyfritzhome ];
    "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
    "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
@ -291,19 +292,20 @@
    "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
    "futurenow" = ps: with ps; [ pyfnip ];
    "garadget" = ps: with ps; [ ];
-    "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect
+    "garages_amsterdam" = ps: with ps; [ garages-amsterdam ];
+    "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect_aio
    "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
-    "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs
+    "gdacs" = ps: with ps; [ aio-georss-gdacs ];
    "generic" = ps: with ps; [ ];
-    "generic_thermostat" = ps: with ps; [ ];
+    "generic_thermostat" = ps: with ps; [ sqlalchemy ];
    "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
    "geo_json_events" = ps: with ps; [ geojson-client ];
    "geo_location" = ps: with ps; [ ];
-    "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client
+    "geo_rss_events" = ps: with ps; [ georss-generic-client ];
    "geofency" = ps: with ps; [ aiohttp-cors ];
    "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes
    "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano
-    "gios" = ps: with ps; [ ]; # missing inputs: gios
+    "gios" = ps: with ps; [ gios ];
    "github" = ps: with ps; [ PyGithub ];
    "gitlab_ci" = ps: with ps; [ python-gitlab ];
    "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy
@ -311,7 +313,7 @@
    "gntp" = ps: with ps; [ gntp ];
    "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
    "goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
-    "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
+    "gogogate2" = ps: with ps; [ ismartgate ];
    "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];
    "google_assistant" = ps: with ps; [ aiohttp-cors ];
    "google_cloud" = ps: with ps; [ google-cloud-texttospeech ];
@ -329,7 +331,7 @@
    "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
    "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
    "group" = ps: with ps; [ ];
-    "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer
+    "growatt_server" = ps: with ps; [ growattserver ];
    "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
    "gtfs" = ps: with ps; [ pygtfs ];
    "guardian" = ps: with ps; [ aioguardian ];
@ -348,15 +350,15 @@
    "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision
    "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1
    "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
-    "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+    "history_stats" = ps: with ps; [ sqlalchemy ];
    "hitron_coda" = ps: with ps; [ ];
    "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
    "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
    "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ];
    "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ];
    "homeassistant" = ps: with ps; [ ];
-    "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg pyroute2 zeroconf ];
-    "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors pyroute2 zeroconf ];
+    "homekit" = ps: with ps; [ hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg ifaddr zeroconf ];
+    "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ];
    "homematic" = ps: with ps; [ pyhomematic ];
    "homematicip_cloud" = ps: with ps; [ homematicip ];
    "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
@ -382,7 +384,7 @@
    "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
    "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
    "iglo" = ps: with ps; [ ]; # missing inputs: iglo
-    "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client
+    "ign_sismologia" = ps: with ps; [ georss-ign-sismologia-client ];
    "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk
    "image" = ps: with ps; [ aiohttp-cors pillow ];
    "image_processing" = ps: with ps; [ aiohttp-cors ];
@ -400,7 +402,7 @@
    "intent" = ps: with ps; [ aiohttp-cors ];
    "intent_script" = ps: with ps; [ ];
    "intesishome" = ps: with ps; [ pyintesishome ];
-    "ios" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ];
+    "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
    "iota" = ps: with ps; [ ]; # missing inputs: pyota
    "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
    "ipma" = ps: with ps; [ ]; # missing inputs: pyipma
@ -430,6 +432,7 @@
    "kodi" = ps: with ps; [ pykodi ];
    "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
    "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore
+    "kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi
    "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky
    "kwb" = ps: with ps; [ ]; # missing inputs: pykwb
    "lacrosse" = ps: with ps; [ pylacrosse ];
@ -438,12 +441,11 @@
    "lastfm" = ps: with ps; [ pylast ];
    "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches
    "lcn" = ps: with ps; [ pypck ];
-    "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant
+    "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast
    "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal
    "life360" = ps: with ps; [ ]; # missing inputs: life360
    "lifx" = ps: with ps; [ aiolifx aiolifx-effects ];
    "lifx_cloud" = ps: with ps; [ ];
-    "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights
    "light" = ps: with ps; [ ];
    "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave
    "limitlessled" = ps: with ps; [ limitlessled ];
@ -498,6 +500,7 @@
    "met_eireann" = ps: with ps; [ pymeteireann ];
    "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api
    "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi
+    "meteoclimatic" = ps: with ps; [ ]; # missing inputs: pymeteoclimatic
    "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
    "mfi" = ps: with ps; [ ]; # missing inputs: mficlient
    "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor
@ -540,8 +543,8 @@
    "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ];
    "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ];
    "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns
-    "n26" = ps: with ps; [ ]; # missing inputs: n26
    "nad" = ps: with ps; [ nad-receiver ];
+    "nam" = ps: with ps; [ ]; # missing inputs: nettigo-air-monitor
    "namecheapdns" = ps: with ps; [ defusedxml ];
    "nanoleaf" = ps: with ps; [ pynanoleaf ];
    "neato" = ps: with ps; [ aiohttp-cors pybotvac ];
@ -554,6 +557,7 @@
    "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
    "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
    "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio
+    "network" = ps: with ps; [ aiohttp-cors ifaddr ];
    "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio
    "nexia" = ps: with ps; [ nexia ];
    "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext
@ -583,7 +587,7 @@
    "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
    "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
    "obihai" = ps: with ps; [ pyobihai ];
-    "octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ];
+    "octoprint" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ];
    "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
    "ohmconnect" = ps: with ps; [ defusedxml ];
    "ombi" = ps: with ps; [ ]; # missing inputs: pyombi
@ -664,7 +668,7 @@
    "pyload" = ps: with ps; [ ];
    "python_script" = ps: with ps; [ restrictedpython ];
    "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent
-    "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client
+    "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ];
    "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats
    "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar
    "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
@ -701,7 +705,7 @@
    "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
    "roku" = ps: with ps; [ rokuecp ];
    "roomba" = ps: with ps; [ roombapy ];
-    "roon" = ps: with ps; [ pyroon ];
+    "roon" = ps: with ps; [ roonapi ];
    "route53" = ps: with ps; [ boto3 ];
    "rova" = ps: with ps; [ ]; # missing inputs: rova
    "rpi_camera" = ps: with ps; [ ];
@ -715,10 +719,10 @@
    "ruckus_unleashed" = ps: with ps; [ pyruckus ];
    "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
    "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
-    "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; # missing inputs: pysabnzbd
+    "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd
    "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ];
    "saj" = ps: with ps; [ ]; # missing inputs: pysaj
-    "samsungtv" = ps: with ps; [ samsungctl samsungtvws ];
+    "samsungtv" = ps: with ps; [ samsungctl samsungtvws wakeonlan ];
    "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
    "scene" = ps: with ps; [ ];
    "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
@ -732,7 +736,7 @@
    "sense" = ps: with ps; [ ]; # missing inputs: sense_energy
    "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
    "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
-    "sensor" = ps: with ps; [ ];
+    "sensor" = ps: with ps; [ sqlalchemy ];
    "sentry" = ps: with ps; [ sentry-sdk ];
    "serial" = ps: with ps; [ pyserial-asyncio ];
    "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor
@ -746,6 +750,7 @@
    "shodan" = ps: with ps; [ shodan ];
    "shopping_list" = ps: with ps; [ aiohttp-cors ];
    "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
+    "sia" = ps: with ps; [ ]; # missing inputs: pysiaalarm
    "sigfox" = ps: with ps; [ ];
    "sighthound" = ps: with ps; [ pillow simplehound ];
    "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
@ -785,18 +790,17 @@
    "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
    "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
    "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
-    "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch pyroute2 zeroconf ];
+    "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
    "spaceapi" = ps: with ps; [ aiohttp-cors ];
    "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
    "speedtestdotnet" = ps: with ps; [ speedtest-cli ];
    "spider" = ps: with ps; [ ]; # missing inputs: spiderpy
    "splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk
-    "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime
    "spotify" = ps: with ps; [ aiohttp-cors spotipy ];
    "sql" = ps: with ps; [ sqlalchemy ];
    "squeezebox" = ps: with ps; [ pysqueezebox ];
    "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy
-    "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco pyroute2 zeroconf ];
+    "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ];
    "starline" = ps: with ps; [ ]; # missing inputs: starline
    "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
    "startca" = ps: with ps; [ xmltodict ];
@ -821,11 +825,13 @@
    "switchbot" = ps: with ps; [ pyswitchbot ];
    "switcher_kis" = ps: with ps; [ aioswitcher ];
    "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
+    "syncthing" = ps: with ps; [ aiosyncthing ];
    "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
    "synology_chat" = ps: with ps; [ ];
    "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api
    "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
    "syslog" = ps: with ps; [ ];
+    "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ];
    "system_health" = ps: with ps; [ aiohttp-cors ];
    "system_log" = ps: with ps; [ aiohttp-cors ];
    "systemmonitor" = ps: with ps; [ psutil ];
@ -933,11 +939,12 @@
    "vultr" = ps: with ps; [ vultr ];
    "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32
    "wake_on_lan" = ps: with ps; [ wakeonlan ];
+    "wallbox" = ps: with ps; [ ]; # missing inputs: wallbox
    "waqi" = ps: with ps; [ waqiasync ];
    "water_heater" = ps: with ps; [ ];
    "waterfurnace" = ps: with ps; [ waterfurnace ];
    "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf
-    "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson
+    "watson_tts" = ps: with ps; [ ibm-watson ];
    "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ];
    "weather" = ps: with ps; [ ];
    "webhook" = ps: with ps; [ aiohttp-cors ];
@ -964,7 +971,7 @@
    "xbox_live" = ps: with ps; [ xboxapi ];
    "xeoma" = ps: with ps; [ pyxeoma ];
    "xiaomi" = ps: with ps; [ ha-ffmpeg ];
-    "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco pyroute2 zeroconf ];
+    "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors ifaddr netdisco zeroconf ];
    "xiaomi_miio" = ps: with ps; [ construct python-miio ];
    "xiaomi_tv" = ps: with ps; [ pymitv ];
    "xmpp" = ps: with ps; [ slixmpp ];
@ -980,10 +987,10 @@
    "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix
    "zamg" = ps: with ps; [ ];
    "zengge" = ps: with ps; [ ]; # missing inputs: zengge
-    "zeroconf" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ];
+    "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
    "zerproc" = ps: with ps; [ pyzerproc ];
    "zestimate" = ps: with ps; [ xmltodict ];
-    "zha" = ps: with ps; [ aiohttp-cors bellows pyroute2 pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
+    "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
    "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
    "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
    "zodiac" = ps: with ps; [ ];
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@ -3,6 +3,7 @@
 , fetchFromGitHub
 , python3
 , inetutils
+, tzdata
 , nixosTests

 # Look up dependencies of specified components in component-packages.nix
@ -21,7 +22,31 @@

 let
  defaultOverrides = [
-    # Override the version of some packages pinned in Home Assistant's setup.py
+    # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
+
+    # https://github.com/NixOS/nixpkgs/pull/125414
+    (mkOverride "flask" "2.0.1" "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w")
+    (mkOverride "itsdangerous" "2.0.1" "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly")
+    (mkOverride "jinja2" "3.0.1" "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh")
+    (mkOverride "markupsafe" "2.0.1" "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r")
+    (self: super: {
+      werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec {
+        version = "2.0.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x";
+        };
+        checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.pytest-xprocess ];
+        pytestFlagsArray = [ "-m 'not filterwarnings'" ];
+      });
+    })
+    (mkOverride "flask-restful" "0.3.9" "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c")
+    (self: super: {
+      debugpy = super.debugpy.overridePythonAttrs (oldAttrs: rec {
+        # tests fail with flask/werkezug>=2.0
+        doCheck = false;
+      });
+    })

    # Pinned due to API changes in iaqualink>=2.0, remove after
    # https://github.com/home-assistant/core/pull/48137 was merged
@ -43,6 +68,7 @@ let
      pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
        version = "1.7.1";
        src = oldAttrs.src.override {
+          inherit version;
          sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
        };
        disabledTests = [
@ -155,7 +181,7 @@ let
  extraBuildInputs = extraPackages py.pkgs;

  # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2021.5.5";
+  hassVersion = "2021.6.3";

 in with py.pkgs; buildPythonApplication rec {
  pname = "homeassistant";
@ -174,7 +200,7 @@ in with py.pkgs; buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    rev = version;
-    sha256 = "1vdxygjik1ay58xgyr1rk12cgy63raqi4fldnd4mlhs4i21c7ff8";
+    sha256 = "0n0g5kgyc9vhncdfi66lr9i42631rsigv2hzmnfal5jxgblh5736";
  };

  # leave this in, so users don't have to constantly update their downstream patch handling
@ -183,7 +209,8 @@ in with py.pkgs; buildPythonApplication rec {

  postPatch = ''
    substituteInPlace setup.py \
-      --replace "awesomeversion==21.2.3" "awesomeversion" \
+      --replace "attrs==21.2.0" "attrs" \
+      --replace "awesomeversion==21.4.0" "awesomeversion" \
      --replace "bcrypt==3.1.7" "bcrypt" \
      --replace "cryptography==3.3.2" "cryptography" \
      --replace "pip>=8.0.3,<20.3" "pip" \
@ -215,6 +242,8 @@ in with py.pkgs; buildPythonApplication rec {
    voluptuous
    voluptuous-serialize
    yarl
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    backports-zoneinfo
  ] ++ componentBuildInputs ++ extraBuildInputs;

  makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
@ -277,6 +306,7 @@ in with py.pkgs; buildPythonApplication rec {
    "blackbird"
    "blueprint"
    "bluetooth_le_tracker"
+    "bosch_shc"
    "braviatv"
    "broadlink"
    "brother"
@ -359,6 +389,8 @@ in with py.pkgs; buildPythonApplication rec {
    "geo_location"
    "geofency"
    "glances"
+    "gios"
+    "gogogate2"
    "google"
    "google_assistant"
    "google_domains"
@ -369,6 +401,7 @@ in with py.pkgs; buildPythonApplication rec {
    "gpslogger"
    "graphite"
    "group"
+    "growatt_server"
    "guardian"
    "harmony"
    "hassio"
@ -610,6 +643,7 @@ in with py.pkgs; buildPythonApplication rec {
    "uvc"
    "vacuum"
    "velbus"
+    "venstar"
    "vera"
    "verisure"
    "version"
@ -681,6 +715,8 @@ in with py.pkgs; buildPythonApplication rec {
    "--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_require_auth"
    # prometheus/test_init.py: Spurious AssertionError regarding humidifier_target_humidity_percent metric
    "--deselect tests/components/prometheus/test_init.py::test_view"
+    # smhi/test_init.py: Tries to fetch data from the network: socket.gaierror: [Errno -2] Name or service not known
+    "--deselect tests/components/smhi/test_init.py::test_remove_entry"
    # tests are located in tests/
    "tests"
    # dynamically add packages required for component tests
@ -725,6 +761,9 @@ in with py.pkgs; buildPythonApplication rec {
    # put ping binary into PATH, e.g. for wake_on_lan tests
    export PATH=${inetutils}/bin:$PATH

+    # set up zoneinfo data for backports-zoneinfo in pvpc_hourly_pricing tests
+    export PYTHONTZPATH="${tzdata}/share/zoneinfo"
+
    # error out when component test directory is missing, otherwise hidden by xdist execution :(
    for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do
      test -d "tests/components/$component" || {
--- 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 = "20210504.0";
+  version = "20210603.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-rNdqflWT8bmGHtAGGfq4xVxDcnK+EZU9qejRWQPJmUI=";
+    sha256 = "sha256-2UhbtaxEcOkD9Z5g9gZs+QjuVLXZGCEcmKoxRtIEYxw=";
  };

  # there is nothing to strip in this package
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@ -104,6 +104,7 @@ def dump_packages() -> Dict[str, Dict[str, str]]:
            "-qa",
            "-A",
            PKG_SET,
+            "--arg", "config", "{ allowAliases = false; }",
            "--json",
        ]
    )
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -36,6 +36,7 @@ mapAliases ({
  smart_open = smart-open; # added 2021-03-14
  google_api_python_client = google-api-python-client; # added 2021-03-19
  googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
+  HAP-python = hap-python; # added 2021-06-01
  MechanicalSoup = mechanicalsoup; # added 2021-06-01
  setuptools_scm = setuptools-scm; # added 2021-06-03
 })
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1124,6 +1124,8 @@ in {
    enablePython = true;
  });

+  boschshcpy = callPackage ../development/python-modules/boschshcpy { };
+
  boto3 = callPackage ../development/python-modules/boto3 { };

  boto = callPackage ../development/python-modules/boto { };
@ -2786,6 +2788,8 @@ in {

  gin-config = callPackage ../development/python-modules/gin-config { };

+  gios = callPackage ../development/python-modules/gios { };
+
  gipc = callPackage ../development/python-modules/gipc { };

  git-annex-adapter =
@ -3017,6 +3021,8 @@ in {

  gremlinpython = callPackage ../development/python-modules/gremlinpython { };

+  growattserver = callPackage ../development/python-modules/growattserver { };
+
  grip = callPackage ../development/python-modules/grip { };

  grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { };
@ -3104,7 +3110,7 @@ in {

  handout = callPackage ../development/python-modules/handout { };

-  HAP-python = callPackage ../development/python-modules/HAP-python { };
+  hap-python = callPackage ../development/python-modules/hap-python { };

  hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };

@ -3476,6 +3482,8 @@ in {

  iso3166 = callPackage ../development/python-modules/iso3166 { };

+  ismartgate = callPackage ../development/python-modules/ismartgate { };
+
  iso-639 = callPackage ../development/python-modules/iso-639 { };

  iso8601 = callPackage ../development/python-modules/iso8601 { };
@ -6257,8 +6265,6 @@ in {

  pyro-ppl = callPackage ../development/python-modules/pyro-ppl { };

-  pyroon = callPackage ../development/python-modules/pyroon { };
-
  pyroute2 = callPackage ../development/python-modules/pyroute2 { };

  pyroute2-core = callPackage ../development/python-modules/pyroute2-core { };
@ -7391,6 +7397,8 @@ in {

  roombapy = callPackage ../development/python-modules/roombapy { };

+  roonapi = callPackage ../development/python-modules/roonapi { };
+
  ronin = callPackage ../development/python-modules/ronin { };

  rope = callPackage ../development/python-modules/rope { };