diff --git a/pkgs/development/python-modules/monarchmoney/default.nix b/pkgs/development/python-modules/monarchmoney/default.nix deleted file mode 100644 index aa59035ecda6..000000000000 --- a/pkgs/development/python-modules/monarchmoney/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - 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/development/python-modules/monarchmoneycommunity/default.nix b/pkgs/development/python-modules/monarchmoneycommunity/default.nix new file mode 100644 index 000000000000..a24baf51897f --- /dev/null +++ b/pkgs/development/python-modules/monarchmoneycommunity/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + gql, + oathtool, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "monarchmoneycommunity"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bradleyseanf"; + repo = "monarchmoneycommunity"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xJKsA6YCcwWeqGiNYuMUjrPnj1kYtR6odB/JU1vZ/3c="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + gql + oathtool + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "monarchmoney" ]; + + meta = { + description = "Monarch Money API for Python"; + homepage = "https://github.com/bradleyseanf/monarchmoneycommunity"; + changelog = "https://github.com/bradleyseanf/monarchmoneycommunity/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/development/python-modules/typedmonarchmoney/default.nix b/pkgs/development/python-modules/typedmonarchmoney/default.nix index ebde8735c40e..6035806e06f9 100644 --- a/pkgs/development/python-modules/typedmonarchmoney/default.nix +++ b/pkgs/development/python-modules/typedmonarchmoney/default.nix @@ -2,28 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, - monarchmoney, + hatchling, + monarchmoneycommunity, rich, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typedmonarchmoney"; - version = "0.4.4"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "jeeftor"; repo = "monarchmoney-typed"; - tag = "v${version}"; - hash = "sha256-AM6d7oecKf5aG8zO3I6BGY3/rgtrdzNabCwX8AOlEs4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-pe/j6UnW9N3x/TYp4VyyVTwk2hTGHLTlnEYL6MNziuw="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ - monarchmoney + monarchmoneycommunity rich ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { 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}"; + changelog = "https://github.com/jeeftor/monarchmoney-typed/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.jamiemagee ]; }; -} +}) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 01119ba1281d..e002522ff19a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -311,6 +311,7 @@ mapAliases { mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29 mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29 modeled = "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19 + monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05 moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19 mpris-server = throw "mpris-server was removed because it is unused"; # added 2025-10-31 msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d36b5f1d4d53..07f3805cb669 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10094,7 +10094,7 @@ self: super: with self; { monai-deploy = callPackage ../development/python-modules/monai-deploy { }; - monarchmoney = callPackage ../development/python-modules/monarchmoney { }; + monarchmoneycommunity = callPackage ../development/python-modules/monarchmoneycommunity { }; monero = callPackage ../development/python-modules/monero { };