git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140821 from NixOS/home-assistant
commita0382501f8086bdd70ed1ef34570e114a5b0073c authorMartin Weinelt <mweinelt@users.noreply.github.com> dateThu 7 Oct 2021, 10:52 (5 years ago) parent71dcb5e3b4b464
28 files changed+186−123
compare with master
unifiedsplit
pkgs/development/python-modules/aiodiscover/default.nix+2−2 pkgs/development/python-modules/aiohomekit/default.nix+2−2 pkgs/development/python-modules/aiohue/default.nix+2−2 pkgs/development/python-modules/aioshelly/default.nix+2−2 pkgs/development/python-modules/airthings/default.nix+39 pkgs/development/python-modules/bellows/default.nix+2−2 pkgs/development/python-modules/ciso8601/default.nix+8−4 pkgs/development/python-modules/demjson3/default.nix+31 pkgs/development/python-modules/hass-nabucasa/default.nix+2−2 pkgs/development/python-modules/netdisco/default.nix+7−2 pkgs/development/python-modules/pyatmo/default.nix+22−14 pkgs/development/python-modules/pycarwings2/default.nix+4−3 pkgs/development/python-modules/pydeconz/default.nix+2−2 pkgs/development/python-modules/pypoint/default.nix+2−2 pkgs/development/python-modules/pysyncthru/default.nix+4−4 pkgs/development/python-modules/python-smarttub/default.nix+2−3 pkgs/development/python-modules/python-tado/default.nix+2−2 pkgs/development/python-modules/pyvicare/default.nix+2−2 pkgs/development/python-modules/streamlabswater/default.nix+5−7 pkgs/development/python-modules/surepy/default.nix+2−2 pkgs/development/python-modules/twilio/default.nix+2−2 pkgs/development/python-modules/zha-quirks/default.nix+2−2 pkgs/development/python-modules/zigpy/default.nix+2−2 pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2 pkgs/servers/home-assistant/component-packages.nix+22−19 pkgs/servers/home-assistant/default.nix+6−35 pkgs/servers/home-assistant/frontend.nix+2−2 pkgs/top-level/python-packages.nix+4
pkgs/development/python-modules/aiodiscover/default.nix+2−2
@@ -11,14 +11,14 @@
1111
1212buildPythonPackage rec {
1313 pname = "aiodiscover";
14− version = "1.4.2";
14+ version = "1.4.4";
1515 disabled = pythonOlder "3.7";
1616
1717 src = fetchFromGitHub {
1818 owner = "bdraco";
1919 repo = pname;
2020 rev = "v${version}";
21− sha256 = "sha256-xiIN/YLIOdPuqenyxybu0iUpYEy3MyBssXswza5InU0=";
21+ sha256 = "sha256-DobTx6oUr25J8bolo84V4yTT0b0jBsOIzPn93uAmDl0=";
2222 };
2323
2424 propagatedBuildInputs = [
pkgs/development/python-modules/aiohomekit/default.nix+2−2
@@ -12,14 +12,14 @@
1212
1313buildPythonPackage rec {
1414 pname = "aiohomekit";
15− version = "0.6.2";
15+ version = "0.6.3";
1616 format = "pyproject";
1717
1818 src = fetchFromGitHub {
1919 owner = "Jc2k";
2020 repo = pname;
2121 rev = version;
22− sha256 = "16lfav83g12vzs3ssfva7chcqqb7xdx54djwfwyn9xcwfaa7cwhw";
22+ sha256 = "sha256-XBinbhYUB9BuQxxmWfZUw276uNam4DgBpiCAjT7KDlg=";
2323 };
2424
2525 nativeBuildInputs = [
pkgs/development/python-modules/aiohue/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "aiohue";
9− version = "2.6.1";
9+ version = "2.6.3";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0101bw2n6vd3c0p323qqr61wwraja48xbrwcw5sn7i5sa3ygfx0k";
13+ sha256 = "sha256-zpwkDKPrE5TFZQO0A1ifTQ7n+TRFpXi3jai3h5plyGM=";
1414 };
1515
1616 propagatedBuildInputs = [
pkgs/development/python-modules/aioshelly/default.nix+2−2
@@ -7,13 +7,13 @@
77
88buildPythonPackage rec {
99 pname = "aioshelly";
10− version = "0.6.4";
10+ version = "1.0.2";
1111
1212 src = fetchFromGitHub {
1313 owner = "home-assistant-libs";
1414 repo = pname;
1515 rev = version;
16− sha256 = "sha256-QRCqkaKhPQQjNt9mw8nlTB5YKLmIZbXfrxarb3Ksr5k=";
16+ sha256 = "sha256-STJ9BDVbvlIMvKMiGwkGZ9Z32NvlE+3cyYduYlwTbx4=";
1717 };
1818
1919 propagatedBuildInputs = [
pkgs/development/python-modules/airthings/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib
2+, aiohttp
3+, async-timeout
4+, buildPythonPackage
5+, fetchFromGitHub
6+, pythonOlder
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "airthings";
11+ version = "0.0.1";
12+ format = "setuptools";
13+
14+ disabled = pythonOlder "3.8";
15+
16+ src = fetchFromGitHub {
17+ owner = "Danielhiversen";
18+ repo = "pyAirthings";
19+ rev = version;
20+ sha256 = "08cbysx5p9k8hzr6sdykx91j0gx8x15b8807338dsl3qx8nhfb8j";
21+ };
22+
23+ propagatedBuildInputs = [
24+ aiohttp
25+ async-timeout
26+ ];
27+
28+ # Project has no tests
29+ doCheck = false;
30+
31+ pythonImportsCheck = [ "airthings" ];
32+
33+ meta = with lib; {
34+ description = "Python module for Airthings";
35+ homepage = "https://github.com/Danielhiversen/pyAirthings";
36+ license = with licenses; [ mit ];
37+ maintainers = with maintainers; [ fab ];
38+ };
39+}
pkgs/development/python-modules/bellows/default.nix+2−2
@@ -17,13 +17,13 @@
1717
1818buildPythonPackage rec {
1919 pname = "bellows";
20− version = "0.27.0";
20+ version = "0.28.0";
2121
2222 src = fetchFromGitHub {
2323 owner = "zigpy";
2424 repo = "bellows";
2525 rev = version;
26− sha256 = "sha256-lsGpCd4XgwP91JmRpV6ohXefd1Hm9C51Jk4shU6Irkw=";
26+ sha256 = "sha256-j1vS6PDvvuJapECn0lKGuBkYwWsyzJaTZDRQPjMsuLk=";
2727 };
2828
2929 propagatedBuildInputs = [
pkgs/development/python-modules/ciso8601/default.nix+8−4
@@ -8,23 +8,27 @@
88
99buildPythonPackage rec {
1010 pname = "ciso8601";
11− version = "2.1.3";
11+ version = "2.2.0";
1212
1313 src = fetchFromGitHub {
1414 owner = "closeio";
1515 repo = "ciso8601";
1616 rev = "v${version}";
17− sha256 = "0g1aiyc1ayh0rnibyy416m5mmck38ksgdm3jsy0z3rxgmgb24951";
17+ sha256 = "sha256-TqB1tQDgCkXu+QuzP6yBEH/xHxhhD/kGR2S0I8Osc5E=";
1818 };
1919
2020 checkInputs = [
2121 pytz
22− ] ++ lib.optional (isPy27) unittest2;
22+ ] ++ lib.optional (isPy27) [
23+ unittest2
24+ ];
25+
26+ pythonImportsCheck = [ "ciso8601" ];
2327
2428 meta = with lib; {
2529 description = "Fast ISO8601 date time parser for Python written in C";
2630 homepage = "https://github.com/closeio/ciso8601";
2731 license = licenses.mit;
28− maintainers = [ maintainers.mic92 ];
32+ maintainers = with maintainers; [ mic92 ];
2933 };
3034}
pkgs/development/python-modules/demjson3/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib
2+, python
3+, buildPythonPackage
4+, fetchPypi
5+, pythonOlder
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "demjson3";
10+ version = "3.0.5";
11+
12+ disabled = pythonOlder "3.6";
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "103dc4pzwg8791q3zll1vv4gcc17d9v3jvr9zj23cpv9hpfsp6mb";
17+ };
18+
19+ checkPhase = ''
20+ ${python.interpreter} test/test_demjson3.py
21+ '';
22+
23+ pythonImportsCheck = [ "demjson3" ];
24+
25+ meta = with lib; {
26+ description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
27+ homepage = "https://github.com/nielstron/demjson3/";
28+ license = licenses.lgpl3Plus;
29+ maintainers = with maintainers; [ fab ];
30+ };
31+}
pkgs/development/python-modules/hass-nabucasa/default.nix+2−2
@@ -15,13 +15,13 @@
1515
1616buildPythonPackage rec {
1717 pname = "hass-nabucasa";
18− version = "0.46.0";
18+ version = "0.50.0";
1919
2020 src = fetchFromGitHub {
2121 owner = "nabucasa";
2222 repo = pname;
2323 rev = version;
24− sha256 = "109ma1qlhifj5hs530zfnvc6mqv5grfmcq3s57wawq9nzq0gpfy8";
24+ sha256 = "sha256-0E8eiHzqbxHbtAd97MbvFMRDWTu25E9x/44oNGC4mUM=";
2525 };
2626
2727 propagatedBuildInputs = [
pkgs/development/python-modules/netdisco/default.nix+7−2
@@ -2,19 +2,24 @@
22
33buildPythonPackage rec {
44 pname = "netdisco";
5− version = "2.9.0";
5+ version = "3.0.0";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "sha256-OpLFM+0ZmhggJ1SuLoSO+qWLcKcpS65sd7u2zkzPys4=";
11+ sha256 = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I=";
1212 };
1313
1414 propagatedBuildInputs = [ requests zeroconf ];
1515
1616 checkInputs = [ pytestCheckHook ];
1717
18+ disabledTestPaths = [
19+ # Broken due to removed discoverables in https://github.com/home-assistant-libs/netdisco/commit/477db5a1dc93919a6c5bd61b4b1d3c80e75785bd
20+ "tests/test_xboxone.py"
21+ ];
22+
1823 pythonImportsCheck = [
1924 "netdisco"
2025 "netdisco.discovery"
pkgs/development/python-modules/pyatmo/default.nix+22−14
@@ -1,35 +1,37 @@
11{ lib
2+, aiohttp
23, buildPythonPackage
3−, pythonOlder
44, fetchFromGitHub
5−, aiohttp
6−, oauthlib
7−, requests
8−, requests_oauthlib
95, freezegun
6+, oauthlib
107, pytest-asyncio
118, pytest-mock
129, pytestCheckHook
10+, pythonOlder
11+, requests
12+, requests_oauthlib
1313, requests-mock
14+, setuptools-scm
1415}:
1516
1617buildPythonPackage rec {
1718 pname = "pyatmo";
18− version = "5.2.3";
19− disabled = pythonOlder "3.7";
19+ version = "6.1.0";
20+
21+ disabled = pythonOlder "3.8";
2022
2123 src = fetchFromGitHub {
2224 owner = "jabesq";
2325 repo = "pyatmo";
2426 rev = "v${version}";
25− sha256 = "1w9rhh85z9m3c4rbz6zxlrxglsm5sk5d6796dsj1p1l3b3ad476z";
27+ sha256 = "sha256-Iscnv3hfYa8QFiXMUN334Muo0oGqnnK11RPNxQJggG0=";
2628 };
2729
28− postPatch = ''
29− substituteInPlace setup.cfg \
30− --replace "oauthlib~=3.1" "oauthlib" \
31− --replace "requests~=2.24" "requests"
32− '';
30+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
31+
32+ nativeBuildInputs = [
33+ setuptools-scm
34+ ];
3335
3436 propagatedBuildInputs = [
3537 aiohttp
@@ -46,12 +48,18 @@ buildPythonPackage rec {
4648 requests-mock
4749 ];
4850
51+ postPatch = ''
52+ substituteInPlace setup.cfg \
53+ --replace "oauthlib~=3.1" "oauthlib" \
54+ --replace "requests~=2.24" "requests"
55+ '';
56+
4957 pythonImportsCheck = [ "pyatmo" ];
5058
5159 meta = with lib; {
5260 description = "Simple API to access Netatmo weather station data";
61+ homepage = "https://github.com/jabesq/pyatmo";
5362 license = licenses.mit;
54− homepage = "https://github.com/jabesq/netatmo-api-python";
5563 maintainers = with maintainers; [ delroth ];
5664 };
5765}
pkgs/development/python-modules/pycarwings2/default.nix+4−3
@@ -11,7 +11,7 @@
1111
1212buildPythonPackage rec {
1313 pname = "pycarwings2";
14− version = "2.11";
14+ version = "2.12";
1515 format = "setuptools";
1616
1717 disabled = pythonOlder "3.5";
@@ -19,8 +19,9 @@ buildPythonPackage rec {
1919 src = fetchFromGitHub {
2020 owner = "filcole";
2121 repo = pname;
22− rev = "v${version}";
23− sha256 = "0daqxnic7kphspqqq8a0bjp009l5a7d1k72q6cz43g7ca6wfq4b1";
22+ # release not tagged: https://github.com/filcole/pycarwings2/issues/33
23+ rev = "0dc9e7e74cb119614c72c7f955801a366f303c56";
24+ sha256 = "sha256-3lyAgLuaNrCDvRT2yYkgaDiLPKW9Hbg05cQlMIBUs6o=";
2425 };
2526
2627 propagatedBuildInputs = [
pkgs/development/python-modules/pydeconz/default.nix+2−2
@@ -10,14 +10,14 @@
1010
1111buildPythonPackage rec {
1212 pname = "pydeconz";
13− version = "83";
13+ version = "84";
1414 disabled = pythonOlder "3.7";
1515
1616 src = fetchFromGitHub {
1717 owner = "Kane610";
1818 repo = "deconz";
1919 rev = "v${version}";
20− sha256 = "0azpdgmfby8plsp22hy1ip9vzbnmvf9brmah7hcwkpypg31rb61y";
20+ sha256 = "sha256-SVWz6r5UiAS7gCpkgN2Swy8dAon26XY9JZucV/eE0t8=";
2121 };
2222
2323 propagatedBuildInputs = [
pkgs/development/python-modules/pypoint/default.nix+2−2
@@ -7,13 +7,13 @@
77
88buildPythonPackage rec {
99 pname = "pypoint";
10− version = "2.1.0";
10+ version = "2.2.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "fredrike";
1414 repo = "pypoint";
1515 rev = "v${version}";
16− sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x";
16+ sha256 = "sha256-2PKZtn+l93de4/gPPM2Wdt04Zw+ekDadwNgL6ZKTqhY=";
1717 };
1818
1919 propagatedBuildInputs = [
pkgs/development/python-modules/pysyncthru/default.nix+4−4
@@ -3,13 +3,13 @@
33, buildPythonPackage
44, fetchFromGitHub
55, aiohttp
6−, demjson
6+, demjson3
77, python
88}:
99
1010buildPythonPackage rec {
1111 pname = "pysyncthru";
12− version = "0.7.8";
12+ version = "0.7.10";
1313
1414 disabled = isPy27;
1515
@@ -17,12 +17,12 @@ buildPythonPackage rec {
1717 owner = "nielstron";
1818 repo = "pysyncthru";
1919 rev = "release-${version}";
20− sha256 = "17k9dhnya4304gqmkyvvf94jvikmnkf2lqairl3rfrl7w68jm3vp";
20+ sha256 = "1c29w2ldrnq0vxr9cfa2pjhwdvrpw393c84khgg2y56jrkbidq53";
2121 };
2222
2323 propagatedBuildInputs = [
2424 aiohttp
25− demjson
25+ demjson3
2626 ];
2727
2828 checkPhase = ''
pkgs/development/python-modules/python-smarttub/default.nix+2−3
@@ -13,14 +13,14 @@
1313
1414buildPythonPackage rec {
1515 pname = "python-smarttub";
16− version = "0.0.25";
16+ version = "0.0.27";
1717 disabled = pythonOlder "3.8";
1818
1919 src = fetchFromGitHub {
2020 owner = "mdz";
2121 repo = pname;
2222 rev = "v${version}";
23− sha256 = "13yf75vmn15g2hrbiv78mws96qbk40p5pz7vc6ljyp41y2lc9wpm";
23+ sha256 = "sha256-EoZn5yxj18hi4oEMuUcB5UN2xQFkLbSG/awp+Qh029E=";
2424 };
2525
2626 propagatedBuildInputs = [
@@ -43,6 +43,5 @@ buildPythonPackage rec {
4343 homepage = "https://github.com/mdz/python-smarttub";
4444 license = with licenses; [ mit ];
4545 maintainers = with maintainers; [ fab ];
46− broken = pyjwt.version != "1.7.1";
4746 };
4847}
pkgs/development/python-modules/python-tado/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "python-tado";
5− version = "0.11.0";
5+ version = "0.12.0";
66
77 disabled = pythonOlder "3.5";
88
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 owner = "wmalgadey";
1111 repo = "PyTado";
1212 rev = version;
13− sha256 = "0fw4f9gqnhxwpxyb34qi8bl5pmzz13h4x3mdk903hhjyccanqncr";
13+ sha256 = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ=";
1414 };
1515
1616 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pyvicare/default.nix+2−2
@@ -10,14 +10,14 @@
1010
1111buildPythonPackage rec {
1212 pname = "pyvicare";
13− version = "2.8.1";
13+ version = "2.9.1";
1414 disabled = pythonOlder "3.7";
1515
1616 src = fetchFromGitHub {
1717 owner = "somm15";
1818 repo = "PyViCare";
1919 rev = version;
20− sha256 = "sha256-SmbsEN6vZ28ihgUggtcF2AjbmUVaqLLweh7cKipr6u4=";
20+ sha256 = "sha256-Uzz2mWBT5BaMxYeR6YFIP1BqTWye1Hz9CTTg/bg4kSU=";
2121 };
2222
2323 SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/streamlabswater/default.nix+5−7
@@ -1,22 +1,20 @@
11{ lib
22, buildPythonPackage
3−, fetchFromGitHub
3+, fetchPypi
44, pythonOlder
55, requests
66}:
77
88buildPythonPackage rec {
99 pname = "streamlabswater";
10− version = "0.3.2";
10+ version = "1.0.1";
1111 format = "setuptools";
1212
1313 disabled = pythonOlder "3.6";
1414
15− src = fetchFromGitHub {
16− owner = pname;
17− repo = "stream-python";
18− rev = "v${version}";
19− sha256 = "1lh1i1ksic9yhxnwc7mqm5qla98x85dfwj846kwldwam0vcrqlk7";
15+ src = fetchPypi {
16+ inherit pname version;
17+ sha256 = "sha256-kXG0Wg3PVryMBQ9RMMtEzudMiwVQq7Ikw2OK7JcBojA=";
2018 };
2119
2220 propagatedBuildInputs = [
pkgs/development/python-modules/surepy/default.nix+2−2
@@ -18,7 +18,7 @@
1818
1919buildPythonPackage rec {
2020 pname = "surepy";
21− version = "0.7.1";
21+ version = "0.7.2";
2222 format = "pyproject";
2323 disabled = pythonOlder "3.8";
2424
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626 owner = "benleb";
2727 repo = pname;
2828 rev = "v${version}";
29− sha256 = "sha256-h2PEzS3R7NXIUWYOiTpe5ZEU1RopaRj1phudmvcklug=";
29+ sha256 = "sha256-yc+jXA4ndFhRZmFPz11HbVs9qaPFNa6WdwXj6hRyjw4=";
3030 };
3131
3232 postPatch = ''
pkgs/development/python-modules/twilio/default.nix+2−2
@@ -12,14 +12,14 @@
1212
1313buildPythonPackage rec {
1414 pname = "twilio";
15− version = "6.56.0";
15+ version = "7.1.0";
1616
1717
1818 src = fetchFromGitHub {
1919 owner = "twilio";
2020 repo = "twilio-python";
2121 rev = version;
22− sha256 = "sha256-vVJuuPxVyOqnplPYrjCjIm5IyIFZvsCMoDLrrHpHK+4=";
22+ sha256 = "sha256-pagqetDQ8/1xDCxZJVTZc9T0dmFA1opd7tMDR11wlVs=";
2323 };
2424
2525 propagatedBuildInputs = [
pkgs/development/python-modules/zha-quirks/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010buildPythonPackage rec {
1111 pname = "zha-quirks";
12− version = "0.0.61";
12+ version = "0.0.62";
1313
1414 src = fetchFromGitHub {
1515 owner = "zigpy";
1616 repo = "zha-device-handlers";
1717 rev = version;
18− sha256 = "sha256-uDQAXH0p8Ly0ZbwNlkVo1b7fAXSu77U7v3BHd0B1YQk=";
18+ sha256 = "sha256-wXXdxE69EABrvJA8utrhLW4+8ixcyCraWHx2M3uE8mw=";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/development/python-modules/zigpy/default.nix+2−2
@@ -15,13 +15,13 @@
1515
1616buildPythonPackage rec {
1717 pname = "zigpy";
18− version = "0.37.1";
18+ version = "0.38.0";
1919
2020 src = fetchFromGitHub {
2121 owner = "zigpy";
2222 repo = "zigpy";
2323 rev = version;
24− sha256 = "sha256-tDpu6tv8qwIPB3G5GKURtDi6QOYxF5jEVbzmJ2Px5W4=";
24+ sha256 = "sha256-3iS2VMaicbgtsiKUPe6GjFJQV8xKjs+dC8+IeprMa9I=";
2525 };
2626
2727 propagatedBuildInputs = [
pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2
@@ -9,7 +9,7 @@
99
1010buildPythonPackage rec {
1111 pname = "zwave-js-server-python";
12− version = "0.30.0";
12+ version = "0.31.3";
1313 disabled = pythonOlder "3.8";
1414
1515
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 owner = "home-assistant-libs";
1818 repo = pname;
1919 rev = version;
20− sha256 = "sha256-KYMq0qDVLHzgaYljwYeK58aggD5kBAI1J/RsirGcVvs=";
20+ sha256 = "sha256-mOcaxt8pc+d7qBoDtwCsDWoVs3Hw17v5WDKgzIW1WzY=";
2121 };
2222
2323 propagatedBuildInputs = [
pkgs/servers/home-assistant/component-packages.nix+22−19
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "2021.9.7";
5+ version = "2021.10.0";
66 components = {
77 "abode" = ps: with ps; [ abodepy ];
88 "accuweather" = ps: with ps; [ accuweather ];
@@ -19,6 +19,7 @@
1919 "air_quality" = ps: with ps; [ ];
2020 "airly" = ps: with ps; [ airly ];
2121 "airnow" = ps: with ps; [ pyairnow ];
22+ "airthings" = ps: with ps; [ ]; # missing inputs: airthings_cloud
2223 "airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi
2324 "airvisual" = ps: with ps; [ pyairvisual ];
2425 "aladdin_connect" = ps: with ps; [ aladdin-connect ];
@@ -30,6 +31,7 @@
3031 "alpha_vantage" = ps: with ps; [ alpha-vantage ];
3132 "amazon_polly" = ps: with ps; [ boto3 ];
3233 "ambee" = ps: with ps; [ ambee ];
34+ "amberelectric" = ps: with ps; [ amberelectric ];
3335 "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ];
3436 "ambient_station" = ps: with ps; [ aioambient ];
3537 "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
@@ -43,7 +45,7 @@
4345 "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
4446 "api" = ps: with ps; [ aiohttp-cors ];
4547 "apns" = ps: with ps; [ ]; # missing inputs: apns2
46− "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr netdisco pyatv zeroconf ];
48+ "apple_tv" = ps: with ps; [ pyatv ];
4749 "apprise" = ps: with ps; [ apprise ];
4850 "aprs" = ps: with ps; [ aprslib geopy ];
4951 "aqualogic" = ps: with ps; [ aqualogic ];
@@ -149,6 +151,7 @@
149151 "cover" = ps: with ps; [ ];
150152 "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
151153 "cpuspeed" = ps: with ps; [ py-cpuinfo ];
154+ "crownstone" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; # missing inputs: crownstone-cloud crownstone-sse crownstone-uart
152155 "cups" = ps: with ps; [ pycups ];
153156 "currencylayer" = ps: with ps; [ ];
154157 "daikin" = ps: with ps; [ pydaikin ];
@@ -160,7 +163,7 @@
160163 "deconz" = ps: with ps; [ pydeconz ];
161164 "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
162165 "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
163− "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client defusedxml emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ];
166+ "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ];
164167 "delijn" = ps: with ps; [ pydelijn ];
165168 "deluge" = ps: with ps; [ deluge-client ];
166169 "demo" = ps: with ps; [ aiohttp-cors ];
@@ -185,7 +188,7 @@
185188 "dlib_face_detect" = ps: with ps; [ face_recognition ];
186189 "dlib_face_identify" = ps: with ps; [ face_recognition ];
187190 "dlink" = ps: with ps; [ ]; # missing inputs: pyW215
188− "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr ];
191+ "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
189192 "dnsip" = ps: with ps; [ aiodns ];
190193 "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi
191194 "doods" = ps: with ps; [ pillow pydoods ];
@@ -213,7 +216,7 @@
213216 "edimax" = ps: with ps; [ pyedimax ];
214217 "edl21" = ps: with ps; [ pysml ];
215218 "ee_brightbox" = ps: with ps; [ eebrightbox ];
216− "efergy" = ps: with ps; [ ];
219+ "efergy" = ps: with ps; [ ]; # missing inputs: pyefergy
217220 "egardia" = ps: with ps; [ pythonegardia ];
218221 "eight_sleep" = ps: with ps; [ pyeight ];
219222 "elgato" = ps: with ps; [ elgato ];
@@ -224,7 +227,7 @@
224227 "emoncms" = ps: with ps; [ ];
225228 "emoncms_history" = ps: with ps; [ ];
226229 "emonitor" = ps: with ps; [ aioemonitor ];
227− "emulated_hue" = ps: with ps; [ aiohttp-cors ];
230+ "emulated_hue" = ps: with ps; [ aiohttp-cors ifaddr ];
228231 "emulated_kasa" = ps: with ps; [ sense-energy ];
229232 "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ];
230233 "energy" = ps: with ps; [ aiohttp-cors sqlalchemy ];
@@ -527,7 +530,7 @@
527530 "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ];
528531 "mochad" = ps: with ps; [ ]; # missing inputs: pymochad
529532 "modbus" = ps: with ps; [ pymodbus ];
530− "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem
533+ "modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ];
531534 "modern_forms" = ps: with ps; [ aiomodernforms ];
532535 "mold_indicator" = ps: with ps; [ ];
533536 "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
@@ -555,7 +558,7 @@
555558 "nad" = ps: with ps; [ nad-receiver ];
556559 "nam" = ps: with ps; [ nettigo-air-monitor ];
557560 "namecheapdns" = ps: with ps; [ defusedxml ];
558− "nanoleaf" = ps: with ps; [ pynanoleaf ];
561+ "nanoleaf" = ps: with ps; [ aionanoleaf ];
559562 "neato" = ps: with ps; [ aiohttp-cors pybotvac ];
560563 "nederlandse_spoorwegen" = ps: with ps; [ nsapi ];
561564 "nello" = ps: with ps; [ pynello ];
@@ -802,7 +805,7 @@
802805 "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ];
803806 "sonarr" = ps: with ps; [ sonarr ];
804807 "songpal" = ps: with ps; [ python-songpal ];
805− "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ];
808+ "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco zeroconf ];
806809 "sony_projector" = ps: with ps; [ pysdcp ];
807810 "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
808811 "spaceapi" = ps: with ps; [ aiohttp-cors ];
@@ -814,7 +817,7 @@
814817 "sql" = ps: with ps; [ sqlalchemy ];
815818 "squeezebox" = ps: with ps; [ pysqueezebox ];
816819 "srp_energy" = ps: with ps; [ srpenergy ];
817− "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ];
820+ "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
818821 "starline" = ps: with ps; [ starline ];
819822 "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
820823 "startca" = ps: with ps; [ xmltodict ];
@@ -867,7 +870,6 @@
867870 "temper" = ps: with ps; [ ]; # missing inputs: temperusb
868871 "template" = ps: with ps; [ ];
869872 "tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official
870− "tesla" = ps: with ps; [ teslajsonpy ];
871873 "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
872874 "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke
873875 "thethingsnetwork" = ps: with ps; [ ];
@@ -889,11 +891,10 @@
889891 "torque" = ps: with ps; [ aiohttp-cors ];
890892 "totalconnect" = ps: with ps; [ total-connect-client ];
891893 "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline
892− "tplink" = ps: with ps; [ pyhs100 ];
894+ "tplink" = ps: with ps; [ aiohttp-cors ifaddr python-kasa ];
893895 "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
894896 "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar
895897 "trace" = ps: with ps; [ ];
896− "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr
897898 "tractive" = ps: with ps; [ aiotractive ];
898899 "tradfri" = ps: with ps; [ pytradfri ];
899900 "trafikverket_train" = ps: with ps; [ pytrafikverket ];
@@ -903,7 +904,7 @@
903904 "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy
904905 "trend" = ps: with ps; [ numpy ];
905906 "tts" = ps: with ps; [ aiohttp-cors mutagen ];
906− "tuya" = ps: with ps; [ tuyaha ];
907+ "tuya" = ps: with ps; [ tuya-iot-py-sdk ];
907908 "twentemilieu" = ps: with ps; [ twentemilieu ];
908909 "twilio" = ps: with ps; [ aiohttp-cors twilio ];
909910 "twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
@@ -922,7 +923,7 @@
922923 "upc_connect" = ps: with ps; [ connect-box ];
923924 "upcloud" = ps: with ps; [ upcloud-api ];
924925 "updater" = ps: with ps; [ ];
925− "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ];
926+ "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
926927 "uptime" = ps: with ps; [ ];
927928 "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
928929 "usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ];
@@ -933,7 +934,7 @@
933934 "vacuum" = ps: with ps; [ ];
934935 "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api
935936 "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
936− "velbus" = ps: with ps; [ python-velbus ];
937+ "velbus" = ps: with ps; [ velbus-aio ];
937938 "velux" = ps: with ps; [ pyvlx ];
938939 "venstar" = ps: with ps; [ venstarcolortouch ];
939940 "vera" = ps: with ps; [ pyvera ];
@@ -961,12 +962,14 @@
961962 "waterfurnace" = ps: with ps; [ waterfurnace ];
962963 "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf
963964 "watson_tts" = ps: with ps; [ ibm-watson ];
965+ "watttime" = ps: with ps; [ aiowatttime ];
964966 "waze_travel_time" = ps: with ps; [ wazeroutecalculator ];
965967 "weather" = ps: with ps; [ ];
966968 "webhook" = ps: with ps; [ aiohttp-cors ];
967969 "webostv" = ps: with ps; [ aiopylgtv ];
968970 "websocket_api" = ps: with ps; [ aiohttp-cors ];
969971 "wemo" = ps: with ps; [ pywemo ];
972+ "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ];
970973 "whois" = ps: with ps; [ python-whois ];
971974 "wiffi" = ps: with ps; [ wiffi ];
972975 "wilight" = ps: with ps; [ pywilight ];
@@ -993,7 +996,7 @@
993996 "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client
994997 "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ];
995998 "yamaha" = ps: with ps; [ rxv ];
996− "yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client defusedxml ifaddr zeroconf ];
999+ "yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client ifaddr zeroconf ];
9971000 "yandex_transport" = ps: with ps; [ aioymaps ];
9981001 "yandextts" = ps: with ps; [ ];
9991002 "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight ];
@@ -1006,13 +1009,13 @@
10061009 "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
10071010 "zerproc" = ps: with ps; [ pyzerproc ];
10081011 "zestimate" = ps: with ps; [ xmltodict ];
1009− "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
1012+ "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
10101013 "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
10111014 "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
10121015 "zodiac" = ps: with ps; [ ];
10131016 "zone" = ps: with ps; [ ];
10141017 "zoneminder" = ps: with ps; [ zm-py ];
1015− "zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ];
1018+ "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
10161019 "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ];
10171020 };
10181021}
pkgs/servers/home-assistant/default.nix+6−35
@@ -21,19 +21,6 @@
2121
2222let
2323 defaultOverrides = [
24− # Pinned due to API changes in async-upnp-client>=0.20.0, remove after
25− (self: super: {
26− async-upnp-client = super.async-upnp-client.overridePythonAttrs (oldAttrs: rec {
27− version = "0.20.0";
28− src = fetchFromGitHub {
29− owner = "StevenLooman";
30− repo = "async_upnp_client";
31− rev = "v${version}";
32− sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg=";
33− };
34− });
35− })
36−
3724 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
3825 (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
3926
@@ -52,24 +39,6 @@ let
5239 });
5340 })
5441
55− # Pinned due to API changes in pyjwt>=2.0
56− (self: super: {
57− pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
58− version = "1.7.1";
59− src = oldAttrs.src.override {
60− inherit version;
61− sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
62− };
63− disabledTests = [
64− "test_ec_verify_should_return_false_if_signature_invalid"
65− ];
66− });
67− })
68−
69− # Pinned due to API changes in pylast 4.2.1
70− (mkOverride "pylast" "4.2.0"
71− "0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3")
72−
7342 # Pinned due to API changes in pyruckus>0.12
7443 (self: super: {
7544 pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
@@ -145,7 +114,7 @@ let
145114 extraBuildInputs = extraPackages py.pkgs;
146115
147116 # Don't forget to run parse-requirements.py after updating
148− hassVersion = "2021.9.7";
117+ hassVersion = "2021.10.0";
149118
150119in with py.pkgs; buildPythonApplication rec {
151120 pname = "homeassistant";
@@ -162,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec {
162131 owner = "home-assistant";
163132 repo = "core";
164133 rev = version;
165− sha256 = "1vcdnxh671iqhlbf6811j537by2i03fhryp9r9x77477y2y0xd6k";
134+ sha256 = "0m54ynx0i4a6wljg6d9i6xa79c15cqah5cgaswgrbaxhjw5q78iv";
166135 };
167136
168137 # leave this in, so users don't have to constantly update their downstream patch handling
@@ -337,7 +306,6 @@ in with py.pkgs; buildPythonApplication rec {
337306 "ecobee"
338307 "econet"
339308 "ee_brightbox"
340− "efergy"
341309 "elgato"
342310 "elkm1"
343311 "emonitor"
@@ -800,7 +768,7 @@ in with py.pkgs; buildPythonApplication rec {
800768 "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable"
801769 "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable"
802770 # tado/test_climate.py: Tries to connect to my.tado.com
803− "--deselect tests/components/tado/test_climate.py::test_air_con["
771+ "--deselect tests/components/tado/test_climate.py::test_air_con"
804772 # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
805773 "--deselect tests/helpers/test_system_info.py::test_container_installationtype"
806774 # tests are located in tests/
@@ -813,6 +781,9 @@ in with py.pkgs; buildPythonApplication rec {
813781 "tests/components"
814782 # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
815783 "tests/auth/mfa_modules/test_notify.py"
784+ # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address
785+ "tests/components/emulated_hue/test_upnp.py"
786+
816787 ];
817788
818789 disabledTests = [
pkgs/servers/home-assistant/frontend.nix+2−2
@@ -4,11 +4,11 @@ buildPythonPackage rec {
44 # the frontend version corresponding to a specific home-assistant version can be found here
55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
66 pname = "home-assistant-frontend";
7− version = "20210830.0";
7+ version = "20211006.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "sha256-4sNCnYFQ4IjmMPj7axgienZUMDo+GwTJ38cEf0iZzJI=";
11+ sha256 = "sha256-rlscTHqa1TMsIVW7kWFGR/feak0XewDRkybpo8dPXj0=";
1212 };
1313
1414 # there is nothing to strip in this package
pkgs/top-level/python-packages.nix+4
@@ -403,6 +403,8 @@ in {
403403
404404 airly = callPackage ../development/python-modules/airly { };
405405
406+ airthings = callPackage ../development/python-modules/airthings { };
407+
406408 ajpy = callPackage ../development/python-modules/ajpy { };
407409
408410 ajsonrpc = callPackage ../development/python-modules/ajsonrpc { };
@@ -1956,6 +1958,8 @@ in {
19561958
19571959 demjson = callPackage ../development/python-modules/demjson { };
19581960
1961+ demjson3 = callPackage ../development/python-modules/demjson3 { };
1962+
19591963 dendropy = callPackage ../development/python-modules/dendropy { };
19601964
19611965 denonavr = callPackage ../development/python-modules/denonavr { };