git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92801 from mvnetbiz/fix-zigbee

home-assistant: fix zha in home-assistant

commitf7334cad427d8eb80a51247a443cfc85514fdba0 authorElis Hirwing <elis@hirwing.se> dateSat 11 Jul 2020, 20:54 (6 years ago) parent7b4e7329fb7c8e
9 files changed+149−14
pkgs/development/python-modules/bellows/default.nix+37 pkgs/development/python-modules/pure-pcapy3/default.nix+18 pkgs/development/python-modules/zigpy-cc/default.nix+24 pkgs/development/python-modules/zigpy-deconz/default.nix+4−5 pkgs/development/python-modules/zigpy-xbee/default.nix+24 pkgs/development/python-modules/zigpy-zigate/default.nix+24 pkgs/development/python-modules/zigpy/default.nix+7−8 pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/top-level/python-packages.nix+10
pkgs/development/python-modules/bellows/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ stdenv, buildPythonPackage, fetchPypi
2+, click, click-log, pure-pcapy3
3+, pyserial, pyserial-asyncio, voluptuous, zigpy
4+, asynctest, pytest, pytest-asyncio }:
5+
6+let
7+ pname = "bellows";
8+ version = "0.17.0";
9+
10+in buildPythonPackage rec {
11+ inherit pname version;
12+
13+ src = fetchPypi {
14+ inherit pname version;
15+ sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6";
16+ };
17+
18+ propagatedBuildInputs = [
19+ click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy
20+ ];
21+
22+ checkInputs = [
23+ asynctest pytest pytest-asyncio
24+ ];
25+
26+ prePatch = ''
27+ substituteInPlace setup.py \
28+ --replace "click-log==0.2.0" "click-log>=0.2.0"
29+ '';
30+
31+ meta = with stdenv.lib; {
32+ description = "A Python 3 project to implement EZSP for EmberZNet devices";
33+ homepage = "https://github.com/zigpy/bellows";
34+ license = licenses.gpl3Plus;
35+ maintainers = with maintainers; [ etu mvnetbiz ];
36+ };
37+}
pkgs/development/python-modules/pure-pcapy3/default.nixnew file+18
@@ -0,0 +1,18 @@
1+{ stdenv, buildPythonPackage, fetchPypi }:
2+
3+buildPythonPackage rec {
4+ pname = "pure-pcapy3";
5+ version = "1.0.1";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr";
10+ };
11+
12+ meta = with stdenv.lib; {
13+ description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
14+ homepage = "http://bitbucket.org/viraptor/pure-pcapy";
15+ license = licenses.bsd2;
16+ maintainers = with maintainers; [ etu ];
17+ };
18+}
pkgs/development/python-modules/zigpy-cc/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, buildPythonPackage, fetchPypi
2+, pyserial, pyserial-asyncio, zigpy
3+, asynctest, pytest, pytest-asyncio }:
4+
5+buildPythonPackage rec {
6+ pname = "zigpy-cc";
7+ version = "0.4.4";
8+
9+ propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
10+ checkInputs = [ asynctest pytest pytest-asyncio ];
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl";
15+ };
16+
17+ meta = with stdenv.lib; {
18+ description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
19+ homepage = "http://github.com/sanyatuning/zigpy-cc";
20+ license = licenses.gpl3Plus;
21+ maintainers = with maintainers; [ etu mvnetbiz ];
22+ platforms = platforms.linux;
23+ };
24+}
pkgs/development/python-modules/zigpy-deconz/default.nix+4−5
@@ -1,14 +1,13 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy
3−, pytest }:
2+, pyserial, pyserial-asyncio, zigpy
3+, pytest, pytest-asyncio, asynctest }:
44
55buildPythonPackage rec {
66 pname = "zigpy-deconz";
77 version = "0.9.2";
88
9− nativeBuildInputs = [ pytest ];
10− buildInputs = [ aiohttp crccheck pycryptodome ];
119 propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
10+ checkInputs = [ pytest pytest-asyncio asynctest ];
1211
1312 src = fetchPypi {
1413 inherit pname version;
@@ -19,7 +18,7 @@ buildPythonPackage rec {
1918 description = "Library which communicates with Deconz radios for zigpy";
2019 homepage = "https://github.com/zigpy/zigpy-deconz";
2120 license = licenses.gpl3Plus;
22− maintainers = with maintainers; [ etu ];
21+ maintainers = with maintainers; [ etu mvnetbiz ];
2322 platforms = platforms.linux;
2423 };
2524}
pkgs/development/python-modules/zigpy-xbee/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, buildPythonPackage, fetchPypi
2+, pyserial, pyserial-asyncio, zigpy
3+, pytest }:
4+
5+buildPythonPackage rec {
6+ pname = "zigpy-xbee";
7+ version = "0.12.1";
8+
9+ buildInputs = [ pyserial pyserial-asyncio zigpy ];
10+ checkInputs = [ pytest ];
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh";
15+ };
16+
17+ meta = with stdenv.lib; {
18+ description = "A library which communicates with XBee radios for zigpy";
19+ homepage = "http://github.com/zigpy/zigpy-xbee";
20+ license = licenses.gpl3Plus;
21+ maintainers = with maintainers; [ etu mvnetbiz ];
22+ platforms = platforms.linux;
23+ };
24+}
pkgs/development/python-modules/zigpy-zigate/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ stdenv, buildPythonPackage, fetchPypi
2+, pyserial, pyserial-asyncio, zigpy
3+, pytest }:
4+
5+buildPythonPackage rec {
6+ pname = "zigpy-zigate";
7+ version = "0.6.1";
8+
9+ buildInputs = [ pyserial pyserial-asyncio zigpy ];
10+ checkInputs = [ pytest ];
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5";
15+ };
16+
17+ meta = with stdenv.lib; {
18+ description = "A library which communicates with ZiGate radios for zigpy";
19+ homepage = "http://github.com/doudz/zigpy-zigate";
20+ license = licenses.gpl3Plus;
21+ maintainers = with maintainers; [ etu mvnetbiz ];
22+ platforms = platforms.linux;
23+ };
24+}
pkgs/development/python-modules/zigpy/default.nix+7−8
@@ -1,25 +1,24 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, aiohttp, crccheck, pycryptodome, pycrypto
2+, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous
33, pytest, pytest-asyncio, asynctest }:
44
55buildPythonPackage rec {
6− pname = "zigpy-homeassistant";
7− version = "0.19.0";
6+ pname = "zigpy";
7+ version = "0.22.0";
88
9− nativeBuildInputs = [ pytest pytest-asyncio asynctest ];
10− buildInputs = [ aiohttp pycryptodome ];
11− propagatedBuildInputs = [ crccheck pycrypto ];
9+ propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ];
10+ checkInputs = [ pytest pytest-asyncio asynctest ];
1211
1312 src = fetchPypi {
1413 inherit pname version;
15− sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc";
14+ sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc";
1615 };
1716
1817 meta = with stdenv.lib; {
1918 description = "Library implementing a ZigBee stack";
2019 homepage = "https://github.com/zigpy/zigpy";
2120 license = licenses.gpl3Plus;
22− maintainers = with maintainers; [ etu ];
21+ maintainers = with maintainers; [ etu mvnetbiz ];
2322 platforms = platforms.linux;
2423 };
2524}
pkgs/servers/home-assistant/component-packages.nix+1−1
@@ -934,7 +934,7 @@
934934 "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf];
935935 "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc
936936 "zestimate" = ps: with ps; [ xmltodict];
937− "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy
937+ "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy];
938938 "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
939939 "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
940940 "zone" = ps: with ps; [ ];
pkgs/top-level/python-packages.nix+10
@@ -2689,8 +2689,14 @@ in {
26892689
26902690 zigpy = callPackage ../development/python-modules/zigpy { };
26912691
2692+ zigpy-cc = callPackage ../development/python-modules/zigpy-cc { };
2693+
26922694 zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { };
26932695
2696+ zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { };
2697+
2698+ zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { };
2699+
26942700 digital-ocean = callPackage ../development/python-modules/digitalocean { };
26952701
26962702 digi-xbee = callPackage ../development/python-modules/digi-xbee { };
@@ -7446,8 +7452,12 @@ in {
74467452
74477453 pulp = callPackage ../development/python-modules/pulp { };
74487454
7455+ pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { };
7456+
74497457 behave = callPackage ../development/python-modules/behave { };
74507458
7459+ bellows = callPackage ../development/python-modules/bellows { };
7460+
74517461 pyhamcrest = if isPy3k then
74527462 callPackage ../development/python-modules/pyhamcrest { }
74537463 else