From d7356ad0568f69056f11d2f7cb6dc9e20c519586 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 11 Oct 2024 10:42:56 +0200 Subject: [PATCH 1/3] todoman: 4.4.0 -> 4.5.0 See https://github.com/pimutils/todoman/blob/v4.5.0/CHANGELOG.rst#L7-L18 for the changelog. Removes pytz dependency. --- pkgs/by-name/to/todoman/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix index 75adb0425cc9..f79a54245f8c 100644 --- a/pkgs/by-name/to/todoman/package.nix +++ b/pkgs/by-name/to/todoman/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pimutils"; repo = "todoman"; rev = "refs/tags/v${version}"; - hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; + hash = "sha256-sk5LgFNo5Dc+oHCLu464Q1g0bk1QGsA7xMtMiits/8c="; }; nativeBuildInputs = [ @@ -34,9 +34,7 @@ python3.pkgs.buildPythonApplication rec { humanize icalendar parsedatetime - python-dateutil pyxdg - pytz tabulate urwid ]; @@ -44,8 +42,9 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ freezegun hypothesis - pytestCheckHook pytest-cov-stub + pytestCheckHook + pytz ]; postInstall = '' From 57e033c7d1eb9d39f914814aa23f57296f610ce1 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 11 Oct 2024 17:25:10 +0200 Subject: [PATCH 2/3] sphinx-click: init at 6.0.0 --- .../python-modules/sphinx-click/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-click/default.nix diff --git a/pkgs/development/python-modules/sphinx-click/default.nix b/pkgs/development/python-modules/sphinx-click/default.nix new file mode 100644 index 000000000000..81ac35a5131c --- /dev/null +++ b/pkgs/development/python-modules/sphinx-click/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + sphinxHook, + # Build system + pbr, + setuptools, + # Dependencies + click, + docutils, + sphinx, + # Checks + pytestCheckHook, + defusedxml, +}: + +buildPythonPackage rec { + pname = "sphinx-click"; + version = "6.0.0"; + pyproject = true; + + build-system = [ + pbr + setuptools + ]; + + nativeBuildInputs = [ + sphinxHook + ]; + + dependencies = [ + click + docutils + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + defusedxml + ]; + + pythonImportsCheck = [ + "sphinx_click" + ]; + + src = fetchPypi { + inherit version; + pname = "sphinx_click"; + hash = "sha256-9dZkMh3AxmIv8Bnx4chOWM4M7P3etRDgBM9gwqOrRls="; + }; + + meta = { + description = "Sphinx extension that automatically documents click applications"; + homepage = "https://github.com/click-contrib/sphinx-click"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ antonmosich ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c0fe5e270bd..49664f84e234 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14909,6 +14909,8 @@ self: super: with self; { sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { }; + sphinx-click = callPackage ../development/python-modules/sphinx-click { }; + sphinx-codeautolink = callPackage ../development/python-modules/sphinx-codeautolink { }; sphinx-comments = callPackage ../development/python-modules/sphinx-comments { }; From 525c38a835c1635a60eefcad7a720647aeaa07f6 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 11 Oct 2024 17:25:32 +0200 Subject: [PATCH 3/3] todoman: add sphinxHook --- pkgs/by-name/to/todoman/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix index f79a54245f8c..8faf54d4222d 100644 --- a/pkgs/by-name/to/todoman/package.nix +++ b/pkgs/by-name/to/todoman/package.nix @@ -4,6 +4,7 @@ jq, lib, python3, + sphinxHook, }: python3.pkgs.buildPythonApplication rec { @@ -20,6 +21,9 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles + sphinxHook + python3.pkgs.sphinx-click + python3.pkgs.sphinx-rtd-theme ]; build-system = with python3.pkgs; [