From b3152c1467549871d32e8aa2e88b61e5f883c030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:07:02 +0200 Subject: [PATCH 1/4] python3Packages.dataclasses-json: 0.5.2 -> 0.5.4 --- pkgs/development/python-modules/dataclasses-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 4a2a410c4ad5..f97217cd29ea 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n"; + sha256 = "193xklf1xrsin7fr24yqx5ckr4m5s9v1bdyr00qr51j74hiy8qsv"; }; propagatedBuildInputs = [ From 7694ae4752a3af4787d149dc187b9c7b93cbd303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:32:17 +0200 Subject: [PATCH 2/4] python3Packages.pysiaalarm: init at 3.0.0 --- .../python-modules/pysiaalarm/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/pysiaalarm/default.nix diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix new file mode 100644 index 000000000000..206d24a40dc5 --- /dev/null +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, dataclasses-json +, pycryptodome +, setuptools +, pytest-asyncio +, pytest-cases +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysiaalarm"; + version = "3.0.0"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "==" ">=" + substituteInPlace pytest.ini \ + --replace "--cov pysiaalarm --cov-report term-missing" "" + ''; + + propagatedBuildInputs = [ + dataclasses-json + pycryptodome + setuptools + ]; + + checkInputs = [ + pytest-asyncio + pytest-cases + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysiaalarm" + "pysiaalarm.aio" + ]; + + meta = with lib; { + description = "Python package for creating a client that talks with SIA-based alarm systems"; + homepage = "https://github.com/eavanvalkenburg/pysiaalarm"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a12c1556ab1..0ee4004dee55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5325,6 +5325,8 @@ in { pyshark = callPackage ../development/python-modules/pyshark { }; + pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; From 111cc8838a3443f4031ddedef9d15966067d1386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:33:44 +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 c17cb8d1714d..03972e9134be 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -750,7 +750,7 @@ "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 - "sia" = ps: with ps; [ ]; # missing inputs: pysiaalarm + "sia" = ps: with ps; [ pysiaalarm ]; "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi From 9cd99e192e14b345372566591e4599e1f5a71553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:34:41 +0200 Subject: [PATCH 4/4] home-assistant: test sia 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 e00b355f0c32..61508dc6d0b5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -627,6 +627,7 @@ in with py.pkgs; buildPythonApplication rec { "shell_command" "shelly" "shopping_list" + "sia" "sigfox" "sighthound" "simplisafe"