Merge pull request #171570 from mweinelt/home-assistant

main
Martin Weinelt 2 years ago committed by GitHub
commit 45a1d1c8d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      pkgs/development/python-modules/aioairzone/default.nix
  2. 9
      pkgs/development/python-modules/aioslimproto/default.nix
  3. 4
      pkgs/development/python-modules/androidtv/default.nix
  4. 4
      pkgs/development/python-modules/async-upnp-client/default.nix
  5. 46
      pkgs/development/python-modules/gcal-sync/default.nix
  6. 26
      pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
  7. 4
      pkgs/development/python-modules/pychromecast/default.nix
  8. 10
      pkgs/development/python-modules/pydeconz/default.nix
  9. 4
      pkgs/development/python-modules/pyevilgenius/default.nix
  10. 6
      pkgs/development/python-modules/pyinsteon/default.nix
  11. 4
      pkgs/development/python-modules/pynws/default.nix
  12. 6
      pkgs/development/python-modules/pytomorrowio/default.nix
  13. 8
      pkgs/development/python-modules/simplisafe-python/default.nix
  14. 4
      pkgs/development/python-modules/total-connect-client/default.nix
  15. 26
      pkgs/development/python-modules/voluptuous/default.nix
  16. 6
      pkgs/development/python-modules/zigpy/default.nix
  17. 4
      pkgs/development/python-modules/zwave-js-server-python/default.nix
  18. 47
      pkgs/servers/home-assistant/component-packages.nix
  19. 19
      pkgs/servers/home-assistant/default.nix
  20. 4
      pkgs/servers/home-assistant/frontend.nix
  21. 4
      pkgs/top-level/python-packages.nix

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.3.4";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";
hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";
};
propagatedBuildInputs = [

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
version = "2.0.0";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -16,13 +16,18 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
hash = "sha256-7xFbxWay2aPCBkf3pBUGshROtssbi//PxxsI8ELeS+c=";
hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";
};
checkInputs = [
pytestCheckHook
];
disabledTests = [
# AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']
"test_msg_instantiation"
];
pythonImportsCheck = [
"aioslimproto"
];

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "androidtv";
version = "0.0.66";
version = "0.0.67";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "python-androidtv";
rev = "v${version}";
hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo=";
hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";
};
propagatedBuildInputs = [

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.28.0";
version = "0.29.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY=";
sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";
};
propagatedBuildInputs = [

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, pydantic
, freezegun
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "gcal-sync";
version = "0.7.1";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "allenporter";
repo = "gcal_sync";
rev = version;
hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M=";
};
propagatedBuildInputs = [
aiohttp
pydantic
];
checkInputs = [
freezegun
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "gcal_sync" ];
meta = {
description = "Python library for syncing Google Calendar to local storage";
homepage = "https://github.com/allenporter/gcal_sync";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "insteon-frontend-home-assistant";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf";
};
# upstream has no tests
doCheck = false;
pythonImportsCheck = [ "insteon_frontend" ];
meta = {
description = "The Insteon frontend for Home Assistant";
homepage = "https://github.com/teharris1/insteon-panel";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "11.0.0";
version = "12.0.0";
format = "setuptools";
disabled = !isPy3k;
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY=";
sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";
};
propagatedBuildInputs = [

@ -1,6 +1,7 @@
{ lib
, aiohttp
, aioresponses
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pytest-aiohttp
@ -10,20 +11,21 @@
buildPythonPackage rec {
pname = "pydeconz";
version = "87";
version = "91";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "v${version}";
sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";
rev = "refs/tags/v${version}";
hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
checkInputs = [

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyevilgenius";
version = "1.0.0";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";
sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";
};
propagatedBuildInputs = [

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.0.16";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc=";
rev = "refs/tags/${version}";
hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";
};
propagatedBuildInputs = [

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pynws";
version = "1.3.2";
version = "1.4.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "MatthewFlamm";
repo = pname;
rev = "v${version}";
sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";
sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y=";
};
propagatedBuildInputs = [

@ -3,19 +3,20 @@
, pythonOlder
, fetchPypi
, aiohttp
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pytomorrowio";
version = "0.2.1";
version = "0.3.3";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e";
sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62";
};
propagatedBuildInputs = [
@ -23,6 +24,7 @@ buildPythonPackage rec {
];
checkInputs = [
pytest-aiohttp
pytest-asyncio
pytestCheckHook
];

@ -3,6 +3,7 @@
, aresponses
, asynctest
, backoff
, beautifulsoup4
, buildPythonPackage
, docutils
, fetchFromGitHub
@ -19,7 +20,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
version = "2022.03.3";
version = "2022.05.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -28,7 +29,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw=";
sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";
};
nativeBuildInputs = [
@ -38,6 +39,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
backoff
beautifulsoup4
docutils
pytz
voluptuous
@ -62,6 +64,8 @@ buildPythonPackage rec {
# simplipy/api.py:253: InvalidCredentialsError
"test_request_error_failed_retry"
"test_update_error"
# ClientConnectorError: Cannot connect to host auth.simplisafe.com:443 ssl:default [Temporary failure in name resolution]
"test_client_async_from_refresh_token_unknown_error"
];
disabledTestPaths = [

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "total-connect-client";
version = "2022.2.1";
version = "2022.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";
hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";
};
propagatedBuildInputs = [

@ -1,27 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "voluptuous";
version = "0.13.0";
version = "0.13.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";
src = fetchFromGitHub {
owner = "alecthomas";
repo = pname;
rev = version;
hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";
};
checkInputs = [
nose
pytestCheckHook
];
checkPhase = ''
nosetests
'';
pythonImportsCheck = [
"voluptuous"
];
pythonImportsCheck = [ "voluptuous" ];
pytestFlagsArray = [
"voluptuous/tests/"
];
meta = with lib; {
description = "Python data validation library";

@ -4,6 +4,7 @@
, asynctest
, buildPythonPackage
, crccheck
, cryptography
, fetchFromGitHub
, pycryptodome
, pytest-aiohttp
@ -15,7 +16,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.44.2";
version = "0.45.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,13 +25,14 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = version;
sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I=";
sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";
};
propagatedBuildInputs = [
aiohttp
aiosqlite
crccheck
cryptography
pycryptodome
voluptuous
];

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.35.3";
version = "0.36.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";
sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";
};
propagatedBuildInputs = [

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.4.7";
version = "2022.5.0";
components = {
"abode" = ps: with ps; [
abodepy
@ -157,10 +157,6 @@
];
"arest" = ps: with ps; [
];
"arlo" = ps: with ps; [
ha-ffmpeg
pyarlo
];
"arris_tg2492lg" = ps: with ps; [
arris-tg2492lg
];
@ -554,8 +550,6 @@
"digital_ocean" = ps: with ps; [
digital-ocean
];
"digitalloggers" = ps: with ps; [
]; # missing inputs: dlipower
"directv" = ps: with ps; [
directv
];
@ -993,8 +987,7 @@
];
"google" = ps: with ps; [
aiohttp-cors
google-api-python-client
httplib2
gcal-sync
oauth2client
];
"google_assistant" = ps: with ps; [
@ -1248,9 +1241,15 @@
];
"insteon" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
insteon-frontend-home-assistant
lru-dict
pillow
pyinsteon
pyserial
pyudev
sqlalchemy
];
"integration" = ps: with ps; [
];
@ -1391,8 +1390,10 @@
life360
];
"lifx" = ps: with ps; [
aiohttp-cors
aiolifx
aiolifx-effects
ifaddr
];
"lifx_cloud" = ps: with ps; [
];
@ -1514,6 +1515,8 @@
"mazda" = ps: with ps; [
pymazda
];
"meater" = ps: with ps; [
]; # missing inputs: meater-python
"media_extractor" = ps: with ps; [
aiohttp-cors
youtube-dl-light
@ -2088,6 +2091,9 @@
];
"qnap" = ps: with ps; [
]; # missing inputs: qnapstats
"qnap_qsw" = ps: with ps; [
aioqsw
];
"qrcode" = ps: with ps; [
pillow
pyzbar
@ -2309,6 +2315,10 @@
"sentry" = ps: with ps; [
sentry-sdk
];
"senz" = ps: with ps; [
aiohttp-cors
aiosenz
];
"serial" = ps: with ps; [
pyserial-asyncio
];
@ -2382,6 +2392,10 @@
];
"slide" = ps: with ps; [
]; # missing inputs: goslide-api
"slimproto" = ps: with ps; [
aiohttp-cors
aioslimproto
];
"sma" = ps: with ps; [
pysma
];
@ -2420,7 +2434,7 @@
paho-mqtt
];
"snmp" = ps: with ps; [
pysnmp
pysnmplib
];
"solaredge" = ps: with ps; [
solaredge
@ -2747,6 +2761,9 @@
pytradfri
]
++ pytradfri.extras-require.async;
"trafikverket_ferry" = ps: with ps; [
pytrafikverket
];
"trafikverket_train" = ps: with ps; [
pytrafikverket
];
@ -2828,11 +2845,10 @@
];
"update" = ps: with ps; [
];
"updater" = ps: with ps; [
];
"upnp" = ps: with ps; [
aiohttp-cors
async-upnp-client
getmac
ifaddr
zeroconf
];
@ -3168,7 +3184,6 @@
"apprise"
"aprs"
"arcam_fmj"
"arlo"
"aseko_pool_live"
"asuswrt"
"atag"
@ -3540,6 +3555,7 @@
"pvpc_hourly_pricing"
"python_script"
"qld_bushfire"
"qnap_qsw"
"rachio"
"radarr"
"radio_browser"
@ -3582,6 +3598,7 @@
"sensibo"
"sensor"
"sentry"
"senz"
"seventeentrack"
"shell_command"
"shelly"
@ -3595,6 +3612,7 @@
"siren"
"slack"
"sleepiq"
"slimproto"
"sma"
"smappee"
"smart_meter_texas"
@ -3648,6 +3666,7 @@
"tailscale"
"tankerkoenig"
"tasmota"
"tautulli"
"tcp"
"telegram"
"telegram_bot"
@ -3671,6 +3690,7 @@
"trace"
"tractive"
"tradfri"
"trafikverket_ferry"
"trafikverket_train"
"trafikverket_weatherstation"
"transmission"
@ -3689,7 +3709,6 @@
"upb"
"upcloud"
"update"
"updater"
"upnp"
"uptime"
"uptimerobot"

@ -30,7 +30,6 @@ let
defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")
(mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=")
# pytest-aiohttp>0.3.0 breaks home-assistant tests
(self: super: {
@ -47,9 +46,21 @@ let
aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
pynws = super.pynws.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires pytest-aiohttp>=1.0.0
});
@ -110,7 +121,7 @@ let
src = fetchFromGitHub {
owner = "ManneW";
repo = "vilfo-api-client-python";
rev = "v$version}";
rev = "v${version}";
sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";
};
});
@ -168,7 +179,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.4.7";
hassVersion = "2022.5.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -186,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M=";
hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

@ -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 = "20220405.0";
version = "20220504.0";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";
sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";
};
# there is nothing to strip in this package

@ -3268,6 +3268,8 @@ in {
gbulb = callPackage ../development/python-modules/gbulb { };
gcal-sync = callPackage ../development/python-modules/gcal-sync { };
gcovr = callPackage ../development/python-modules/gcovr { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
@ -4148,6 +4150,8 @@ in {
installer = callPackage ../development/python-modules/installer { };
insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { };
intake = callPackage ../development/python-modules/intake { };
intake-parquet = callPackage ../development/python-modules/intake-parquet { };

Loading…
Cancel
Save