From 229c002c8c1f24847662faa650bacf6e74e959f2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 29 Nov 2019 17:57:26 +0100 Subject: [PATCH 1/6] python3Packages.pyserial-asyncio: init at 0.4 --- .../pyserial-asyncio/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyserial-asyncio/default.nix diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix new file mode 100644 index 000000000000..c299ad8acae5 --- /dev/null +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, pyserial }: + +buildPythonPackage rec { + pname = "pyserial-asyncio"; + version = "0.4"; + + disabled = !isPy3k; # Doesn't support python older than 3.4 + + buildInputs = [ pyserial ]; + + src = fetchPypi { + inherit pname version; + sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4"; + }; + + meta = with stdenv.lib; { + description = "asyncio extension package for pyserial"; + homepage = "https://github.com/pyserial/pyserial-asyncio"; + license = licenses.bsd3; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2edaf87cbaa7..24cb8d33a620 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4814,6 +4814,8 @@ in { pyserial = callPackage ../development/python-modules/pyserial {}; + pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pysonos = callPackage ../development/python-modules/pysonos {}; pymongo = callPackage ../development/python-modules/pymongo {}; From 473a21f39efc5d8b651de890844a121b920abf53 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 29 Nov 2019 18:18:13 +0100 Subject: [PATCH 2/6] python3Packages.crccheck: init at 0.6 --- .../python-modules/crccheck/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/crccheck/default.nix diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix new file mode 100644 index 000000000000..92a4cc8a8415 --- /dev/null +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose }: + +buildPythonPackage rec { + pname = "crccheck"; + version = "0.6"; + + buildInputs = [ nose ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0ckymm6s5kw08i1j35fy2cfha1hyq94pq1kc66brb552qgjs91jn"; + extension = "zip"; + }; + + meta = with stdenv.lib; { + description = "Python library for CRCs and checksums"; + homepage = "https://bitbucket.org/martin_scharrer/crccheck"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24cb8d33a620..3436095c5e8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1730,6 +1730,8 @@ in { crc16 = callPackage ../development/python-modules/crc16 { }; + crccheck = callPackage ../development/python-modules/crccheck { }; + croniter = callPackage ../development/python-modules/croniter { }; csscompressor = callPackage ../development/python-modules/csscompressor {}; From 9153236a5e65ecee53289999a841b063809f9556 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 29 Nov 2019 18:25:43 +0100 Subject: [PATCH 3/6] python3Packages.zigpy: init at 0.11.0 --- .../python-modules/zigpy/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy/default.nix diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix new file mode 100644 index 000000000000..726f1fde4e64 --- /dev/null +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, crccheck, pycryptodome, pycrypto +, pytest, pytest-asyncio, asynctest }: + +buildPythonPackage rec { + pname = "zigpy-homeassistant"; + version = "0.11.0"; + + nativeBuildInputs = [ pytest pytest-asyncio asynctest ]; + buildInputs = [ aiohttp pycryptodome ]; + propagatedBuildInputs = [ crccheck pycrypto ]; + + src = fetchPypi { + inherit pname version; + sha256 = "021wg9yhz8dsif60r8s5621mf63bsayjjb2bimhq0am03ql0fysl"; + }; + + meta = with stdenv.lib; { + description = "Library implementing a ZigBee stack"; + homepage = "https://github.com/zigpy/zigpy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3436095c5e8e..52933486b452 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2276,6 +2276,8 @@ in { zict = callPackage ../development/python-modules/zict { }; + zigpy = callPackage ../development/python-modules/zigpy { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; leather = callPackage ../development/python-modules/leather { }; From 3cdaa84b2b9e0764b5151e634ef0a04b47dbdd0b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 29 Nov 2019 18:31:18 +0100 Subject: [PATCH 4/6] python3Packages.zigpy-deconz: init at 0.7.0 --- .../python-modules/zigpy-deconz/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/zigpy-deconz/default.nix diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix new file mode 100644 index 000000000000..c9df7824093f --- /dev/null +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zigpy-deconz"; + version = "0.7.0"; + + nativeBuildInputs = [ pytest ]; + buildInputs = [ aiohttp crccheck pycryptodome ]; + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; + + src = fetchPypi { + inherit pname version; + sha256 = "049k6lvgf6yjkinbbzm7gqrzqljk2ky9kfw8n53x8kjyfmfp71i2"; + }; + + meta = with stdenv.lib; { + description = "Library which communicates with Deconz radios for zigpy"; + homepage = "https://github.com/zigpy/zigpy-deconz"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52933486b452..e7f66181d49c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2278,6 +2278,8 @@ in { zigpy = callPackage ../development/python-modules/zigpy { }; + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; leather = callPackage ../development/python-modules/leather { }; From 5bbd8dc33282210c3b614b381a1c4d3f032f0e74 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 29 Nov 2019 20:23:45 +0100 Subject: [PATCH 5/6] python3Packages.zha-quirks: init 0.0.28 --- .../python-modules/zha-quirks/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/zha-quirks/default.nix diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix new file mode 100644 index 000000000000..1f490fea05f9 --- /dev/null +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, aiohttp, zigpy +, pytest }: + +buildPythonPackage rec { + pname = "zha-quirks"; + version = "0.0.28"; + + nativeBuildInputs = [ pytest ]; + buildInputs = [ aiohttp zigpy ]; + + src = fetchPypi { + inherit pname version; + sha256 = "021z5f5dm74amxkqnz4s1690ydprciqg23jz3n4mpjlxyxbdfj73"; + }; + + meta = with stdenv.lib; { + description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; + homepage = "https://github.com/dmulcahey/zha-device-handlers"; + license = licenses.asl20; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7f66181d49c..48cad31744e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5773,6 +5773,8 @@ in { zfec = callPackage ../development/python-modules/zfec { }; + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; + zipp = callPackage ../development/python-modules/zipp { }; zope_broken = callPackage ../development/python-modules/zope_broken { }; From b3c24af135f86338d2258dff09db05c89dedff0f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 29 Nov 2019 18:41:25 +0100 Subject: [PATCH 6/6] home-assistant: Regenerate components file --- pkgs/servers/home-assistant/component-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f46868c4cb42..492d5a0b0dc5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -644,7 +644,7 @@ "sensehat" = ps: with ps; [ ]; "sensibo" = ps: with ps; [ ]; "sensor" = ps: with ps; [ ]; - "serial" = ps: with ps; [ ]; + "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; "sesame" = ps: with ps; [ ]; "seven_segments" = ps: with ps; [ ]; @@ -814,7 +814,7 @@ "vicare" = ps: with ps; [ ]; "vivotek" = ps: with ps; [ ]; "vizio" = ps: with ps; [ ]; - "vlc" = ps: with ps; [ ]; + "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ ]; "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; @@ -873,7 +873,7 @@ "zengge" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ ]; + "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy ]; "zhong_hong" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; "ziggo_mediabox_xl" = ps: with ps; [ ];