From 23eb6d2924720f357eeb63b526c62fd81ab96522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 21:24:42 +0100 Subject: [PATCH 1/2] python3Packages.adax-local: init at 0.1.3 --- .../python-modules/adax-local/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/adax-local/default.nix diff --git a/pkgs/development/python-modules/adax-local/default.nix b/pkgs/development/python-modules/adax-local/default.nix new file mode 100644 index 000000000000..758667cc2d53 --- /dev/null +++ b/pkgs/development/python-modules/adax-local/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, bleak +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, pythonOlder +}: + +buildPythonPackage rec { + pname = "adax-local"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyAdaxLocal"; + rev = version; + hash = "sha256-SGVXzSjtYNRVJN5fUjjskko55/e0L3P8aB90G4HuBOE="; + }; + + propagatedBuildInputs = [ + aiohttp + bleak + async-timeout + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "adax_local" + ]; + + meta = with lib; { + description = "Module for local access to Adax"; + homepage = "https://github.com/Danielhiversen/pyAdaxLocal"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e48619b09fb..aeadc09f867a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -194,6 +194,8 @@ in { adax = callPackage ../development/python-modules/adax { }; + adax-local = callPackage ../development/python-modules/adax-local { }; + adb-enhanced = callPackage ../development/python-modules/adb-enhanced { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; From 06ee2778b6cadc847ad6cab926af4359c757b98c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 21:24:53 +0100 Subject: [PATCH 2/2] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 80e77aed72b5..f04e4a3dbd90 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -9,7 +9,7 @@ "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ adax ]; # missing inputs: Adax-local + "adax" = ps: with ps; [ adax-local adax ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -1037,6 +1037,7 @@ "abode" "accuweather" "acmeda" + "adax" "adguard" "advantage_air" "aemet"