From a6f3b517590e99e0cab5320c32e9827704ff3fd3 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 11 Jul 2024 18:23:08 +0200
Subject: [PATCH 1/3] maintainers: add oynqr

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 49261f9eed3c..e40452209498 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15207,6 +15207,12 @@
     name = "Alvar Penning";
     keys = [ { fingerprint = "EB14 4E67 E57D 27E2 B5A4  CD8C F32A 4563 7FA2 5E31"; } ];
   };
+  oynqr = {
+    email = "pd-nixpkgs@3b.pm";
+    github = "oynqr";
+    githubId = 71629732;
+    name = "Philipp David";
+  };
   oyren = {
     email = "m.scheuren@oyra.eu";
     github = "oyren";

From 5c1ee085cd750f9fb125420f38098b6532d057ad Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 12 Jul 2024 08:08:06 +0200
Subject: [PATCH 2/3] python312Packages.pyecotrend-ista: init at 3.3.2

---
 .../pyecotrend-ista/default.nix               | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyecotrend-ista/default.nix

diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix
new file mode 100644
index 000000000000..23edfcbcc00a
--- /dev/null
+++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+  dataclasses-json,
+  requests,
+  pytestCheckHook,
+  pytest-xdist,
+  requests-mock,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "pyecotrend-ista";
+  version = "3.3.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "Ludy87";
+    repo = "pyecotrend-ista";
+    rev = "refs/tags/${version}";
+    hash = "sha256-TZDHEaDc7UACIAHNX1fStJH74qLKf+krWbTDtemXahA=";
+  };
+
+  postPatch = ''
+    sed -i "/addopts =/d" pyproject.toml
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    dataclasses-json
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+    requests-mock
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "pyecotrend_ista" ];
+
+  meta = {
+    changelog = "https://github.com/Ludy87/pyecotrend-ista/releases/tag/${version}";
+    description = "Unofficial python library for the pyecotrend-ista API";
+    homepage = "https://github.com/Ludy87/pyecotrend-ista";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ oynqr ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 960a53e4f1e0..011c9e2b39ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11135,6 +11135,8 @@ self: super: with self; {
 
   pyeconet = callPackage ../development/python-modules/pyeconet { };
 
+  pyecotrend-ista = callPackage ../development/python-modules/pyecotrend-ista { };
+
   pyecowitt = callPackage ../development/python-modules/pyecowitt { };
 
   pyedimax = callPackage ../development/python-modules/pyedimax { };

From 80dd59f5af619a6af2d0943950cc5341c30098d6 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 12 Jul 2024 08:24:08 +0200
Subject: [PATCH 3/3] home-assistant: support ista_ecotrend 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 0b0ab903e34e..1d943f41500b 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2150,7 +2150,8 @@
     "iss" = ps: with ps; [
     ]; # missing inputs: pyiss
     "ista_ecotrend" = ps: with ps; [
-    ]; # missing inputs: pyecotrend-ista
+      pyecotrend-ista
+    ];
     "isy994" = ps: with ps; [
       pyisy
     ];
@@ -5561,6 +5562,7 @@
     "ipp"
     "iqvia"
     "isal"
+    "ista_ecotrend"
     "isy994"
     "izone"
     "jellyfin"