diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1bbdd998eb3..20d35601c99 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.5.5"; + version = "2022.6.0"; components = { "abode" = ps: with ps; [ abodepy @@ -140,6 +140,9 @@ pyatv zeroconf ]; + "application_credentials" = ps: with ps; [ + aiohttp-cors + ]; "apprise" = ps: with ps; [ apprise ]; @@ -236,6 +239,8 @@ aiohttp-cors securetar ]; + "baf" = ps: with ps; [ + ]; # missing inputs: aiobafi6 "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "balboa" = ps: with ps; [ @@ -288,7 +293,7 @@ bimmer-connected ]; "bond" = ps: with ps; [ - bond-api + bond-async ]; "bosch_shc" = ps: with ps; [ aiohttp-cors @@ -952,6 +957,10 @@ "geo_rss_events" = ps: with ps; [ georss-generic-client ]; + "geocaching" = ps: with ps; [ + aiohttp-cors + geocachingapi + ]; "geofency" = ps: with ps; [ aiohttp-cors ]; @@ -1049,6 +1058,16 @@ "hangouts" = ps: with ps; [ hangups ]; + "hardkernel" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; + "hardware" = ps: with ps; [ + ]; "harman_kardon_avr" = ps: with ps; [ hkavr ]; @@ -1139,7 +1158,7 @@ homematicip ]; "homewizard" = ps: with ps; [ - aiohwenergy + python-homewizard-energy ]; "homeworks" = ps: with ps; [ pyhomeworks @@ -1187,6 +1206,9 @@ "ialarm" = ps: with ps; [ pyialarm ]; + "ialarm_xr" = ps: with ps; [ + pyialarmxr + ]; "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ @@ -1379,6 +1401,9 @@ "launch_library" = ps: with ps; [ pylaunches ]; + "laundrify" = ps: with ps; [ + laundrify-aio + ]; "lcn" = ps: with ps; [ pypck ]; @@ -1863,7 +1888,6 @@ ondilo ]; "onewire" = ps: with ps; [ - pi1wire pyownet ]; "onkyo" = ps: with ps; [ @@ -2138,13 +2162,21 @@ ]; "rainforest_eagle" = ps: with ps; [ aioeagle - ueagle + eagle100 ]; "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; + "raspberry_pi" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + lru-dict + pillow + sqlalchemy + ]; "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "rdw" = ps: with ps; [ @@ -2227,8 +2259,6 @@ ]; "rpi_camera" = ps: with ps; [ ]; - "rpi_gpio" = ps: with ps; [ - ]; # missing inputs: RPi.GPIO "rpi_power" = ps: with ps; [ rpi-bad-power ]; @@ -2287,6 +2317,7 @@ "scrape" = ps: with ps; [ beautifulsoup4 jsonpath + lxml xmltodict ]; "screenlogic" = ps: with ps; [ @@ -3035,6 +3066,9 @@ ]; "worxlandroid" = ps: with ps; [ ]; + "ws66i" = ps: with ps; [ + pyws66i + ]; "wsdot" = ps: with ps; [ ]; "x10" = ps: with ps; [ @@ -3103,6 +3137,10 @@ aioftp ha-ffmpeg ]; + "yolink" = ps: with ps; [ + aiohttp-cors + yolink-api + ]; "youless" = ps: with ps; [ youless-api ]; @@ -3182,6 +3220,7 @@ "airtouch4" "airvisual" "airzone" + "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" @@ -3196,6 +3235,7 @@ "apache_kafka" "api" "apple_tv" + "application_credentials" "apprise" "aprs" "arcam_fmj" @@ -3353,6 +3393,7 @@ "geo_json_events" "geo_location" "geo_rss_events" + "geocaching" "geofency" "geonetnz_quakes" "geonetnz_volcano" @@ -3378,6 +3419,8 @@ "guardian" "habitica" "hangouts" + "hardkernel" + "hardware" "harmony" "hassio" "hddtemp" @@ -3407,6 +3450,7 @@ "hvv_departures" "hyperion" "ialarm" + "ialarm_xr" "iaqualink" "icloud" "ifttt" @@ -3447,6 +3491,7 @@ "kulersky" "lastfm" "launch_library" + "laundrify" "lcn" "light" "litterrobot" @@ -3586,6 +3631,7 @@ "rainforest_eagle" "rainmachine" "random" + "raspberry_pi" "rdw" "recollect_waste" "recorder" @@ -3778,6 +3824,7 @@ "wled" "workday" "worldclock" + "ws66i" "wsdot" "xbox" "xiaomi" @@ -3789,6 +3836,7 @@ "yandex_transport" "yandextts" "yeelight" + "yolink" "youless" "zeroconf" "zerproc" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4353f496046..01930a169af 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -72,19 +72,6 @@ let }); }) - (self: super: { - huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { - version = "1.4.18"; - src = fetchFromGitHub { - owner = "Salamek"; - repo = "huawei-lte-api"; - rev = version; - sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg"; - }; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.dicttoxml ]; - }); - }) - # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -179,7 +166,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.5.5"; + hassVersion = "2022.6.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -197,7 +184,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-uVB3Yg3f0fNkq2rav7hmbJ9IAMg0UIrdMshJVgOharA="; + hash = "sha256-8s6CyTNA61UgrflpQ/RZnAPa/xI4VFdEQJnN25k3vuc="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -210,24 +197,18 @@ in python.pkgs.buildPythonApplication rec { postPatch = let relaxedConstraints = [ - "aiohttp" - "async_timeout" "attrs" "awesomeversion" "bcrypt" - "cryptography" "httpx" - "jinja2" - "pip" - "requests" - "yarl" + "PyJWT" ]; in '' sed -r -i \ ${lib.concatStringsSep "\n" (map (package: ''-e 's@${package}[<>=]+.*@${package}@g' \'' ) relaxedConstraints)} - setup.cfg + setup.cfg substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index cbfd57d5f93..1f9b12e60f2 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220504.1"; + version = "20220531.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-EU9I/0+EmcNr7eYq3Z5J5/KiWu+Qz0+wn7UZMJFBxp0="; + sha256 = "sha256-NySYrHmU1OV11WZSqe6GURPKnwcLukXF0QUxxlPXUG4="; }; # there is nothing to strip in this package