From 638f8b375cf40315b38bad9a3b7ff039f0aaaa7b Mon Sep 17 00:00:00 2001 From: Luca Fulchir Date: Tue, 9 Nov 2021 19:32:35 +0100 Subject: [PATCH 1/3] maintainers: add luker Signed-off-by: Luca Fulchir --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 44f322c32299..e73ee17d7868 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6861,6 +6861,12 @@ githubId = 13791; name = "Luke Gorrie"; }; + luker = { + email = "luker@fenrirproject.org"; + github = "LucaFulchir"; + githubId = 2486026; + name = "Luca Fulchir"; + }; lumi = { email = "lumi@pew.im"; github = "lumi-me-not"; From 5de528e88866c321846de981389690425f57a397 Mon Sep 17 00:00:00 2001 From: Luca Fulchir Date: Tue, 9 Nov 2021 19:33:09 +0100 Subject: [PATCH 2/3] pynut2: init at 2.1.2 Tests completely broken on source Signed-off-by: Luca Fulchir --- .../python-modules/pynut2/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pynut2/default.nix diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix new file mode 100644 index 000000000000..a530007e91e0 --- /dev/null +++ b/pkgs/development/python-modules/pynut2/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +#, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pynut2"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "mezz64"; + repo = "python-nut2"; + rev = version; + sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # tests are completely broken, wrong imports and old api + #checkInputs = [ + # pytestCheckHook + #]; + + pythonImportsCheck = [ "pynut2.nut2" ]; + + meta = with lib; { + description = "API overhaul of PyNUT, a Python library to allow communication with NUT (Network UPS Tools) servers."; + homepage = "https://github.com/mezz64/python-nut2"; + license = with licenses; [ gpl3Plus ]; + maintainers = [ maintainers.luker ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad0d4d0d3bb4..c9b095699397 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5731,6 +5731,8 @@ in { pynuki = callPackage ../development/python-modules/pynuki { }; + pynut2 = callPackage ../development/python-modules/pynut2 { }; + pynws = callPackage ../development/python-modules/pynws { }; pynx584 = callPackage ../development/python-modules/pynx584 { }; From 43d6dbd4880b900f61799aa1a91e135e8653c3b2 Mon Sep 17 00:00:00 2001 From: Luca Fulchir Date: Tue, 9 Nov 2021 19:33:47 +0100 Subject: [PATCH 3/3] home-assistant: add pynut2 dependency Signed-off-by: Luca Fulchir --- 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 c41791a90540..5db10eafdb1a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -590,7 +590,7 @@ "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; - "nut" = ps: with ps; [ ]; # missing inputs: pynut2 + "nut" = ps: with ps; [ pynut2 ]; "nws" = ps: with ps; [ pynws ]; "nx584" = ps: with ps; [ pynx584 ]; "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi