From 16ae57087a91a72b3312139667a8a601f1b7ec31 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 22:43:46 -0700
Subject: [PATCH 1/4] python3Packages.oathtool: init at 2.4.0

---
 .../python-modules/oathtool/default.nix       | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/oathtool/default.nix

diff --git a/pkgs/development/python-modules/oathtool/default.nix b/pkgs/development/python-modules/oathtool/default.nix
new file mode 100644
index 000000000000..b34a57d8e9d2
--- /dev/null
+++ b/pkgs/development/python-modules/oathtool/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  autocommand,
+  importlib-resources,
+  path,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "oathtool";
+  version = "2.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jaraco";
+    repo = "oathtool";
+    tag = "v${version}";
+    hash = "sha256-Qa4/fVa7Ws8t42MxZpEVKI7Wyux/uN77VP0JBnrmgq0=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    autocommand
+    path
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "oathtool" ];
+
+  meta = {
+    description = "One-time password generator";
+    homepage = "https://github.com/jaraco/oathtool";
+    changelog = "https://github.com/jaraco/oathtool/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb1a3d6e0f12..32c16ebe0bef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10573,6 +10573,8 @@ self: super: with self; {
 
   oath = callPackage ../development/python-modules/oath { };
 
+  oathtool = callPackage ../development/python-modules/oathtool { };
+
   oauth2-client = callPackage ../development/python-modules/oauth2-client { };
 
   oauth2client = callPackage ../development/python-modules/oauth2client { };

From c24808b933a57bdc1f52145d810207cb91e8468b Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 22:44:09 -0700
Subject: [PATCH 2/4] python3Packages.monarchMoney: init at 0.1.15

---
 .../python-modules/monarchmoney/default.nix   | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/monarchmoney/default.nix

diff --git a/pkgs/development/python-modules/monarchmoney/default.nix b/pkgs/development/python-modules/monarchmoney/default.nix
new file mode 100644
index 000000000000..aa59035ecda6
--- /dev/null
+++ b/pkgs/development/python-modules/monarchmoney/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  gql,
+  oathtool,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "monarchmoney";
+  version = "0.1.15";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hammem";
+    repo = "monarchmoney";
+    tag = "v${version}";
+    hash = "sha256-I5YCINwJqzdntVGn8T8Yx/cfWOtwgwvyt30swBLQHDo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    gql
+    oathtool
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "monarchmoney" ];
+
+  meta = {
+    description = "Python API for Monarch Money";
+    homepage = "https://github.com/hammem/monarchmoney";
+    changelog = "https://github.com/hammem/monarchmoney/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32c16ebe0bef..3c6b93fe6d90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9453,6 +9453,8 @@ self: super: with self; {
 
   monai-deploy = callPackage ../development/python-modules/monai-deploy { };
 
+  monarchmoney = callPackage ../development/python-modules/monarchmoney { };
+
   monero = callPackage ../development/python-modules/monero { };
 
   mongodict = callPackage ../development/python-modules/mongodict { };

From 087a57b6133cd3831167eee4ada991db44d1f06e Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 22:44:46 -0700
Subject: [PATCH 3/4] python3Packages.typedmonarchmoney: init at 0.4.4

---
 .../typedmonarchmoney/default.nix             | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/typedmonarchmoney/default.nix

diff --git a/pkgs/development/python-modules/typedmonarchmoney/default.nix b/pkgs/development/python-modules/typedmonarchmoney/default.nix
new file mode 100644
index 000000000000..ebde8735c40e
--- /dev/null
+++ b/pkgs/development/python-modules/typedmonarchmoney/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  monarchmoney,
+  rich,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "typedmonarchmoney";
+  version = "0.4.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jeeftor";
+    repo = "monarchmoney-typed";
+    tag = "v${version}";
+    hash = "sha256-AM6d7oecKf5aG8zO3I6BGY3/rgtrdzNabCwX8AOlEs4=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    monarchmoney
+    rich
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "typedmonarchmoney" ];
+
+  meta = {
+    description = "Typed wrapper around the Monarch Money API";
+    homepage = "https://github.com/jeeftor/monarchmoney-typed";
+    changelog = "https://github.com/jeeftor/monarchmoney-typed/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3c6b93fe6d90..51974b5d460a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18522,6 +18522,8 @@ self: super: with self; {
 
   typed-settings = callPackage ../development/python-modules/typed-settings { };
 
+  typedmonarchmoney = callPackage ../development/python-modules/typedmonarchmoney { };
+
   typedunits = callPackage ../development/python-modules/typedunits { };
 
   typeguard = callPackage ../development/python-modules/typeguard { };

From d1b14291873e5b9adf702ad2f6e0fb3ae6750786 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Thu, 7 Aug 2025 22:44:56 -0700
Subject: [PATCH 4/4] home-assistant: update component packages

---
 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 f46d8f91a97e..3dfc19f5c018 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3698,7 +3698,8 @@
       ];
     "monarch_money" =
       ps: with ps; [
-      ]; # missing inputs: typedmonarchmoney
+        typedmonarchmoney
+      ];
     "monessen" =
       ps: with ps; [
       ];
@@ -7356,6 +7357,7 @@
     "modem_callerid"
     "modern_forms"
     "mold_indicator"
+    "monarch_money"
     "monoprice"
     "monzo"
     "moon"