From e225634d70481ecdadd2765bd1b76effc9edb1c1 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 2 Oct 2020 13:42:21 +0200 Subject: [PATCH 1/3] pythonPackages.lomond: init at 0.3.3 --- .../python-modules/lomond/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/lomond/default.nix diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix new file mode 100644 index 00000000000..669f16e5f92 --- /dev/null +++ b/pkgs/development/python-modules/lomond/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook +, pytest-mock, pytestrunner, six, tornado_4 }: + +buildPythonPackage rec { + pname = "lomond"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "wildfoundry"; + repo = "dataplicity-${pname}"; + rev = "b30dad3cc38d5ff210c5dd01f8c3c76aa6c616d1"; + sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ six ]; + checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; + # Makes HTTP requests + disabledTests = [ "test_proxy" "test_live" ]; + + meta = with lib; { + description = "Websocket Client Library"; + homepage = "https://github.com/wildfoundry/dataplicity-lomond"; + license = licenses.bsd3; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67fe27f7dad..eed512389e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3498,6 +3498,8 @@ in { logzero = callPackage ../development/python-modules/logzero { }; + lomond = callPackage ../development/python-modules/lomond { }; + loo-py = callPackage ../development/python-modules/loo-py { }; lpod = callPackage ../development/python-modules/lpod { }; From 51623fc403636380c561bc64006c8e585df3d26a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 2 Oct 2020 13:43:09 +0200 Subject: [PATCH 2/3] pythonPackages.abodepy: init at 1.2.0 --- .../python-modules/abodepy/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/abodepy/default.nix diff --git a/pkgs/development/python-modules/abodepy/default.nix b/pkgs/development/python-modules/abodepy/default.nix new file mode 100644 index 00000000000..eb0de74e791 --- /dev/null +++ b/pkgs/development/python-modules/abodepy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, colorlog, lomond +, requests, isPy3k, requests-mock }: + +buildPythonPackage rec { + pname = "abodepy"; + version = "1.2.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "MisterWil"; + repo = pname; + rev = "v${version}"; + sha256 = "0m2cm90yy7fq7yrjyd999m48gqri65ifi7f6hc0s3pv2hfj89yj0"; + }; + + propagatedBuildInputs = [ colorlog lomond requests ]; + checkInputs = [ pytestCheckHook requests-mock ]; + + meta = with lib; { + homepage = "https://github.com/MisterWil/abodepy"; + description = "An Abode alarm Python library running on Python 3"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eed512389e2..e1df51e1a14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -146,6 +146,8 @@ in { aafigure = callPackage ../development/python-modules/aafigure { }; + abodepy = callPackage ../development/python-modules/abodepy { }; + absl-py = callPackage ../development/python-modules/absl-py { }; accupy = callPackage ../development/python-modules/accupy { }; From a517040251407525e6612c6663b90b5e1a0c7d32 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 3 Oct 2020 14:48:40 +0200 Subject: [PATCH 3/3] home-assistant: regenerate component-packages --- 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 f63a191fe49..21fe6e0d003 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4,7 +4,7 @@ { version = "0.115.6"; components = { - "abode" = ps: with ps; [ ]; # missing inputs: abodepy + "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse