From 0706d3da4ee069fec28a148ce730daaf8d34ffe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:34:56 +0200 Subject: [PATCH 1/4] pythonPackages.dtlssocket: init at 0.1.12 --- .../python-modules/dtlssocket/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/dtlssocket/default.nix diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix new file mode 100644 index 000000000000..28eae55ef9a6 --- /dev/null +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, autoconf +, cython +}: + +buildPythonPackage rec { + pname = "dtlssocket"; + version = "0.1.12"; + + src = fetchPypi { + pname = "DTLSSocket"; + inherit version; + sha256 = "909a8f52f1890ec9e92fd46ef609daa8875c2a1c262c0b61200e73c6c2dd5099"; + }; + + nativeBuildInputs = [ + autoconf + cython + ]; + + # no tests on PyPI, no tags on GitLab + doCheck = false; + + pythonImportsCheck = [ "DTLSSocket" ]; + + meta = with lib; { + description = "Cython wrapper for tinydtls with a Socket like interface"; + homepage = "https://git.fslab.de/jkonra2m/tinydtls-cython"; + license = licenses.epl10; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f97c847dac53..bf10d95d6b97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2184,6 +2184,8 @@ in { dsmr-parser = callPackage ../development/python-modules/dsmr-parser { }; + dtlssocket = callPackage ../development/python-modules/dtlssocket { }; + duckdb = callPackage ../development/python-modules/duckdb { inherit (pkgs) duckdb; }; From 06024b15f795df31ff2c4915424ef5632b7e1f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:37:41 +0200 Subject: [PATCH 2/4] python3Packages.pytradfri: init at 7.0.6 --- .../python-modules/pytradfri/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytradfri/default.nix diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix new file mode 100644 index 000000000000..e06a7e681351 --- /dev/null +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiocoap +, dtlssocket +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytradfri"; + version = "7.0.6"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "pytradfri"; + rev = version; + sha256 = "0ckh2waz3xpz51pmigg1q336igqvvkl2pzncszvblkwv38a0rj3a"; + }; + + propagatedBuildInputs = [ + aiocoap + dtlssocket + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytradfri" ]; + + meta = with lib; { + description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway"; + homepage = "https://github.com/home-assistant-libs/pytradfri"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf10d95d6b97..14b42c72860a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7130,6 +7130,8 @@ in { cudaSupport = false; }; + pytradfri = callPackage ../development/python-modules/pytradfri { }; + pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; pytrends = callPackage ../development/python-modules/pytrends { }; From efa58212b1e6b5762358892457657a10f5db1df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:38:09 +0200 Subject: [PATCH 3/4] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a5f6d670f621..85550088a2cc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -880,7 +880,7 @@ "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trace" = ps: with ps; [ ]; "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr - "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] + "tradfri" = ps: with ps; [ pytradfri ]; "trafikverket_train" = ps: with ps; [ pytrafikverket ]; "trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ]; "transmission" = ps: with ps; [ transmissionrpc ]; From d886c446fedefcbaf1bbf5ddd274e82ed14d5ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 26 Jun 2021 14:41:07 +0200 Subject: [PATCH 4/4] home-assistant: test tradfri component --- 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 985fb15bc3ec..4ce2106daefe 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -685,6 +685,7 @@ in with py.pkgs; buildPythonApplication rec { "toon" "tplink" "trace" + "tradfri" "transmission" "trend" "tts"