From fb4ffa649f4edfd844cbd26671609761f462b463 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 00:22:54 +0200 Subject: [PATCH 1/7] home-assistant: 2021.4.1 -> 2021.4.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3ef0896f007..4385c2e1b26 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 = "2021.4.1"; + version = "2021.4.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index adf4c302826..4f95364b936 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -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 diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 54a01c87ce9..83af5b85c87 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -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 From e9ad3e3e107c30f1a80ed3aeb1f60d24a3ce198a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 00:37:31 +0200 Subject: [PATCH 2/7] python3Packages.zha-quirks: 0.0.55 -> 0.0.56 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 34a4c90d190..d9c42910e64 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -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 = [ From d23d0aa3bbda30b30afa7fa6802c4d030d63269a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 01:23:27 +0200 Subject: [PATCH 3/7] python3Packages.jsonrpc-async: 1.1.1. -> 2.0.0 Fetch from GitHub to run tests, update homepage. --- .../python-modules/jsonrpc-async/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 00f0d748bbb..9a53e852f1a 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -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 ]; }; From 3779c011106195b2b5e0b7bd58b573e371143476 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 01:24:28 +0200 Subject: [PATCH 4/7] python3Packages.jsonrpc-base: 1.1.0 -> 2.0.0 Fetch source from GitHub so we can run tests, update homepage. --- .../python-modules/jsonrpc-base/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index db47a2240fb..008b181b9ef 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -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 ]; }; From 47e2cb49d5504d2b7e8b8e476acd3f06ca2198cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 01:28:18 +0200 Subject: [PATCH 5/7] python3Packages.jsonrpc-websocket: 1.2.2 -> 3.0.0 --- .../jsonrpc-websocket/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index bf8960ad27d..faecca760d3 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -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 ]; }; From e27e160247d7a3f8081828081775d9c29213fb2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 00:37:12 +0200 Subject: [PATCH 6/7] python3Packages.pykodi: 0.2.3 -> 0.2.5 --- .../python-modules/pykodi/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pykodi/default.nix b/pkgs/development/python-modules/pykodi/default.nix index 24450270a83..a0ca9a4c573 100644 --- a/pkgs/development/python-modules/pykodi/default.nix +++ b/pkgs/development/python-modules/pykodi/default.nix @@ -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" ]; From 3c88beebb0b3f2b66e873868d03ced3918242e86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Apr 2021 01:43:57 +0200 Subject: [PATCH 7/7] home-assistant: enable kodi component test --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4f95364b936..1d0a0b308aa 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -258,6 +258,7 @@ in with py.pkgs; buildPythonApplication rec { "intent_script" "ipp" "kmtronic" + "kodi" "light" "litterrobot" "local_file"