From b27d0da9d87ed6bc65a4c677e8cb9f4ebd410234 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 20:17:04 +0100 Subject: [PATCH 1/3] python3Packages.pyoctoprintapi: init at 0.1.7 --- .../python-modules/pyoctoprintapi/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/pyoctoprintapi/default.nix diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix new file mode 100644 index 000000000000..323d2c092f8d --- /dev/null +++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagated +, aiohttp + +# tests +, pytest-asyncio +, pytestCheckHook +}: + +let + pname = "pyoctoprintapi"; + version = "0.1.7"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rfleming71"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XAMHQ7n03e10hFcPIUqyCDlRk2uO8dX8Iq0mdY7wRGE="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + pythonImportsCheck = [ + "pyoctoprintapi" + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple async wrapper around the Octoprint API"; + homepage = "https://github.com/rfleming71/pyoctoprintapi"; + license = licenses.mit; + maintainers= with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 706280b5733c..dfb70f9a304b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6942,6 +6942,8 @@ in { tesseract = pkgs.tesseract4; }; + pyoctoprintapi = callPackage ../development/python-modules/pyoctoprintapi { }; + pyodbc = callPackage ../development/python-modules/pyodbc { }; pyogg = callPackage ../development/python-modules/pyogg { }; From 1180267064d2a7c098d53438a58c6155fb121226 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 20:19:15 +0100 Subject: [PATCH 2/3] home-assistant: update 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 5fccf5816d8c..c7cbae360a11 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -596,7 +596,7 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ pyobihai ]; - "octoprint" = ps: with ps; [ ]; # missing inputs: pyoctoprintapi + "octoprint" = ps: with ps; [ pyoctoprintapi ]; "oem" = ps: with ps; [ oemthermostat ]; "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ pyombi ]; From 1445fca5d67e63c4a1ba116de42d1693e04e7ccb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 20:19:57 +0100 Subject: [PATCH 3/3] home-assistant: test octoprint 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 9d6618452e6a..bad96cf62570 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -556,6 +556,7 @@ in with py.pkgs; buildPythonApplication rec { "number" "nws" "nx584" + "octoprint" "omnilogic" "onboarding" "ondilo_ico"