Merge pull request #118943 from mweinelt/home-assistant

home-assistant: 2021.4.1 -> 2021.4.2
This commit is contained in:
Martin Weinelt 2021-04-10 11:58:58 +02:00 committed by GitHub
commit 8cbaf51809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 85 additions and 34 deletions

View File

@ -1,20 +1,37 @@
{ lib, buildPythonPackage, fetchPypi
, aiohttp, jsonrpc-base }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, jsonrpc-base
, pytest-aiohttp
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jsonrpc-async";
version = "1.1.1";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "383f331e28cd8f6e3fa86f3e7052efa541b7ae8bf328a4e692aa045cfc0ecf25";
src = fetchFromGitHub {
owner = "emlove";
repo = pname;
rev = version;
sha256 = "1ff3523rwgira5llmf5iriwqag7b6ln9vmj0s70yyc6k98yg06rp";
};
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
checkInputs = [
pytest-aiohttp
pytestCheckHook
];
pytestFlagsArray = [
"tests.py"
];
meta = with lib; {
description = "A JSON-RPC client library for asyncio";
homepage = "https://github.com/armills/jsonrpc-async";
homepage = "https://github.com/emlove/jsonrpc-async";
license = licenses.bsd3;
maintainers = with maintainers; [ peterhoeg ];
};

View File

@ -1,19 +1,31 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jsonrpc-base";
version = "1.1.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7";
src = fetchFromGitHub {
owner = "emlove";
repo = pname;
rev = version;
sha256 = "0xxhn0vb7mr8k1w9xbqhhyx9qkgkc318qkyflgfbvjc926n50680";
};
propagatedBuildInputs = [ ];
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"tests.py"
];
meta = with lib; {
description = "A JSON-RPC client library base interface";
homepage = "https://github.com/armills/jsonrpc-base";
homepage = "https://github.com/emlove/jsonrpc-base";
license = licenses.bsd3;
maintainers = with maintainers; [ peterhoeg ];
};

View File

@ -1,28 +1,36 @@
{ lib, buildPythonPackage, fetchPypi
, aiohttp, jsonrpc-base, pep8
, pytestCheckHook
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
, jsonrpc-base
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jsonrpc-websocket";
version = "1.2.1";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "c343d057b572791ed3107b771c17358bc710772a9a6156047a3cfafb409ed895";
sha256 = "0fmw8xjzlhi7r84swn4w3njy389qqll5ad5ljdq5n2wpg424k98h";
};
nativeBuildInputs = [ pep8 ];
propagatedBuildInputs = [
aiohttp
jsonrpc-base
];
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
checkInputs = [
pytestCheckHook
pytest-asyncio
];
checkInputs = [ pytestCheckHook pytest-asyncio ];
pytestFlagsArray = [ "tests.py" ];
meta = with lib; {
description = "A JSON-RPC websocket client library for asyncio";
homepage = "https://github.com/armills/jsonrpc-websocket";
homepage = "https://github.com/emlove/jsonrpc-websocket";
license = licenses.bsd3;
maintainers = with maintainers; [ peterhoeg ];
};

View File

@ -1,15 +1,28 @@
{ lib, buildPythonPackage, fetchPypi, aiohttp, jsonrpc-async, jsonrpc-websocket }:
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
, jsonrpc-async
, jsonrpc-websocket
}:
buildPythonPackage rec {
pname = "pykodi";
version = "0.2.3";
version = "0.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "099xyn5aql5mdim6kh4hwx0fg1a3bx73qdvwr48nz23cljmmk1m8";
sha256 = "1al2q4jiqxjnz0j2xvs2hqzrz6fm3hmda5zjnkp8gdvgchd1cmn7";
};
propagatedBuildInputs = [ aiohttp jsonrpc-async jsonrpc-websocket ];
propagatedBuildInputs = [
aiohttp
jsonrpc-async
jsonrpc-websocket
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "pykodi" ];

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.55";
version = "0.0.56";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zha-device-handlers";
rev = version;
sha256 = "sha256-mc7mOaxn2FCvwYv9yE0mIOSQ1F+xJJ+1LynOdEV07I8=";
sha256 = "1jss5pnxdjlp0kplqxgr09vv1zq9n7l9w08hsywy2vglqmd67a66";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.4.1";
version = "2021.4.2";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

View File

@ -95,7 +95,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.4.1";
hassVersion = "2021.4.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -114,7 +114,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "154bmbxhyfv1sxa6fk5vimqjmvci710bm5pj590blyzbr4nyci77";
sha256 = "0z6a5m1yflnz468njp8v7vd189gv5pc63kji14f4fx4nfzbxhqdk";
};
# 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 {
"intent_script"
"ipp"
"kmtronic"
"kodi"
"light"
"litterrobot"
"local_file"

View File

@ -4,11 +4,11 @@ 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 = "20210407.2";
version = "20210407.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MxXeept0qwDIs9tFZCd1JfDY1Csl8gLWOhzW/Ihlbzw=";
sha256 = "sha256-ucewS193kbvlk4Q+5IEYT6sfJ/H006uy0iIi8UHOzPo=";
};
# there is nothing to strip in this package