git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118943 from mweinelt/home-assistant

home-assistant: 2021.4.1 -> 2021.4.2

commit8cbaf5180977998c356c3711425fc8f105173cef authorMartin Weinelt <mweinelt@users.noreply.github.com> dateSat 10 Apr 2021, 11:58 (6 years ago) parentecd2d633c88bee
8 files changed+85−34
pkgs/development/python-modules/jsonrpc-async/default.nix+24−7 pkgs/development/python-modules/jsonrpc-base/default.nix+19−7 pkgs/development/python-modules/jsonrpc-websocket/default.nix+17−9 pkgs/development/python-modules/pykodi/default.nix+17−4 pkgs/development/python-modules/zha-quirks/default.nix+2−2 pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/servers/home-assistant/default.nix+3−2 pkgs/servers/home-assistant/frontend.nix+2−2
pkgs/development/python-modules/jsonrpc-async/default.nix+24−7
@@ -1,20 +1,37 @@
1−{ lib, buildPythonPackage, fetchPypi
2−, aiohttp, jsonrpc-base }:
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, aiohttp
5+, jsonrpc-base
6+, pytest-aiohttp
7+, pytestCheckHook
8+}:
39
410buildPythonPackage rec {
511 pname = "jsonrpc-async";
6− version = "1.1.1";
12+ version = "2.0.0";
713
8− src = fetchPypi {
9− inherit pname version;
10− sha256 = "383f331e28cd8f6e3fa86f3e7052efa541b7ae8bf328a4e692aa045cfc0ecf25";
14+ src = fetchFromGitHub {
15+ owner = "emlove";
16+ repo = pname;
17+ rev = version;
18+ sha256 = "1ff3523rwgira5llmf5iriwqag7b6ln9vmj0s70yyc6k98yg06rp";
1119 };
1220
1321 propagatedBuildInputs = [ aiohttp jsonrpc-base ];
1422
23+ checkInputs = [
24+ pytest-aiohttp
25+ pytestCheckHook
26+ ];
27+
28+ pytestFlagsArray = [
29+ "tests.py"
30+ ];
31+
1532 meta = with lib; {
1633 description = "A JSON-RPC client library for asyncio";
17− homepage = "https://github.com/armills/jsonrpc-async";
34+ homepage = "https://github.com/emlove/jsonrpc-async";
1835 license = licenses.bsd3;
1936 maintainers = with maintainers; [ peterhoeg ];
2037 };
pkgs/development/python-modules/jsonrpc-base/default.nix+19−7
@@ -1,19 +1,31 @@
1−{ lib, buildPythonPackage, fetchPypi }:
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, pytestCheckHook
5+}:
26
37buildPythonPackage rec {
48 pname = "jsonrpc-base";
5− version = "1.1.0";
9+ version = "2.0.0";
610
7− src = fetchPypi {
8− inherit pname version;
9− sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7";
11+ src = fetchFromGitHub {
12+ owner = "emlove";
13+ repo = pname;
14+ rev = version;
15+ sha256 = "0xxhn0vb7mr8k1w9xbqhhyx9qkgkc318qkyflgfbvjc926n50680";
1016 };
1117
12− propagatedBuildInputs = [ ];
18+ checkInputs = [
19+ pytestCheckHook
20+ ];
21+
22+ pytestFlagsArray = [
23+ "tests.py"
24+ ];
1325
1426 meta = with lib; {
1527 description = "A JSON-RPC client library base interface";
16− homepage = "https://github.com/armills/jsonrpc-base";
28+ homepage = "https://github.com/emlove/jsonrpc-base";
1729 license = licenses.bsd3;
1830 maintainers = with maintainers; [ peterhoeg ];
1931 };
pkgs/development/python-modules/jsonrpc-websocket/default.nix+17−9
@@ -1,28 +1,36 @@
1−{ lib, buildPythonPackage, fetchPypi
2−, aiohttp, jsonrpc-base, pep8
3−, pytestCheckHook
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, aiohttp
5+, jsonrpc-base
46, pytest-asyncio
7+, pytestCheckHook
58}:
69
710buildPythonPackage rec {
811 pname = "jsonrpc-websocket";
9− version = "1.2.1";
12+ version = "3.0.0";
1013
1114 src = fetchPypi {
1215 inherit pname version;
13− sha256 = "c343d057b572791ed3107b771c17358bc710772a9a6156047a3cfafb409ed895";
16+ sha256 = "0fmw8xjzlhi7r84swn4w3njy389qqll5ad5ljdq5n2wpg424k98h";
1417 };
1518
16− nativeBuildInputs = [ pep8 ];
19+ propagatedBuildInputs = [
20+ aiohttp
21+ jsonrpc-base
22+ ];
1723
18− propagatedBuildInputs = [ aiohttp jsonrpc-base ];
24+ checkInputs = [
25+ pytestCheckHook
26+ pytest-asyncio
27+ ];
1928
20− checkInputs = [ pytestCheckHook pytest-asyncio ];
2129 pytestFlagsArray = [ "tests.py" ];
2230
2331 meta = with lib; {
2432 description = "A JSON-RPC websocket client library for asyncio";
25− homepage = "https://github.com/armills/jsonrpc-websocket";
33+ homepage = "https://github.com/emlove/jsonrpc-websocket";
2634 license = licenses.bsd3;
2735 maintainers = with maintainers; [ peterhoeg ];
2836 };
pkgs/development/python-modules/pykodi/default.nix+17−4
@@ -1,15 +1,28 @@
1−{ lib, buildPythonPackage, fetchPypi, aiohttp, jsonrpc-async, jsonrpc-websocket }:
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, aiohttp
5+, jsonrpc-async
6+, jsonrpc-websocket
7+}:
28
39buildPythonPackage rec {
410 pname = "pykodi";
5− version = "0.2.3";
11+ version = "0.2.5";
612
713 src = fetchPypi {
814 inherit pname version;
9− sha256 = "099xyn5aql5mdim6kh4hwx0fg1a3bx73qdvwr48nz23cljmmk1m8";
15+ sha256 = "1al2q4jiqxjnz0j2xvs2hqzrz6fm3hmda5zjnkp8gdvgchd1cmn7";
1016 };
1117
12− propagatedBuildInputs = [ aiohttp jsonrpc-async jsonrpc-websocket ];
18+ propagatedBuildInputs = [
19+ aiohttp
20+ jsonrpc-async
21+ jsonrpc-websocket
22+ ];
23+
24+ # has no tests
25+ doCheck = false;
1326
1427 pythonImportsCheck = [ "pykodi" ];
1528
pkgs/development/python-modules/zha-quirks/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010buildPythonPackage rec {
1111 pname = "zha-quirks";
12− version = "0.0.55";
12+ version = "0.0.56";
1313
1414 src = fetchFromGitHub {
1515 owner = "zigpy";
1616 repo = "zha-device-handlers";
1717 rev = version;
18− sha256 = "sha256-mc7mOaxn2FCvwYv9yE0mIOSQ1F+xJJ+1LynOdEV07I8=";
18+ sha256 = "1jss5pnxdjlp0kplqxgr09vv1zq9n7l9w08hsywy2vglqmd67a66";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/servers/home-assistant/component-packages.nix+1−1
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "2021.4.1";
5+ version = "2021.4.2";
66 components = {
77 "abode" = ps: with ps; [ abodepy ];
88 "accuweather" = ps: with ps; [ accuweather ];
pkgs/servers/home-assistant/default.nix+3−2
@@ -95,7 +95,7 @@ let
9595 extraBuildInputs = extraPackages py.pkgs;
9696
9797 # Don't forget to run parse-requirements.py after updating
98− hassVersion = "2021.4.1";
98+ hassVersion = "2021.4.2";
9999
100100in with py.pkgs; buildPythonApplication rec {
101101 pname = "homeassistant";
@@ -114,7 +114,7 @@ in with py.pkgs; buildPythonApplication rec {
114114 owner = "home-assistant";
115115 repo = "core";
116116 rev = version;
117− sha256 = "154bmbxhyfv1sxa6fk5vimqjmvci710bm5pj590blyzbr4nyci77";
117+ sha256 = "0z6a5m1yflnz468njp8v7vd189gv5pc63kji14f4fx4nfzbxhqdk";
118118 };
119119
120120 # leave this in, so users don't have to constantly update their downstream patch handling
@@ -259,6 +259,7 @@ in with py.pkgs; buildPythonApplication rec {
259259 "intent_script"
260260 "ipp"
261261 "kmtronic"
262+ "kodi"
262263 "light"
263264 "litterrobot"
264265 "local_file"
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.2";
7+ version = "20210407.3";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "sha256-MxXeept0qwDIs9tFZCd1JfDY1Csl8gLWOhzW/Ihlbzw=";
11+ sha256 = "sha256-ucewS193kbvlk4Q+5IEYT6sfJ/H006uy0iIi8UHOzPo=";
1212 };
1313
1414 # there is nothing to strip in this package