From 068f854ac951a57dd92fc98c3aac866bb307e5de Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Medina Date: Tue, 10 Oct 2023 19:46:32 +0100 Subject: [PATCH 1/4] python310Packages.sphinx-sitemap: init at 2.5.1 Sitemap generator for Sphinx https://github.com/jdillard/sphinx-sitemap --- .../python-modules/sphinx-sitemap/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-sitemap/default.nix diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix new file mode 100644 index 000000000000..87c1644d7781 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, pytest +, +}: +let + pname = "sphinx-sitemap"; + version = "2.5.1"; +in +buildPythonPackage { + inherit pname version; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-mEvvBou9vCbPriCai2E5LpaBq8kZG0d80w2kBuOmDuU="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + nativeCheckInputs = [ + pytest + ]; + + doCheck = true; + checkPhase = '' + pytest --fixtures tests + ''; + + meta = with lib; { + description = "Sitemap generator for Sphinx"; + homepage = "https://github.com/jdillard/sphinx-sitemap"; + maintainers = with maintainers; [ alejandrosame ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6f03bd9dcce..7e0c6d2db507 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13083,6 +13083,8 @@ self: super: with self; { sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { }; + sphinx-sitemap = callPackage ../development/python-modules/sphinx-sitemap { }; + sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { }; sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { }; From e7b910afd78f322b82feb023156faecd66eec8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1nchez=20Medina?= Date: Wed, 11 Oct 2023 09:47:07 +0100 Subject: [PATCH 2/4] sphinx-sitemap: add changelog Co-authored-by: Martin Weinelt --- pkgs/development/python-modules/sphinx-sitemap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index 87c1644d7781..9f8a76d83d0c 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -31,6 +31,7 @@ buildPythonPackage { ''; meta = with lib; { + changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; description = "Sitemap generator for Sphinx"; homepage = "https://github.com/jdillard/sphinx-sitemap"; maintainers = with maintainers; [ alejandrosame ]; From ddd064543950793cf68a05e8f30172f856295d24 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Medina Date: Wed, 11 Oct 2023 10:00:14 +0100 Subject: [PATCH 3/4] sphinx-sitemap: apply feedback --- .../python-modules/sphinx-sitemap/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index 9f8a76d83d0c..da41fb56e7e0 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -2,8 +2,7 @@ , buildPythonPackage , fetchPypi , sphinx -, pytest -, +, pytestCheckHook }: let pname = "sphinx-sitemap"; @@ -11,6 +10,7 @@ let in buildPythonPackage { inherit pname version; + pyproject = true; src = fetchPypi { inherit pname version; @@ -22,13 +22,14 @@ buildPythonPackage { ]; nativeCheckInputs = [ - pytest + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--fixtures tests" ]; doCheck = true; - checkPhase = '' - pytest --fixtures tests - ''; meta = with lib; { changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; From 67a7b75bbdb53e9e0ec0368864298f09d0232c2b Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Medina Date: Wed, 18 Oct 2023 12:48:20 +0100 Subject: [PATCH 4/4] sphinx-sitemap: disable tests --- .../python-modules/sphinx-sitemap/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index da41fb56e7e0..ecb477980c1d 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , sphinx -, pytestCheckHook }: let pname = "sphinx-sitemap"; @@ -21,15 +20,9 @@ buildPythonPackage { sphinx ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "--fixtures tests" - ]; - - doCheck = true; + # Latest tests do not pass on Sphinx5, although it is supported + # Ref: https://github.com/jdillard/sphinx-sitemap/blob/ce244e9e1e05f09c566432f6a89bcd6f6ebe83bf/tox.ini#L18C25-L18C25 + doCheck = false; meta = with lib; { changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}";