git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #121865 from mweinelt/home-assistant
commit6a09bc4405c68627b043799bf0256cba1dc57a1b authorMartin Weinelt <mweinelt@users.noreply.github.com> dateThu 6 May 2021, 18:05 (6 years ago) parent51836ac398b0cf
6 files changed+57−80
nixos/modules/services/misc/home-assistant.nix+3−2 pkgs/development/python-modules/PyRMVtransport/default.nix+2−7 pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2 pkgs/servers/home-assistant/component-packages.nix+31−25 pkgs/servers/home-assistant/default.nix+17−42 pkgs/servers/home-assistant/frontend.nix+2−2
nixos/modules/services/misc/home-assistant.nix+3−2
@@ -298,7 +298,7 @@ in {
298298 ProtectKernelModules = true;
299299 ProtectKernelTunables = true;
300300 ProtectProc = "invisible";
301− ProcSubset = "pid";
301+ ProcSubset = "all";
302302 ProtectSystem = "strict";
303303 RemoveIPC = true;
304304 ReadWritePaths = let
@@ -308,9 +308,10 @@ in {
308308 allowPaths = if isList value then value else singleton value;
309309 in [ "${cfg.configDir}" ] ++ allowPaths;
310310 RestrictAddressFamilies = [
311− "AF_UNIX"
312311 "AF_INET"
313312 "AF_INET6"
313+ "AF_NETLINK"
314+ "AF_UNIX"
314315 ] ++ optionals (useComponent "bluetooth_tracker" || useComponent "bluetooth_le_tracker") [
315316 "AF_BLUETOOTH"
316317 ];
pkgs/development/python-modules/PyRMVtransport/default.nix+2−7
@@ -13,7 +13,7 @@
1313
1414buildPythonPackage rec {
1515 pname = "PyRMVtransport";
16− version = "0.3.1";
16+ version = "0.3.2";
1717 format = "pyproject";
1818 disabled = pythonOlder "3.6";
1919
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 owner = "cgtobi";
2222 repo = pname;
2323 rev = "v${version}";
24− sha256 = "1savzndg8l7rrc5dgzgsrdz9hnnjfv6qs5drznqmdw4f2rq84ypa";
24+ sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb";
2525 };
2626
2727 nativeBuildInputs = [
@@ -42,11 +42,6 @@ buildPythonPackage rec {
4242 pytest-httpx
4343 ];
4444
45− disabledTests = [
46− # fails with pytest-httpx>=0.12.0
47− "test__query_rmv_api_fail"
48− ];
49−
5045 meta = with lib; {
5146 homepage = "https://github.com/cgtobi/PyRMVtransport";
5247 description = "Get transport information from opendata.rmv.de";
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.23.1";
12+ version = "0.24.0";
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 = "0kmmhn357k22ana0ysd8jlz1fyfaqlc8k74ryaik0rrw7nmn1n11";
20+ sha256 = "sha256-LHAlGWoASDiFwvy59uXl5GH5pPmMuthoo4ZrFegkCIU=";
2121 };
2222
2323 propagatedBuildInputs = [
pkgs/servers/home-assistant/component-packages.nix+31−25
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "2021.4.6";
5+ version = "2021.5.0";
66 components = {
77 "abode" = ps: with ps; [ abodepy ];
88 "accuweather" = ps: with ps; [ accuweather ];
@@ -40,7 +40,7 @@
4040 "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
4141 "api" = ps: with ps; [ aiohttp-cors ];
4242 "apns" = ps: with ps; [ ]; # missing inputs: apns2
43− "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ];
43+ "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv pyroute2 zeroconf ];
4444 "apprise" = ps: with ps; [ apprise ];
4545 "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib
4646 "aqualogic" = ps: with ps; [ aqualogic ];
@@ -110,7 +110,7 @@
110110 "calendar" = ps: with ps; [ aiohttp-cors ];
111111 "camera" = ps: with ps; [ aiohttp-cors ];
112112 "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary
113− "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ];
113+ "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ];
114114 "cert_expiry" = ps: with ps; [ ];
115115 "channels" = ps: with ps; [ pychannels ];
116116 "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
@@ -133,6 +133,7 @@
133133 "comed_hourly_pricing" = ps: with ps; [ ];
134134 "comfoconnect" = ps: with ps; [ pycomfoconnect ];
135135 "command_line" = ps: with ps; [ ];
136+ "compensation" = ps: with ps; [ numpy ];
136137 "concord232" = ps: with ps; [ ]; # missing inputs: concord232
137138 "config" = ps: with ps; [ aiohttp-cors ];
138139 "configurator" = ps: with ps; [ ];
@@ -155,28 +156,28 @@
155156 "deconz" = ps: with ps; [ pydeconz ];
156157 "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
157158 "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
158− "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];
159+ "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ];
159160 "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
160161 "deluge" = ps: with ps; [ deluge-client ];
161162 "demo" = ps: with ps; [ aiohttp-cors ];
162163 "denon" = ps: with ps; [ ];
163− "denonavr" = ps: with ps; [ denonavr getmac ];
164+ "denonavr" = ps: with ps; [ denonavr ];
164165 "derivative" = ps: with ps; [ ];
165166 "deutsche_bahn" = ps: with ps; [ schiene ];
166167 "device_automation" = ps: with ps; [ ];
167168 "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
168169 "device_tracker" = ps: with ps; [ ];
169− "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ];
170+ "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api pyroute2 zeroconf ];
170171 "dexcom" = ps: with ps; [ pydexcom ];
171172 "dhcp" = ps: with ps; [ aiodiscover scapy ];
172− "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
173+ "dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht
173174 "dialogflow" = ps: with ps; [ aiohttp-cors ];
174175 "digital_ocean" = ps: with ps; [ digital-ocean ];
175176 "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
176177 "directv" = ps: with ps; [ ]; # missing inputs: directv
177178 "discogs" = ps: with ps; [ discogs_client ];
178179 "discord" = ps: with ps; [ discordpy ];
179− "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ];
180+ "discovery" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ];
180181 "dlib_face_detect" = ps: with ps; [ face_recognition ];
181182 "dlib_face_identify" = ps: with ps; [ face_recognition ];
182183 "dlink" = ps: with ps; [ ]; # missing inputs: pyW215
@@ -196,7 +197,7 @@
196197 "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ];
197198 "dweet" = ps: with ps; [ ]; # missing inputs: dweepy
198199 "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
199− "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ];
200+ "dyson" = ps: with ps; [ aiohttp-cors libpurecool pyroute2 zeroconf ];
200201 "eafm" = ps: with ps; [ aioeafm ];
201202 "ebox" = ps: with ps; [ ]; # missing inputs: pyebox
202203 "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
@@ -218,6 +219,7 @@
218219 "emby" = ps: with ps; [ pyemby ];
219220 "emoncms" = ps: with ps; [ ];
220221 "emoncms_history" = ps: with ps; [ ];
222+ "emonitor" = ps: with ps; [ aioemonitor ];
221223 "emulated_hue" = ps: with ps; [ aiohttp-cors ];
222224 "emulated_kasa" = ps: with ps; [ ]; # missing inputs: sense_energy
223225 "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku
@@ -232,13 +234,13 @@
232234 "epson" = ps: with ps; [ ]; # missing inputs: epson-projector
233235 "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter
234236 "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt
235− "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors zeroconf ];
237+ "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors pyroute2 zeroconf ];
236238 "essent" = ps: with ps; [ ]; # missing inputs: PyEssent
237239 "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
238240 "eufy" = ps: with ps; [ ]; # missing inputs: lakeside
239241 "everlights" = ps: with ps; [ pyeverlights ];
240242 "evohome" = ps: with ps; [ evohome-async ];
241− "ezviz" = ps: with ps; [ pyezviz ];
243+ "ezviz" = ps: with ps; [ ha-ffmpeg pyezviz ];
242244 "faa_delays" = ps: with ps; [ faadelays ];
243245 "facebook" = ps: with ps; [ ];
244246 "facebox" = ps: with ps; [ ];
@@ -280,7 +282,7 @@
280282 "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
281283 "freebox" = ps: with ps; [ freebox-api ];
282284 "freedns" = ps: with ps; [ ];
283− "fritz" = ps: with ps; [ fritzconnection ];
285+ "fritz" = ps: with ps; [ fritzconnection xmltodict ];
284286 "fritzbox" = ps: with ps; [ pyfritzhome ];
285287 "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
286288 "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
@@ -292,7 +294,6 @@
292294 "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect
293295 "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
294296 "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs
295− "geizhals" = ps: with ps; [ ]; # missing inputs: geizhals
296297 "generic" = ps: with ps; [ ];
297298 "generic_thermostat" = ps: with ps; [ ];
298299 "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
@@ -354,8 +355,8 @@
354355 "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ];
355356 "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ];
356357 "homeassistant" = ps: with ps; [ ];
357− "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ];
358− "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ];
358+ "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg pyroute2 zeroconf ];
359+ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors pyroute2 zeroconf ];
359360 "homematic" = ps: with ps; [ pyhomematic ];
360361 "homematicip_cloud" = ps: with ps; [ homematicip ];
361362 "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
@@ -374,6 +375,7 @@
374375 "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
375376 "hydrawise" = ps: with ps; [ hydrawiser ];
376377 "hyperion" = ps: with ps; [ hyperion-py ];
378+ "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
377379 "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
378380 "iaqualink" = ps: with ps; [ iaqualink ];
379381 "icloud" = ps: with ps; [ pyicloud ];
@@ -398,7 +400,7 @@
398400 "intent" = ps: with ps; [ aiohttp-cors ];
399401 "intent_script" = ps: with ps; [ ];
400402 "intesishome" = ps: with ps; [ pyintesishome ];
401− "ios" = ps: with ps; [ aiohttp-cors zeroconf ];
403+ "ios" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ];
402404 "iota" = ps: with ps; [ ]; # missing inputs: pyota
403405 "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
404406 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma
@@ -427,6 +429,7 @@
427429 "knx" = ps: with ps; [ xknx ];
428430 "kodi" = ps: with ps; [ pykodi ];
429431 "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
432+ "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore
430433 "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky
431434 "kwb" = ps: with ps; [ ]; # missing inputs: pykwb
432435 "lacrosse" = ps: with ps; [ pylacrosse ];
@@ -492,6 +495,7 @@
492495 "meraki" = ps: with ps; [ aiohttp-cors ];
493496 "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird
494497 "met" = ps: with ps; [ pymetno ];
498+ "met_eireann" = ps: with ps; [ ]; # missing inputs: pyMetEireann
495499 "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api
496500 "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi
497501 "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
@@ -517,6 +521,7 @@
517521 "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
518522 "moon" = ps: with ps; [ ];
519523 "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds
524+ "motioneye" = ps: with ps; [ ]; # missing inputs: motioneye-client
520525 "mpchc" = ps: with ps; [ ];
521526 "mpd" = ps: with ps; [ mpd2 ];
522527 "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
@@ -526,6 +531,7 @@
526531 "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ];
527532 "msteams" = ps: with ps; [ pymsteams ];
528533 "mullvad" = ps: with ps; [ mullvad-api ];
534+ "mutesync" = ps: with ps; [ ]; # missing inputs: mutesync
529535 "mvglive" = ps: with ps; [ PyMVGLive ];
530536 "my" = ps: with ps; [ aiohttp-cors pillow ];
531537 "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
@@ -577,7 +583,7 @@
577583 "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
578584 "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
579585 "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai
580− "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ];
586+ "octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ];
581587 "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
582588 "ohmconnect" = ps: with ps; [ defusedxml ];
583589 "ombi" = ps: with ps; [ ]; # missing inputs: pyombi
@@ -623,6 +629,7 @@
623629 "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs
624630 "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx
625631 "pi_hole" = ps: with ps; [ hole ];
632+ "picnic" = ps: with ps; [ python-picnic-api ];
626633 "picotts" = ps: with ps; [ ];
627634 "piglow" = ps: with ps; [ ]; # missing inputs: piglow
628635 "pilight" = ps: with ps; [ ]; # missing inputs: pilight
@@ -708,7 +715,7 @@
708715 "ruckus_unleashed" = ps: with ps; [ pyruckus ];
709716 "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
710717 "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
711− "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd
718+ "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; # missing inputs: pysabnzbd
712719 "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ];
713720 "saj" = ps: with ps; [ ]; # missing inputs: pysaj
714721 "samsungtv" = ps: with ps; [ samsungctl samsungtvws ];
@@ -767,7 +774,6 @@
767774 "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ];
768775 "snmp" = ps: with ps; [ pysnmp ];
769776 "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
770− "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient
771777 "solaredge" = ps: with ps; [ solaredge stringcase ];
772778 "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
773779 "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
@@ -779,7 +785,7 @@
779785 "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
780786 "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
781787 "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
782− "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ];
788+ "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch pyroute2 zeroconf ];
783789 "spaceapi" = ps: with ps; [ aiohttp-cors ];
784790 "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
785791 "speedtestdotnet" = ps: with ps; [ speedtest-cli ];
@@ -790,7 +796,7 @@
790796 "sql" = ps: with ps; [ sqlalchemy ];
791797 "squeezebox" = ps: with ps; [ pysqueezebox ];
792798 "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy
793− "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco zeroconf ];
799+ "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco pyroute2 zeroconf ];
794800 "starline" = ps: with ps; [ ]; # missing inputs: starline
795801 "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
796802 "startca" = ps: with ps; [ xmltodict ];
@@ -840,7 +846,7 @@
840846 "telnet" = ps: with ps; [ ];
841847 "temper" = ps: with ps; [ ]; # missing inputs: temperusb
842848 "template" = ps: with ps; [ ];
843− "tensorflow" = ps: with ps; [ numpy pillow tensorflow ]; # missing inputs: pycocotools tf-models-official
849+ "tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official
844850 "tesla" = ps: with ps; [ teslajsonpy ];
845851 "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
846852 "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke
@@ -958,7 +964,7 @@
958964 "xbox_live" = ps: with ps; [ xboxapi ];
959965 "xeoma" = ps: with ps; [ pyxeoma ];
960966 "xiaomi" = ps: with ps; [ ha-ffmpeg ];
961− "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ];
967+ "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco pyroute2 zeroconf ];
962968 "xiaomi_miio" = ps: with ps; [ construct python-miio ];
963969 "xiaomi_tv" = ps: with ps; [ pymitv ];
964970 "xmpp" = ps: with ps; [ slixmpp ];
@@ -974,10 +980,10 @@
974980 "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix
975981 "zamg" = ps: with ps; [ ];
976982 "zengge" = ps: with ps; [ ]; # missing inputs: zengge
977− "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
983+ "zeroconf" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ];
978984 "zerproc" = ps: with ps; [ pyzerproc ];
979985 "zestimate" = ps: with ps; [ xmltodict ];
980− "zha" = ps: with ps; [ aiohttp-cors bellows pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
986+ "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 ];
981987 "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
982988 "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
983989 "zodiac" = ps: with ps; [ ];
pkgs/servers/home-assistant/default.nix+17−42
@@ -22,24 +22,6 @@ let
2222 defaultOverrides = [
2323 # Override the version of some packages pinned in Home Assistant's setup.py
2424
25− # Pinned due to API changes in astral>=2.0, required by the sun/moon plugins
26− # https://github.com/home-assistant/core/pull/48573; Remove >= 2021.5
27− (mkOverride "astral" "1.10.1"
28− "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1")
29−
30− # Pinned due to API changes in brother>=1.0, remove >= 2021.5
31− (self: super: {
32− brother = super.brother.overridePythonAttrs (oldAttrs: rec {
33− version = "0.2.2";
34− src = fetchFromGitHub {
35− owner = "bieniu";
36− repo = "brother";
37− rev = version;
38− sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE=";
39− };
40− });
41− })
42−
4325 # Pinned due to API changes in iaqualink>=2.0, remove after
4426 # https://github.com/home-assistant/core/pull/48137 was merged
4527 (self: super: {
@@ -59,26 +41,6 @@ let
5941 (mkOverride "pyjwt" "1.7.1"
6042 "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd")
6143
62− # Pinned due to API changes in pykmtronic>=0.2.0
63− (mkOverride "pykmtronic" "0.0.3"
64− "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=")
65−
66− # Pinned due to API changes in pylilterbot>=2021.3.0
67− # https://github.com/home-assistant/core/pull/48300; Remove >= 2021.5
68− (self: super: {
69− pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: rec {
70− version = "2021.2.8";
71− src = fetchFromGitHub {
72− owner = "natekspencer";
73− repo = "pylitterbot";
74− rev = version;
75− sha256 = "142lhijm51v11cd0lhcfdnjdd143jxi2hjsrqdq0rrbbnmj6mymp";
76− };
77− # had no tests before 2021.3.0
78− doCheck = false;
79− });
80− })
81−
8244 # Pinned due to bug in ring-doorbell 0.7.0
8345 # https://github.com/tchellomello/python-ring-doorbell/issues/240
8446 (mkOverride "ring-doorbell" "0.6.2"
@@ -97,6 +59,19 @@ let
9759 });
9860 })
9961
62+ # Remove after https://github.com/NixOS/nixpkgs/pull/121854 has passed staging-next
63+ (self: super: {
64+ sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
65+ version = "1.4.13";
66+ src = oldAttrs.src.override {
67+ inherit version;
68+ sha256 = "0npsg38d11skv04zvsi90j93f6jdgm8666ds2ri7shr1pz1732hx";
69+ };
70+ patches = [];
71+ propagatedBuildInputs = [ python3.pkgs.greenlet ];
72+ });
73+ })
74+
10075 # hass-frontend does not exist in python3.pkgs
10176 (self: super: {
10277 hass-frontend = self.callPackage ./frontend.nix { };
@@ -130,7 +105,7 @@ let
130105 extraBuildInputs = extraPackages py.pkgs;
131106
132107 # Don't forget to run parse-requirements.py after updating
133− hassVersion = "2021.4.6";
108+ hassVersion = "2021.5.0";
134109
135110in with py.pkgs; buildPythonApplication rec {
136111 pname = "homeassistant";
@@ -149,7 +124,7 @@ in with py.pkgs; buildPythonApplication rec {
149124 owner = "home-assistant";
150125 repo = "core";
151126 rev = version;
152− sha256 = "1s1slwcqls2prz9kgyhggs8xi3x7ghwdi33j983kvpg0gva7d2f0";
127+ sha256 = "1kwx0bq2i76p9gbx5kkzkjxd88vzf2daccm0wf123693isk1nwzs";
153128 };
154129
155130 # leave this in, so users don't have to constantly update their downstream patch handling
@@ -162,8 +137,6 @@ in with py.pkgs; buildPythonApplication rec {
162137 --replace "bcrypt==3.1.7" "bcrypt" \
163138 --replace "cryptography==3.3.2" "cryptography" \
164139 --replace "pip>=8.0.3,<20.3" "pip" \
165− --replace "pytz>=2021.1" "pytz" \
166− --replace "pyyaml==5.4.1" "pyyaml" \
167140 --replace "ruamel.yaml==0.15.100" "ruamel.yaml"
168141 substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
169142 '';
@@ -453,6 +426,8 @@ in with py.pkgs; buildPythonApplication rec {
453426 "test_fetching_url_with_verify_ssl"
454427 # util/test_package.py: AssertionError on package.is_installed('homeassistant>=999.999.999')
455428 "test_check_package_version_does_not_match"
429+ # homeassistant/util/thread.py:51: SystemError
430+ "test_executor_shutdown_can_interrupt_threads"
456431 ];
457432
458433 preCheck = ''
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 = "20210407.3";
7+ version = "20210504.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "sha256-ucewS193kbvlk4Q+5IEYT6sfJ/H006uy0iIi8UHOzPo=";
11+ sha256 = "sha256-rNdqflWT8bmGHtAGGfq4xVxDcnK+EZU9qejRWQPJmUI=";
1212 };
1313
1414 # there is nothing to strip in this package