diff --git a/pkgs/development/python-modules/retry2/default.nix b/pkgs/development/python-modules/retry2/default.nix
new file mode 100644
index 000000000000..f0724f472a3c
--- /dev/null
+++ b/pkgs/development/python-modules/retry2/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  decorator,
+  fetchFromGitHub,
+  pbr,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "retry2";
+  version = "0.9.5";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "eSAMTrade";
+    repo = "retry";
+    rev = "refs/tags/${version}";
+    hash = "sha256-RxOEekkmMRl2OQW2scFWbMQiFXcH0sbd+k9R8uul0uY=";
+  };
+
+  env.PBR_VERSION = version;
+
+  build-system = [ pbr ];
+
+  dependencies = [ decorator ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "retry" ];
+
+  meta = {
+    description = "Retry decorator";
+    homepage = "https://github.com/eSAMTrade/retry";
+    changelog = "https://github.com/eSAMTrade/retry/blob/${src.rev}/ChangeLog";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/zeversolar/default.nix b/pkgs/development/python-modules/zeversolar/default.nix
new file mode 100644
index 000000000000..5a28927a3ec3
--- /dev/null
+++ b/pkgs/development/python-modules/zeversolar/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pytest-mock,
+  pytestCheckHook,
+  pythonOlder,
+  requests,
+  retry2,
+}:
+
+buildPythonPackage rec {
+  pname = "zeversolar";
+  version = "0.3.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "kvanzuijlen";
+    repo = "zeversolar";
+    rev = "refs/tags/${version}";
+    hash = "sha256-HnF21B7k2MmugMjGIF2EKwwXJWD/WdDvPdz1oaPSS5Y=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    requests
+    retry2
+  ];
+
+  nativeCheckInputs = [
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "zeversolar" ];
+
+  meta = {
+    description = "Module to interact with the local CGI provided by ZeverSolar";
+    homepage = "https://github.com/kvanzuijlen/zeversolar";
+    changelog = "https://github.com/kvanzuijlen/zeversolar/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 1fbed178c406..c6a244127429 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4958,7 +4958,8 @@
       xmltodict
     ];
     "zeversolar" = ps: with ps; [
-    ]; # missing inputs: zeversolar
+      zeversolar
+    ];
     "zha" = ps: with ps; [
       aiohasupervisor
       pillow
@@ -5878,6 +5879,7 @@
     "zamg"
     "zeroconf"
     "zerproc"
+    "zeversolar"
     "zha"
     "zodiac"
     "zone"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 359636a63eee..0e4926959ab1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13679,6 +13679,8 @@ self: super: with self; {
 
   retry-decorator = callPackage ../development/python-modules/retry-decorator { };
 
+  retry2 = callPackage ../development/python-modules/retry2 { };
+
   retrying = callPackage ../development/python-modules/retrying { };
 
   returns = callPackage ../development/python-modules/returns { };
@@ -17945,6 +17947,8 @@ self: super: with self; {
 
   zetup = callPackage ../development/python-modules/zetup { };
 
+  zeversolar = callPackage ../development/python-modules/zeversolar { };
+
   zeversolarlocal = callPackage ../development/python-modules/zeversolarlocal { };
 
   zfec = callPackage ../development/python-modules/zfec { };