Merge pull request #101557 from mvnetbiz/zigpy-znp

home-assistant: pythonPackages.zigpy-znp: init at 0.2.2; pythonPackages.zigpy: 0.22.2 -> 0.26.0; pythonPackages.zigpy-cc: 0.5.1 -> 0.5.2; pythonPackages.zigpy-xbee: 0.12.1 -> 0.13.0; pythonPackages.zigpy-zigate: 0.6.1 -> 0.6.2

Changed files
+195 -48
pkgs
development
python-modules
zigpy
zigpy-cc
zigpy-xbee
zigpy-zigate
zigpy-znp
servers
home-assistant
top-level
+34 -12
pkgs/development/python-modules/zigpy-cc/default.nix
···
-
{ stdenv, buildPythonPackage, fetchPypi
-
, pyserial, pyserial-asyncio, zigpy
-
, asynctest, pytest, pytest-asyncio }:
+
{ lib
+
, asynctest
+
, buildPythonPackage
+
, fetchFromGitHub
+
, pyserial
+
, pyserial-asyncio
+
, pytest-asyncio
+
, pytestCheckHook
+
, pythonOlder
+
, zigpy }:
buildPythonPackage rec {
pname = "zigpy-cc";
-
version = "0.5.1";
+
version = "0.5.2";
+
# https://github.com/Martiusweb/asynctest/issues/152
+
# broken by upstream python bug with asynctest and
+
# is used exclusively by home-assistant with python 3.8
+
disabled = pythonOlder "3.8";
-
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
-
checkInputs = [ asynctest pytest pytest-asyncio ];
-
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "06759615b28c45beaa5f03e594769a373d41674b96aeafefccd5c4e1c67e25ca";
+
src = fetchFromGitHub {
+
owner = "zigpy";
+
repo = "zigpy-cc";
+
rev = version;
+
sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
};
-
meta = with stdenv.lib; {
+
propagatedBuildInputs = [
+
pyserial
+
pyserial-asyncio
+
zigpy
+
];
+
+
checkInputs = [
+
asynctest
+
pytest-asyncio
+
pytestCheckHook
+
];
+
+
meta = with lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
-
homepage = "http://github.com/sanyatuning/zigpy-cc";
+
homepage = "https://github.com/zigpy/zigpy-cc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
+33 -11
pkgs/development/python-modules/zigpy-xbee/default.nix
···
-
{ stdenv, buildPythonPackage, fetchPypi
-
, pyserial, pyserial-asyncio, zigpy
-
, pytest }:
+
{ lib
+
, asynctest
+
, buildPythonPackage
+
, fetchFromGitHub
+
, pyserial
+
, pyserial-asyncio
+
, pytest-asyncio
+
, pytestCheckHook
+
, pythonOlder
+
, zigpy }:
buildPythonPackage rec {
pname = "zigpy-xbee";
-
version = "0.12.1";
-
-
buildInputs = [ pyserial pyserial-asyncio zigpy ];
-
checkInputs = [ pytest ];
+
version = "0.13.0";
+
# https://github.com/Martiusweb/asynctest/issues/152
+
# broken by upstream python bug with asynctest and
+
# is used exclusively by home-assistant with python 3.8
+
disabled = pythonOlder "3.8";
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh";
+
src = fetchFromGitHub {
+
owner = "zigpy";
+
repo = "zigpy-xbee";
+
rev = version;
+
sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU=";
};
-
meta = with stdenv.lib; {
+
buildInputs = [
+
pyserial
+
pyserial-asyncio
+
zigpy
+
];
+
+
checkInputs = [
+
asynctest
+
pytest-asyncio
+
pytestCheckHook
+
];
+
+
meta = with lib; {
description = "A library which communicates with XBee radios for zigpy";
homepage = "http://github.com/zigpy/zigpy-xbee";
license = licenses.gpl3Plus;
+34 -12
pkgs/development/python-modules/zigpy-zigate/default.nix
···
-
{ stdenv, buildPythonPackage, fetchPypi
-
, pyserial, pyserial-asyncio, zigpy
-
, pytest }:
+
{ lib
+
, asynctest
+
, buildPythonPackage
+
, fetchFromGitHub
+
, pyserial
+
, pyserial-asyncio
+
, pytest-asyncio
+
, pytestCheckHook
+
, pythonOlder
+
, zigpy }:
buildPythonPackage rec {
pname = "zigpy-zigate";
-
version = "0.6.1";
+
version = "0.6.2";
+
# https://github.com/Martiusweb/asynctest/issues/152
+
# broken by upstream python bug with asynctest and
+
# is used exclusively by home-assistant with python 3.8
+
disabled = pythonOlder "3.8";
-
buildInputs = [ pyserial pyserial-asyncio zigpy ];
-
checkInputs = [ pytest ];
-
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5";
+
src = fetchFromGitHub {
+
owner = "zigpy";
+
repo = "zigpy-zigate";
+
rev = version;
+
sha256 = "EV6DV+BytUcPMtzYVKDnq/Uv2efg3stjL5uVlL62II4=";
};
-
meta = with stdenv.lib; {
+
buildInputs = [
+
pyserial
+
pyserial-asyncio
+
zigpy
+
];
+
+
checkInputs = [
+
asynctest
+
pytest-asyncio
+
pytestCheckHook
+
];
+
+
meta = with lib; {
description = "A library which communicates with ZiGate radios for zigpy";
-
homepage = "http://github.com/doudz/zigpy-zigate";
+
homepage = "https://github.com/zigpy/zigpy-zigate";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
+55
pkgs/development/python-modules/zigpy-znp/default.nix
···
+
{ stdenv
+
, async-timeout
+
, asynctest
+
, buildPythonPackage
+
, coloredlogs
+
, coveralls
+
, fetchFromGitHub
+
, pyserial
+
, pyserial-asyncio
+
, pytest-asyncio
+
, pytest-mock
+
, pytest-timeout
+
, pytestcov
+
, pytestCheckHook
+
, voluptuous
+
, zigpy }:
+
+
buildPythonPackage rec {
+
pname = "zigpy-znp";
+
version = "0.2.2";
+
+
src = fetchFromGitHub {
+
owner = "zha-ng";
+
repo = "zigpy-znp";
+
rev = "v${version}";
+
sha256 = "a98RYPvcYE1NPERmPo1jPwMf86N+0297u4pOKuaB6u4=";
+
};
+
+
propagatedBuildInputs = [
+
async-timeout
+
coloredlogs
+
pyserial
+
pyserial-asyncio
+
voluptuous
+
zigpy
+
];
+
+
checkInputs = [
+
asynctest
+
coveralls
+
pytest-asyncio
+
pytest-mock
+
pytest-timeout
+
pytestcov
+
pytestCheckHook
+
];
+
+
meta = with stdenv.lib; {
+
description = "A library for zigpy which communicates with TI ZNP radios";
+
homepage = "https://github.com/zha-ng/zigpy-znp";
+
license = licenses.gpl3Plus;
+
maintainers = with maintainers; [ mvnetbiz ];
+
platforms = platforms.linux;
+
};
+
}
+35 -11
pkgs/development/python-modules/zigpy/default.nix
···
-
{ stdenv, buildPythonPackage, fetchPypi
-
, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous
-
, pytest, pytest-asyncio, asynctest }:
+
{ lib
+
, aiohttp
+
, asynctest
+
, buildPythonPackage
+
, crccheck
+
, fetchFromGitHub
+
, pycrypto
+
, pycryptodome
+
, pytest-aiohttp
+
, pytest-asyncio
+
, pytestCheckHook
+
, tox
+
, voluptuous }:
buildPythonPackage rec {
pname = "zigpy";
-
version = "0.22.2";
+
version = "0.26.0";
-
propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ];
-
checkInputs = [ pytest pytest-asyncio asynctest ];
-
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "a43129932c6e4af0d2d57542218faf7695e2424ce18a5a8915d016e1303f5e44";
+
src = fetchFromGitHub {
+
owner = "zigpy";
+
repo = "zigpy";
+
rev = version;
+
sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs=";
};
-
meta = with stdenv.lib; {
+
propagatedBuildInputs = [
+
aiohttp
+
crccheck
+
pycrypto
+
pycryptodome
+
voluptuous
+
];
+
+
checkInputs = [
+
asynctest
+
pytest-aiohttp
+
pytest-asyncio
+
pytestCheckHook
+
];
+
+
meta = with lib; {
description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy";
license = licenses.gpl3Plus;
+2 -2
pkgs/servers/home-assistant/component-packages.nix
···
"apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
"api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ]; # missing inputs: apns2
-
"apple_tv" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pyatv
+
"apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ];
"apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy
"aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
···
"zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
"zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
"zestimate" = ps: with ps; [ xmltodict ];
-
"zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; # missing inputs: zigpy-znp
+
"zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
"zodiac" = ps: with ps; [ ];
+2
pkgs/top-level/python-packages.nix
···
zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { };
+
zigpy-znp = callPackage ../development/python-modules/zigpy-znp { };
+
zimports = callPackage ../development/python-modules/zimports { };
zipfile36 = callPackage ../development/python-modules/zipfile36 { };