git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118758 from mweinelt/home-assistant
commit9803c87c07bb1bc10c6c21aa3d0fbf11368a166c authorMartin Weinelt <mweinelt@users.noreply.github.com> dateThu 8 Apr 2021, 18:06 (6 years ago) parent62670e9095f8f4
4 files changed+48−38
pkgs/development/python-modules/aiodiscover/default.nix+2−10 pkgs/servers/home-assistant/component-packages.nix+12−9 pkgs/servers/home-assistant/default.nix+32−17 pkgs/servers/home-assistant/frontend.nix+2−2
pkgs/development/python-modules/aiodiscover/default.nix+2−10
@@ -10,24 +10,16 @@
1010
1111buildPythonPackage rec {
1212 pname = "aiodiscover";
13− version = "1.3.2";
13+ version = "1.3.3";
1414 disabled = pythonOlder "3.7";
1515
1616 src = fetchFromGitHub {
1717 owner = "bdraco";
1818 repo = pname;
1919 rev = "v${version}";
20− sha256 = "0qg2wm6ddsfai788chylr5ynrvakwg91q3dszz7dxzbkfdcxixj3";
20+ sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph";
2121 };
2222
23− patches = [
24− (fetchpatch {
25− name = "remove-entry_point.patch";
26− url = "https://github.com/bdraco/aiodiscover/commit/4c497fb7d4c8685a78209c710e92e0bd17f46bb2.patch";
27− sha256 = "0py9alhg6qdncbn6a04mrnjhs4j19kg759dv69knpqzryikcfa63";
28− })
29− ];
30−
3123 propagatedBuildInputs = [
3224 async-dns
3325 pyroute2
pkgs/servers/home-assistant/component-packages.nix+12−9
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "2021.3.4";
5+ version = "2021.4.0";
66 components = {
77 "abode" = ps: with ps; [ abodepy ];
88 "accuweather" = ps: with ps; [ accuweather ];
@@ -31,6 +31,7 @@
3131 "ambient_station" = ps: with ps; [ aioambient ];
3232 "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
3333 "ampio" = ps: with ps; [ ]; # missing inputs: asmog
34+ "analytics" = ps: with ps; [ aiohttp-cors ];
3435 "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
3536 "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];
3637 "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
@@ -57,7 +58,7 @@
5758 "atag" = ps: with ps; [ ]; # missing inputs: pyatag
5859 "aten_pe" = ps: with ps; [ atenpdu ];
5960 "atome" = ps: with ps; [ ]; # missing inputs: pyatome
60− "august" = ps: with ps; [ ]; # missing inputs: py-august
61+ "august" = ps: with ps; [ yalexs ];
6162 "aurora" = ps: with ps; [ auroranoaa ];
6263 "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
6364 "auth" = ps: with ps; [ aiohttp-cors ];
@@ -154,7 +155,7 @@
154155 "deconz" = ps: with ps; [ pydeconz ];
155156 "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
156157 "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
157− "default_config" = ps: with ps; [ pynacl aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];
158+ "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];
158159 "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
159160 "deluge" = ps: with ps; [ deluge-client ];
160161 "demo" = ps: with ps; [ aiohttp-cors ];
@@ -167,7 +168,7 @@
167168 "device_tracker" = ps: with ps; [ ];
168169 "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ];
169170 "dexcom" = ps: with ps; [ pydexcom ];
170− "dhcp" = ps: with ps; [ scapy ];
171+ "dhcp" = ps: with ps; [ aiodiscover scapy ];
171172 "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
172173 "dialogflow" = ps: with ps; [ aiohttp-cors ];
173174 "digital_ocean" = ps: with ps; [ digital-ocean ];
@@ -277,7 +278,7 @@
277278 "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
278279 "foursquare" = ps: with ps; [ aiohttp-cors ];
279280 "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
280− "freebox" = ps: with ps; [ aiohttp-cors freebox-api netdisco zeroconf ];
281+ "freebox" = ps: with ps; [ freebox-api ];
281282 "freedns" = ps: with ps; [ ];
282283 "fritz" = ps: with ps; [ fritzconnection ];
283284 "fritzbox" = ps: with ps; [ pyfritzhome ];
@@ -326,7 +327,6 @@
326327 "gree" = ps: with ps; [ ]; # missing inputs: greeclimate
327328 "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
328329 "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
329− "griddy" = ps: with ps; [ ]; # missing inputs: griddypower
330330 "group" = ps: with ps; [ ];
331331 "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer
332332 "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
@@ -352,6 +352,7 @@
352352 "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
353353 "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
354354 "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect
355+ "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ];
355356 "homeassistant" = ps: with ps; [ ];
356357 "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ];
357358 "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ];
@@ -448,7 +449,7 @@
448449 "linux_battery" = ps: with ps; [ batinfo ];
449450 "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc
450451 "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet
451− "litterrobot" = ps: with ps; [ ]; # missing inputs: pylitterbot
452+ "litterrobot" = ps: with ps; [ pylitterbot ];
452453 "llamalab_automate" = ps: with ps; [ ];
453454 "local_file" = ps: with ps; [ ];
454455 "local_ip" = ps: with ps; [ ];
@@ -715,6 +716,7 @@
715716 "scene" = ps: with ps; [ ];
716717 "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
717718 "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ];
719+ "screenlogic" = ps: with ps; [ screenlogicpy ];
718720 "script" = ps: with ps; [ ];
719721 "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
720722 "search" = ps: with ps; [ aiohttp-cors ];
@@ -864,6 +866,7 @@
864866 "tplink" = ps: with ps; [ pyhs100 ];
865867 "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
866868 "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar
869+ "trace" = ps: with ps; [ ];
867870 "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr
868871 "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async]
869872 "trafikverket_train" = ps: with ps; [ pytrafikverket ];
@@ -906,7 +909,7 @@
906909 "velux" = ps: with ps; [ pyvlx ];
907910 "venstar" = ps: with ps; [ venstarcolortouch ];
908911 "vera" = ps: with ps; [ pyvera ];
909− "verisure" = ps: with ps; [ jsonpath vsure ];
912+ "verisure" = ps: with ps; [ vsure ];
910913 "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense
911914 "version" = ps: with ps; [ pyhaversion ];
912915 "vesync" = ps: with ps; [ pyvesync ];
@@ -974,7 +977,7 @@
974977 "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
975978 "zerproc" = ps: with ps; [ pyzerproc ];
976979 "zestimate" = ps: with ps; [ xmltodict ];
977− "zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
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 ];
978981 "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
979982 "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
980983 "zodiac" = ps: with ps; [ ];
pkgs/servers/home-assistant/default.nix+32−17
@@ -1,7 +1,6 @@
11{ stdenv
22, lib
33, fetchFromGitHub
4−, fetchpatch
54, python3
65, nixosTests
76
@@ -43,6 +42,21 @@ let
4342 });
4443 })
4544
45+ # Pinned due to API changes in pylilterbot>=2021.3.0
46+ (self: super: {
47+ pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: rec {
48+ version = "2021.2.8";
49+ src = fetchFromGitHub {
50+ owner = "natekspencer";
51+ repo = "pylitterbot";
52+ rev = version;
53+ sha256 = "142lhijm51v11cd0lhcfdnjdd143jxi2hjsrqdq0rrbbnmj6mymp";
54+ };
55+ # had no tests before 2021.3.0
56+ doCheck = false;
57+ });
58+ })
59+
4660 # Pinned due to bug in ring-doorbell 0.7.0
4761 # https://github.com/tchellomello/python-ring-doorbell/issues/240
4862 (mkOverride "ring-doorbell" "0.6.2"
@@ -81,7 +95,7 @@ let
8195 extraBuildInputs = extraPackages py.pkgs;
8296
8397 # Don't forget to run parse-requirements.py after updating
84− hassVersion = "2021.3.4";
98+ hassVersion = "2021.4.0";
8599
86100in with py.pkgs; buildPythonApplication rec {
87101 pname = "homeassistant";
@@ -100,32 +114,22 @@ in with py.pkgs; buildPythonApplication rec {
100114 owner = "home-assistant";
101115 repo = "core";
102116 rev = version;
103− sha256 = "110pvin39lr40zd3lhb8zvh2wafl0k0dy3nbmc483yafy31xa4kw";
117+ sha256 = "1gkbkyxqsw3isdyskzi0ib07fgqvirnr20jkhrz86vl0k9ix8hwf";
104118 };
105119
106120 # leave this in, so users don't have to constantly update their downstream patch handling
107121 patches = [
108− (fetchpatch {
109− # Fix I-frame interval in stream test video
110− # https://github.com/home-assistant/core/pull/47638
111− url = "https://github.com/home-assistant/core/commit/d9bf63103fde44ddd38fb6b9a510d82609802b36.patch";
112− sha256 = "1y34cmw9zqb2lxyzm0q7vxlm05wwz76mhysgnh1jn39484fn9f9m";
113− })
114122 ];
115123
116124 postPatch = ''
117125 substituteInPlace setup.py \
118− --replace "aiohttp==3.7.4" "aiohttp>=3.7.3" \
119− --replace "attrs==19.3.0" "attrs>=19.3.0" \
120− --replace "awesomeversion==21.2.3" "awesomeversion>=21.2.3" \
121− --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
126+ --replace "awesomeversion==21.2.3" "awesomeversion" \
127+ --replace "bcrypt==3.1.7" "bcrypt" \
122128 --replace "cryptography==3.3.2" "cryptography" \
123− --replace "httpx==0.16.1" "httpx>=0.16.1" \
124− --replace "jinja2>=2.11.3" "jinja2>=2.11.2" \
125129 --replace "pip>=8.0.3,<20.3" "pip" \
126− --replace "pytz>=2021.1" "pytz>=2020.5" \
130+ --replace "pytz>=2021.1" "pytz" \
127131 --replace "pyyaml==5.4.1" "pyyaml" \
128− --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
132+ --replace "ruamel.yaml==0.15.100" "ruamel.yaml"
129133 substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
130134 '';
131135
@@ -179,6 +183,7 @@ in with py.pkgs; buildPythonApplication rec {
179183 componentTests = [
180184 "accuweather"
181185 "airly"
186+ "analytics"
182187 "alert"
183188 "api"
184189 "auth"
@@ -231,6 +236,7 @@ in with py.pkgs; buildPythonApplication rec {
231236 "hddtemp"
232237 "history"
233238 "history_stats"
239+ "home_plus_control"
234240 "homekit"
235241 "homekit_controller"
236242 "homeassistant"
@@ -253,6 +259,7 @@ in with py.pkgs; buildPythonApplication rec {
253259 "ipp"
254260 "kmtronic"
255261 "light"
262+ "litterrobot"
256263 "local_file"
257264 "local_ip"
258265 "lock"
@@ -298,6 +305,7 @@ in with py.pkgs; buildPythonApplication rec {
298305 "rss_feed_template"
299306 "safe_mode"
300307 "scene"
308+ "screenlogic"
301309 "script"
302310 "search"
303311 "shell_command"
@@ -328,6 +336,7 @@ in with py.pkgs; buildPythonApplication rec {
328336 "time_date"
329337 "timer"
330338 "tod"
339+ "trace"
331340 "tts"
332341 "universal"
333342 "updater"
@@ -357,6 +366,8 @@ in with py.pkgs; buildPythonApplication rec {
357366 "--dist loadfile"
358367 # tests are located in tests/
359368 "tests"
369+ # screenlogic/test_config_flow.py: Tries to send out UDP broadcasts
370+ "--deselect tests/components/screenlogic/test_config_flow.py::test_form_cannot_connect"
360371 # dynamically add packages required for component tests
361372 ] ++ map (component: "tests/components/" + component) componentTests;
362373
@@ -379,9 +390,13 @@ in with py.pkgs; buildPythonApplication rec {
379390 # generic/test_camera.py: AssertionError: 500 == 200
380391 "test_fetching_without_verify_ssl"
381392 "test_fetching_url_with_verify_ssl"
393+ # util/test_package.py: AssertionError on package.is_installed('homeassistant>=999.999.999')
394+ "test_check_package_version_does_not_match"
382395 ];
383396
384397 preCheck = ''
398+ export HOME="$TEMPDIR"
399+
385400 # the tests require the existance of a media dir
386401 mkdir /build/media
387402
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 = "20210302.6";
7+ version = "20210407.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "sha256-h3jCqfAPg+z6vsdLm5Pdr+7PCEWW58GCG9viIz3Mi64=";
11+ sha256 = "sha256-7kgL6Ixlc1OZ+3sUAuvJd7vgY6FBgPFEKi6xhq7fiBc=";
1212 };
1313
1414 # there is nothing to strip in this package