Merge pull request #180400 from NixOS/home-assistant

This commit is contained in:
Martin Weinelt 2022-07-07 15:22:33 +02:00 committed by GitHub
commit a3c7cbb2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 291 additions and 137 deletions

View File

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, chacha20poly1305-reuseable
, commentjson
, cryptography
, fetchFromGitHub
@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "0.7.17";
version = "0.7.20";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-vgRiqA3xNvuw3nIzl45RXdmcbDW6OTxvReSH5SVcNEs=";
sha256 = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4=";
};
nativeBuildInputs = [
@ -29,6 +30,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
chacha20poly1305-reuseable
commentjson
cryptography
zeroconf

View File

@ -5,7 +5,6 @@
, buildPythonPackage
, docutils
, fetchFromGitHub
, fetchpatch
, imaplib2
, mock
, nose
@ -17,7 +16,7 @@
buildPythonPackage rec {
pname = "aioimaplib";
version = "0.9.0";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -26,17 +25,9 @@ buildPythonPackage rec {
owner = "bamthomas";
repo = pname;
rev = version;
sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY=";
hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0=";
};
patches = [
# https://github.com/bamthomas/aioimaplib/pull/76
(fetchpatch {
url = "https://github.com/bamthomas/aioimaplib/commit/03f796f45b60a163ad0f3d52166d58f280de7065.patch";
hash = "sha256-9staxkw/EfGoBz/uyrNKBvQ0KfN+za4rTGRyqrAJSd8=";
})
];
checkInputs = [
asynctest
docutils
@ -49,6 +40,11 @@ buildPythonPackage rec {
tzlocal
];
disabledTests = [
# https://github.com/bamthomas/aioimaplib/issues/77
"test_get_quotaroot"
];
pythonImportsCheck = [ "aioimaplib" ];
meta = with lib; {

View File

@ -3,6 +3,7 @@
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, orjson
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "33";
version = "34";
disabled = pythonOlder "3.9";
@ -19,11 +20,12 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-MXzUQOC5Y33RgRKf5BPbA9VfQKKdRjawF9kW4QmSHkU=";
hash = "sha256-NxxM1rU781QTfNWfE6maNovPZNDwU54ST1lxhTKmmBA=";
};
propagatedBuildInputs = [
aiohttp
orjson
];
checkInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.31.1";
version = "0.31.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "sha256-edoP4YvMp9ImfeS9bUwNBdx6eAUj5/J1tLymkOc6jwQ=";
sha256 = "sha256-/8gSx1oe2ljBGIPddzBLXuH3LiuHpUXi4/vO7stm5FY=";
};
propagatedBuildInputs = [

View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.30.0";
version = "0.31.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
sha256 = "sha256-epsE/VKK6LwMVbkx5PWgAxZ62PO4udCFr3jYi0MrUpI=";
sha256 = "sha256-8pw139TNY7LE7x13JfgxcUVWFIXVj4FiEvqdUh+xcl8=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,62 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
# build
, poetry-core
# propagates
, cryptography
# tests
, pytestCheckHook
}:
let
pname = "chacha20poly1305-reuseable";
version = "0.0.4";
in
buildPythonPackage {
inherit pname version;
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
hash = "sha256-iOGDTQyiznjYblT/NfHxewIwEZsPnp7bdNVD1p9/H1M=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
cryptography
];
pythonImportsCheck = [
"chacha20poly1305_reuseable"
];
preCheck = ''
substituteInPlace pyproject.toml \
--replace "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" ""
'';
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "ChaCha20Poly1305 that is reuseable for asyncio";
homepage = "https://github.com/bdraco/chacha20poly1305-reuseable";
changelog = "https://github.com/bdraco/chacha20poly1305-reuseable/blob/main/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
}

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "homematicip";
version = "1.0.2";
version = "1.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "coreGreenberet";
repo = "homematicip-rest-api";
rev = version;
sha256 = "sha256-j2ansly05auevlcDY5TFz6PZR/pNIGIbtkJuU8L5b0o=";
sha256 = "sha256-rTTYJ/2R+/FLuL3rTWT7ieixN+Gv9GhwkUaKPfLqUGc=";
};
propagatedBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "intellifire4py";
version = "1.0.5";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = pname;
rev = version;
hash = "sha256-wBk9tCVXDxHBnhofFQfMbsrYF4UYRZ2oXEBCldvJTnM=";
hash = "sha256-CO6ImL2e6B2yvHAQs3Cc7oaOllB5V9sap4bQS/XRnWI=";
};
propagatedBuildInputs = [

View File

@ -1,6 +1,7 @@
{ lib
, aioresponses
, buildPythonPackage
, orjson
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "nexia";
version = "1.0.2";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -19,10 +20,11 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = version;
sha256 = "sha256-+3nWf9GjX7ovnumwSq3l1dcHrgWIPPzKsPmI8/tT7Lo=";
sha256 = "sha256-Wb9qxJBbmac1B3wYJxFCdXiQ3LqIl3CHIZnNvZ5Jr5k=";
};
propagatedBuildInputs = [
orjson
requests
];

View File

@ -10,8 +10,8 @@
buildPythonPackage rec {
pname = "py-canary";
version = "0.5.2";
format = "setuptools";
version = "0.5.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "snjoetw";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ=";
hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE=";
};
propagatedBuildInputs = [
@ -36,6 +36,11 @@ buildPythonPackage rec {
"canary"
];
disabledTests = [
# Test requires network access
"test_location_with_motion_entry"
];
meta = with lib; {
description = "Python package for Canary Security Camera";
homepage = "https://github.com/snjoetw/py-canary";

View File

@ -2,6 +2,7 @@
, buildPythonPackage
, aiohttp
, bitarray
, chacha20poly1305-reuseable
, cryptography
, deepdiff
, fetchFromGitHub
@ -21,7 +22,7 @@
buildPythonPackage rec {
pname = "pyatv";
version = "0.10.0";
version = "0.10.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -30,7 +31,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aYNBFtsnSg3PORq72U0PXPFCTVj2+8D2TS3nMau55t4=";
sha256 = "sha256-70bimFWsby2x8wBRH5CZgg9Xjw8n+xfhW07rOG9Pk0s=";
};
postPatch = ''
@ -45,6 +46,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
bitarray
chacha20poly1305-reuseable
cryptography
mediafile
miniaudio

View File

@ -4,6 +4,7 @@
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, orjson
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "92";
version = "96";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,12 +21,13 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "deconz";
rev = "refs/tags/v${version}";
hash = "sha256-qA7AgiiRBq1ekBcQDC8LlLnZLthA0QFZpxNUZdrMMIA=";
hash = "sha256-6W8GPsIvFlbgXkkN5tJEXyGKsjLfdJzgP8VS07lYZn4=";
};
propagatedBuildInputs = [
aiohttp
async-timeout
orjson
];
checkInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pyhiveapi";
version = "0.5.11";
version = "0.5.13";
format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Pyhass";
repo = "Pyhiveapi";
rev = "refs/tags/v${version}";
hash = "sha256-7Zval0LPuL3QUgDwpG91ybbL7gSWm4DxxZ/yXzkBES8=";
hash = "sha256-VuWP+yypQznirNcjvqbI3x+bWRiVIfO1NxG76Mdc37g=";
};
postPatch = ''

View File

@ -1,39 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, lxml
, pythonOlder
, xmltodict
}:
buildPythonPackage rec {
pname = "pyialarmxr-homeassistant";
version = "1.0.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ=";
};
propagatedBuildInputs = [
lxml
xmltodict
];
# Module has no test
doCheck = false;
pythonImportsCheck = [
"pyialarmxr"
];
meta = with lib; {
description = "Library to interface with Antifurto365 iAlarmXR systems";
homepage = "https://pypi.org/project/pyialarmxr-homeassistant/";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -5,6 +5,7 @@
, buildPythonPackage
, fetchFromGitHub
, ipython
, orjson
, packaging
, pillow
, poetry-core
@ -25,7 +26,7 @@
buildPythonPackage rec {
pname = "pyunifiprotect";
version = "3.9.2";
version = "4.0.9";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -34,13 +35,14 @@ buildPythonPackage rec {
owner = "briis";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-IQ+mjiNxfxG0Zq543Rn5rK/BNPzLGVX9jVTtyW7W9cs=";
hash = "sha256-1jKZWF+xNQVNzgOTNwEG/rloPXZYYwoVMYmQ+jep1/0=";
};
propagatedBuildInputs = [
aiofiles
aiohttp
aioshutil
orjson
packaging
pillow
pydantic

View File

@ -1,19 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
, redis
, requests
, six }:
, six
}:
buildPythonPackage rec {
pname = "spotipy";
version = "2.19.0";
version = "2.20.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kE9ugT26g3dY6VEMG+5R18ohfxaSRmJaE+aTcz3DNUM=";
sha256 = "sha256-4mqZt1vi/EI3WytLNV3ET6Hlnvx3OvoXt4ThpMCoGMk=";
};
propagatedBuildInputs = [ requests six ];
propagatedBuildInputs = [
redis
requests
six
];
# tests want to access the spotify API
doCheck = false;

View File

@ -7,11 +7,14 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, zigpy }:
, zigpy
}:
buildPythonPackage rec {
pname = "zigpy-cc";
version = "0.5.2";
format = "setuptools";
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8
@ -39,10 +42,16 @@ buildPythonPackage rec {
"test_incoming_msg"
"test_incoming_msg2"
"test_deser"
# Fails in sandbox
"tests/test_application.py "
];
pythonImportsCheck = [
"zigpy_cc"
];
meta = with lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
description = "Library which communicates with Texas Instruments CC2531 radios for zigpy";
homepage = "https://github.com/zigpy/zigpy-cc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "zigpy-deconz";
version = "0.16.0";
version = "0.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-MEYe8DGx338ze1t36Fh0Zl8GgBpk2Wmx0EKnewjnTws=";
hash = "sha256-2M25g3iJWW6kT17P9PVAPD09E5QXuOJN75yjWsLY/cI=";
};
propagatedBuildInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "zigpy-xbee";
version = "0.14.0";
version = "0.15.0";
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy-xbee";
rev = version;
sha256 = "sha256-veAkaBHPYgVd3iwvnH/A2upYX4T/qXXNRcaysbRQvNI=";
sha256 = "sha256-NT7d5JWaVZOrk32uYh0z0sI9RA4eJYYIa2D/Ei81KjY=";
};
buildInputs = [

View File

@ -1,28 +1,28 @@
{ lib
, asynctest
, buildPythonPackage
, fetchFromGitHub
, mock
, pyserial
, pyserial-asyncio
, pyusb
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, zigpy }:
, zigpy
}:
buildPythonPackage rec {
pname = "zigpy-zigate";
version = "0.8.0";
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8
version = "0.9.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy-zigate";
rev = version;
sha256 = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM=";
rev = "v${version}";
hash = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM=";
};
propagatedBuildInputs = [
@ -33,13 +33,22 @@ buildPythonPackage rec {
];
checkInputs = [
asynctest
mock
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"zigpy_zigate"
];
disabledTestPaths = [
# Fails in sandbox
"tests/test_application.py "
];
meta = with lib; {
description = "A library which communicates with ZiGate radios for zigpy";
description = "Library which communicates with ZiGate radios for zigpy";
homepage = "https://github.com/zigpy/zigpy-zigate";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy-znp";
version = "0.7.0";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = pname;
rev = "v${version}";
sha256 = "0h6dclz4q4lvmapzpslh8kb0aihdjddbkxc4zc981glbip89li5w";
sha256 = "sha256-sGwZL2AOCEWO9xl3HPHBGEFQ5NVk6CeuX9lt8ez8MFE=";
};
propagatedBuildInputs = [
@ -45,7 +45,7 @@ buildPythonPackage rec {
pytest-mock
pytest-timeout
pytestCheckHook
] ++ lib.optionals (pythonOlder "3.8") [
] ++ lib.optionals (pythonOlder "3.8") [
asynctest
];
@ -54,7 +54,7 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Python library for zigpy which communicates with TI ZNP radios";
description = "Library for zigpy which communicates with TI ZNP radios";
homepage = "https://github.com/zigpy/zigpy-znp";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mvnetbiz ];

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.46.0";
version = "0.47.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
sha256 = "sha256-YCkNjygNSvGNuhP7N1apCWYevl18GASgUFSSTLHj2YU=";
sha256 = "sha256-Jx7KnukwWaSi16Buh+Dt7RiCFEbQXXypnKYbYoMQyDY=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.37.2";
version = "0.39.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-3Cn/8BbxcOFv8zDdRC91/8EWH6hTuXhtu5Yk8EOhGH4=";
hash = "sha256-qKIlknxzZSHCl5KF8SRVHLB7eFc7ZEzAdzi+tlfcoPg=";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.6.7";
version = "2022.7.0";
components = {
"abode" = ps: with ps; [
abodepy
@ -61,8 +61,7 @@
aioairzone
];
"aladdin_connect" = ps: with ps; [
aladdin-connect
];
]; # missing inputs: AIOAladdinConnect
"alarm_control_panel" = ps: with ps; [
];
"alarmdecoder" = ps: with ps; [
@ -801,6 +800,7 @@
pyfido
];
"file" = ps: with ps; [
file-read-backwards
];
"filesize" = ps: with ps; [
];
@ -1134,6 +1134,14 @@
];
"homeassistant" = ps: with ps; [
];
"homeassistant_yellow" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
lru-dict
pillow
sqlalchemy
];
"homekit" = ps: with ps; [
hap-python
pyqrcode
@ -1206,9 +1214,6 @@
"ialarm" = ps: with ps; [
pyialarm
];
"ialarm_xr" = ps: with ps; [
pyialarmxr-homeassistant
];
"iammeter" = ps: with ps; [
]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [
@ -2427,7 +2432,8 @@
]
++ pygatt.optional-dependencies.GATTTOOL;
"skybell" = ps: with ps; [
skybellpy
aioskybell
ha-ffmpeg
];
"slack" = ps: with ps; [
slackclient
@ -2479,7 +2485,7 @@
paho-mqtt
];
"snmp" = ps: with ps; [
pysnmp
pysnmplib
];
"solaredge" = ps: with ps; [
solaredge
@ -2496,10 +2502,6 @@
"soma" = ps: with ps; [
pysoma
];
"somfy" = ps: with ps; [
aiohttp-cors
pymfy
];
"somfy_mylink" = ps: with ps; [
somfy-mylink-synergy
];
@ -2657,9 +2659,8 @@
"system_bridge" = ps: with ps; [
aiohttp-cors
ifaddr
systembridge
zeroconf
];
]; # missing inputs: systembridgeconnector
"system_health" = ps: with ps; [
aiohttp-cors
];
@ -2916,8 +2917,7 @@
"uscis" = ps: with ps; [
]; # missing inputs: uscisstatus
"usgs_earthquakes_feed" = ps: with ps; [
geojson-client
];
]; # missing inputs: aio_geojson_usgs_earthquakes
"utility_meter" = ps: with ps; [
croniter
];
@ -3172,10 +3172,15 @@
"zha" = ps: with ps; [
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
lru-dict
pillow
pyserial-asyncio
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
@ -3226,7 +3231,6 @@
"airtouch4"
"airvisual"
"airzone"
"aladdin_connect"
"alarm_control_panel"
"alarmdecoder"
"alert"
@ -3338,6 +3342,7 @@
"ecobee"
"econet"
"efergy"
"eight_sleep"
"elgato"
"elkm1"
"elmax"
@ -3440,6 +3445,7 @@
"home_connect"
"home_plus_control"
"homeassistant"
"homeassistant_yellow"
"homekit"
"homekit_controller"
"homematic"
@ -3456,7 +3462,6 @@
"hvv_departures"
"hyperion"
"ialarm"
"ialarm_xr"
"iaqualink"
"icloud"
"ifttt"
@ -3499,6 +3504,8 @@
"launch_library"
"laundrify"
"lcn"
"lg_soundbar"
"life360"
"light"
"litterrobot"
"local_file"
@ -3635,6 +3642,7 @@
"rachio"
"radarr"
"radio_browser"
"radiotherm"
"rainforest_eagle"
"rainmachine"
"random"
@ -3689,6 +3697,7 @@
"simplisafe"
"simulated"
"siren"
"skybell"
"slack"
"sleepiq"
"slimproto"
@ -3700,11 +3709,11 @@
"smhi"
"smtp"
"snips"
"snmp"
"solaredge"
"solarlog"
"solax"
"soma"
"somfy"
"somfy_mylink"
"sonarr"
"songpal"
@ -3738,7 +3747,6 @@
"syncthing"
"syncthru"
"synology_dsm"
"system_bridge"
"system_health"
"system_log"
"tado"
@ -3795,7 +3803,6 @@
"uptime"
"uptimerobot"
"usb"
"usgs_earthquakes_feed"
"utility_meter"
"uvc"
"vacuum"

View File

@ -30,6 +30,20 @@ let
defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(self: super: {
bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec {
version = "0.5.0";
postPatch = null;
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ];
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
rev = "v.${version}";
hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg=";
};
});
})
# pytest-aiohttp>0.3.0 breaks home-assistant tests
(self: super: {
pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {
@ -176,7 +190,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.6.7";
hassVersion = "2022.7.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -194,7 +208,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-RR0CsPOzOdWRPSgmKGl3egrPXS1CDI+ODWZeLkVCSGQ=";
hash = "sha256-DDRut+3wJutXcQVOf2KU+XuHs5XuKkd5R7dQIXwOIrU=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -203,6 +217,7 @@ in python.pkgs.buildPythonApplication rec {
src = ./patches/ffmpeg-path.patch;
ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg";
})
./patches/wilight-import.patch
];
postPatch = let
@ -212,15 +227,16 @@ in python.pkgs.buildPythonApplication rec {
"bcrypt"
"cryptography"
"httpx"
"orjson"
"PyJWT"
"requests"
];
in ''
sed -r -i \
${lib.concatStringsSep "\n" (map (package:
''-e 's@${package}[<>=]+.*@${package}@g' \''
''-e 's/${package}[<>=]+.*/${package}",/g' \''
) relaxedConstraints)}
setup.cfg
pyproject.toml
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';
@ -239,13 +255,13 @@ in python.pkgs.buildPythonApplication rec {
httpx
ifaddr
jinja2
lru-dict
orjson
pip
pyjwt
python-slugify
pytz
pyyaml
requests
ruamel-yaml
voluptuous
voluptuous-serialize
yarl

View File

@ -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 = "20220601.0";
version = "20220706.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-WGRKJq429fIxZQJzVK2xFqXUNrIYbCjr2zTSzpBlakI=";
sha256 = "sha256-hTdfe+S9D6Grtku5AkRJpCNBvYv2JspSPmXRHHfEPrA=";
};
# there is nothing to strip in this package

View File

@ -0,0 +1,52 @@
diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py
index 2cdcf20c1e..37b034c9ae 100644
--- a/homeassistant/components/wilight/__init__.py
+++ b/homeassistant/components/wilight/__init__.py
@@ -2,7 +2,7 @@
from typing import Any
-from pywilight.wilight_device import Device as PyWiLightDevice
+from pywilight.wilight_device import PyWiLightDevice
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import Platform
diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py
index c598e6db39..3d0c6d0ff3 100644
--- a/homeassistant/components/wilight/fan.py
+++ b/homeassistant/components/wilight/fan.py
@@ -13,7 +13,7 @@ from pywilight.const import (
WL_SPEED_LOW,
WL_SPEED_MEDIUM,
)
-from pywilight.wilight_device import Device as PyWiLightDevice
+from pywilight.wilight_device import PyWiLightDevice
from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature
from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py
index ea9e19dcb3..2509dc5073 100644
--- a/homeassistant/components/wilight/light.py
+++ b/homeassistant/components/wilight/light.py
@@ -4,7 +4,7 @@ from __future__ import annotations
from typing import Any
from pywilight.const import ITEM_LIGHT, LIGHT_COLOR, LIGHT_DIMMER, LIGHT_ON_OFF
-from pywilight.wilight_device import Device as PyWiLightDevice
+from pywilight.wilight_device import PyWiLightDevice
from homeassistant.components.light import (
ATTR_BRIGHTNESS,
diff --git a/homeassistant/components/wilight/parent_device.py b/homeassistant/components/wilight/parent_device.py
index 17a33fef63..8091e78cc7 100644
--- a/homeassistant/components/wilight/parent_device.py
+++ b/homeassistant/components/wilight/parent_device.py
@@ -5,7 +5,7 @@ import asyncio
import logging
import pywilight
-from pywilight.wilight_device import Device as PyWiLightDevice
+from pywilight.wilight_device import PyWiLightDevice
import requests
from homeassistant.config_entries import ConfigEntry

View File

@ -11,6 +11,7 @@ let
config = [ pydispatcher ];
generic = [ av ];
google_translate = [ mutagen ];
homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
lovelace = [ PyChromecast ];
nest = [ av ];
onboarding = [ pymetno radios rpi-bad-power ];
@ -36,13 +37,31 @@ let
# homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska)
"test_services_play_media_audio"
];
rfxtrx = [
# bytearrray mismatch
"test_rfy_cover"
];
};
extraPytestFlagsArray = {
asuswrt = [
# asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error
# Sandbox network limitations, fails with unexpected error
"--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed"
];
history_stats = [
# Flaky: AssertionError: assert '0.0' == '12.0'
"--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed"
];
skybell = [
# Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443
"--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error"
];
stream = [
# Tries to write to /example and gets "Permission denied"
"--deselect tests/components/stream/test_recorder.py::test_record_lookback"
"--deselect tests/components/stream/test_recorder.py::test_recorder_log"
"--deselect tests/components/stream/test_worker.py::test_get_image"
];
};
in lib.listToAttrs (map (component: lib.nameValuePair component (
home-assistant.overridePythonAttrs (old: {
@ -72,9 +91,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
meta = old.meta // {
broken = lib.elem component [
"bsblan"
"blebox" # all tests fail with: AttributeError: Mock object has no attribute 'async_from_host'
"dnsip"
"efergy"
"ssdp"
"subaru"
];

View File

@ -117,6 +117,7 @@ mapAliases ({
pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28
pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
PyLD = pyld; # added 2022-06-22
pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0

View File

@ -1618,6 +1618,8 @@ in {
cgroup-utils = callPackage ../development/python-modules/cgroup-utils { };
chacha20poly1305-reuseable = callPackage ../development/python-modules/chacha20poly1305-reuseable { };
chai = callPackage ../development/python-modules/chai { };
chainer = callPackage ../development/python-modules/chainer {
@ -7519,8 +7521,6 @@ in {
pyialarm = callPackage ../development/python-modules/pyialarm { };
pyialarmxr-homeassistant = callPackage ../development/python-modules/pyialarmxr-homeassistant { };
pyicloud = callPackage ../development/python-modules/pyicloud { };
PyICU = callPackage ../development/python-modules/pyicu { };