From 6deaecd116362b90496e23927d509cb6aebcd84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 14:59:00 +0200 Subject: [PATCH 1/4] python3Packages.graphql-subscription-manager: init at 0.4.0 --- .../graphql-subscription-manager/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/graphql-subscription-manager/default.nix diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix new file mode 100644 index 000000000000..1a3c32e04d44 --- /dev/null +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, websockets +}: + +buildPythonPackage rec { + pname = "graphql-subscription-manager"; + version = "0.4.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "PyGraphqlWebsocketManager"; + rev = version; + sha256 = "1176xzr9fa7gl5cm0pcv5lb45d2ms5awi601rjcr3a0a14a1i8fz"; + }; + + propagatedBuildInputs = [ + setuptools + websockets + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "graphql_subscription_manager" ]; + + meta = with lib; { + description = "Python3 library for graphql subscription manager"; + homepage = "https://github.com/Danielhiversen/PyGraphqlWebsocketManager"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ccb14530a0c..f606ac004595 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3015,6 +3015,8 @@ in { graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; + graphql-subscription-manager = callPackage ../development/python-modules/graphql-subscription-manager { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; graphtage = callPackage ../development/python-modules/graphtage { }; From 9414a47d632931a05ebf76eda74497ac63ead2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 15:06:16 +0200 Subject: [PATCH 2/4] python3Packages.tibber: init at 0.17.1 --- .../python-modules/pytibber/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pytibber/default.nix diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix new file mode 100644 index 000000000000..a8814b1e783e --- /dev/null +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, async-timeout +, graphql-subscription-manager +, python-dateutil +, pytz +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytibber"; + version = "0.17.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyTibber"; + rev = version; + sha256 = "1zda9cvg6hy0n7sr2z71lkyl93n1gnzxrvf56lhz13pcsffshhdk"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + graphql-subscription-manager + python-dateutil + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/test.py" ]; + + # tests access network + doCheck = false; + + pythonImportsCheck = [ "tibber" ]; + + meta = with lib; { + description = "A python3 library to communicate with Tibber"; + homepage = "https://github.com/Danielhiversen/pyTibber"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f606ac004595..c03100fad7be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6973,6 +6973,8 @@ in { pyeverlights = callPackage ../development/python-modules/pyeverlights { }; + pytibber = callPackage ../development/python-modules/pytibber { }; + pytile = callPackage ../development/python-modules/pytile { }; pytimeparse = callPackage ../development/python-modules/pytimeparse { }; From 8cff2217f89bb187a794dce58f0bc43a28c7e0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 15:06:45 +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 c7aa936c3233..6e0e4c96f119 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -861,7 +861,7 @@ "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ ]; # missing inputs: pyTibber + "tibber" = ps: with ps; [ pytibber ]; "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; From 0f02d4077bd59ab95037f38a7020ade65776c39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jun 2021 15:08:24 +0200 Subject: [PATCH 4/4] home-assistant: test tibber 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 dcb426f0359e..9cd7a092e897 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -629,6 +629,7 @@ in with py.pkgs; buildPythonApplication rec { "template" "tesla" "threshold" + "tibber" "tile" "time_date" "timer"