From d62b99afbb23934cff814bca1f38c50a2b1f8929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 19 Dec 2023 10:45:39 -0800 Subject: [PATCH 1/4] Revert "python3Packages.dynalite-devices: 0.1.48 -> 0.47" This reverts commit e361bc26241cde96ead8a195e2502269543c2339. Version 0.47 is older than 0.1.48. --- pkgs/development/python-modules/dynalite-devices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index 7066271182ef..cb899bb04c07 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.47"; + version = "0.1.48"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ziv1234"; repo = "python-dynalite-devices"; rev = "refs/tags/v${version}"; - hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; + hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g="; }; postPatch = '' From 782978b7fe13c7d66e0980d2d192de2527c55557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 19 Dec 2023 10:53:09 -0800 Subject: [PATCH 2/4] python311Packages.dynalite-panel: init at 0.0.4 --- .../python-modules/dynalite-panel/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/dynalite-panel/default.nix diff --git a/pkgs/development/python-modules/dynalite-panel/default.nix b/pkgs/development/python-modules/dynalite-panel/default.nix new file mode 100644 index 000000000000..33be58906c75 --- /dev/null +++ b/pkgs/development/python-modules/dynalite-panel/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "dynalite-panel"; + version = "0.0.4"; + pyproject = true; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-m7nQzbxRe2qXUWAMeQlDZtc9F01DsbTzF/kI0ci3TFE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "~=" ">=" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "dynalite_panel" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Dynalite panel for Home Assistant"; + homepage = "https://github.com/ziv1234/dynalitepanel"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61f359558431..d0acbf731e5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3461,6 +3461,8 @@ self: super: with self; { dynalite-devices = callPackage ../development/python-modules/dynalite-devices { }; + dynalite-panel = callPackage ../development/python-modules/dynalite-panel { }; + dynd = callPackage ../development/python-modules/dynd { }; e3-core = callPackage ../development/python-modules/e3-core { }; From 5517efe88531b804af960887b71de1c044484109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 19 Dec 2023 10:55:44 -0800 Subject: [PATCH 3/4] home-assistant: support dynalite 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 31a389b98200..eca4e725783f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1040,13 +1040,14 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng dynalite-devices + dynalite-panel fnv-hash-fast home-assistant-frontend janus pillow psutil-home-assistant sqlalchemy - ]; # missing inputs: dynalite-panel + ]; "eafm" = ps: with ps; [ aioeafm ]; @@ -5713,6 +5714,7 @@ "dunehd" "duotecno" "dwd_weather_warnings" + "dynalite" "eafm" "easyenergy" "ecobee" From 5f3d7262929b10306229f02cf4eea53012e24083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 Dec 2023 10:27:07 -0800 Subject: [PATCH 4/4] python311Packages.dynalite-devices: exclude from bulk updates It would update to the upstream tag v0.47 which should have been v0.1.47. --- pkgs/development/python-modules/dynalite-devices/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index cb899bb04c07..111e7f69e13c 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { "dynalite_devices_lib" ]; + # it would use the erroneous tag v0.47 + passthru.skipBulkUpdate = false; + meta = with lib; { description = "An unofficial Dynalite DyNET interface creating devices"; homepage = "https://github.com/ziv1234/python-dynalite-devices";