From 306bdcb19338ec29831814abb9f80cccde5423b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Jan 2025 03:55:03 -0800 Subject: [PATCH 1/3] python313Packages.nhc: init at 0.3.3 --- .../python-modules/nhc/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/nhc/default.nix diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix new file mode 100644 index 000000000000..4aa5d6665e43 --- /dev/null +++ b/pkgs/development/python-modules/nhc/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + nclib, + setuptools, +}: + +buildPythonPackage rec { + pname = "nhc"; + version = "0.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "vandeurenglenn"; + repo = "nhc"; + tag = "v${version}"; + hash = "sha256-s3DVdnjhRUZRG/LwKwOuZSiNtzpccBtHl/PNvux/NwQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + nclib + ]; + + pythonImportsCheck = [ "nhc" ]; + + # upstream has no test + doCheck = false; + + meta = { + changelog = "https://github.com/vandeurenglenn/nhc/blob/${src.tag}/CHANGELOG.md"; + description = "SDK for Niko Home Control"; + homepage = "https://github.com/vandeurenglenn/nhc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 429aa8ef9f85..17a1acf44865 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9214,6 +9214,8 @@ self: super: with self; { nh3 = callPackage ../development/python-modules/nh3 { }; + nhc = callPackage ../development/python-modules/nhc { }; + niaaml = callPackage ../development/python-modules/niaaml { }; nianet = callPackage ../development/python-modules/nianet { }; From b4276ef1fd12ec187ac935e95a66cec7a07d73db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Jan 2025 03:56:35 -0800 Subject: [PATCH 2/3] home-assistant: support niko_home_control component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ab86d5e31c21..d99ccb777c1b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3796,7 +3796,8 @@ ]; "niko_home_control" = ps: with ps; [ - ]; # missing inputs: nhc + nhc + ]; "nilu" = ps: with ps; [ niluclient @@ -7008,6 +7009,7 @@ "nibe_heatpump" "nice_go" "nightscout" + "niko_home_control" "nina" "nmap_tracker" "no_ip" From 5df8a843922fec15437b2770b87d6519353e1996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Jan 2025 03:57:58 -0800 Subject: [PATCH 3/3] python313Packages.niko-home-control: drop --- .../niko-home-control/default.nix | 42 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/niko-home-control/default.nix diff --git a/pkgs/development/python-modules/niko-home-control/default.nix b/pkgs/development/python-modules/niko-home-control/default.nix deleted file mode 100644 index 7d60e6982073..000000000000 --- a/pkgs/development/python-modules/niko-home-control/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nclib, - netaddr, - netifaces, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "niko-home-control"; - version = "0.3.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "NoUseFreak"; - repo = pname; - rev = version; - sha256 = "sha256-n/uQAX2LgxeGTRF56+G5vm5wbeTQQQODV4EKaPgKw1k="; - }; - - propagatedBuildInputs = [ - nclib - netaddr - netifaces - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ "nikohomecontrol" ]; - - meta = with lib; { - description = "Python SDK for Niko Home Control"; - homepage = "https://github.com/NoUseFreak/niko-home-control"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3e32d5aea390..4c71486b0a8f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -379,6 +379,7 @@ mapAliases ({ mypy-boto3-mobile = throw "mypy-boto3-mobile was removed because it is unmaintained"; # added 2024-09-04 net2grid = gridnet; # add 2022-04-22 nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 + niko-home-control = throw "niko-home-control was removed because Home Assistant switched to nhc"; # added 2025-01-09 ninja-python = ninja; # add 2022-08-03 nose = throw "nose has been removed since it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12; please switch to pytest or another test runner/framework"; # added 2024-07-28 nose3 = throw "nose3 has been removed since it is unmaintained and does not work with Python 3.12"; # added 2024-07-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17a1acf44865..21680f9f1841 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9242,8 +9242,6 @@ self: super: with self; { nikola = callPackage ../development/python-modules/nikola { }; - niko-home-control = callPackage ../development/python-modules/niko-home-control { }; - nilearn = callPackage ../development/python-modules/nilearn { }; niluclient = callPackage ../development/python-modules/niluclient { };