From fe1de474821a422cf0c5bfd275cf33632caf4ed0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Jan 2024 08:50:01 +0100 Subject: [PATCH 1/2] python311Packages.sphinx-notfound-page: adjust inputs --- .../sphinx-notfound-page/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index e9f5d9c4519d..0621c2867d03 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , flit-core , pythonImportsCheckHook +, pythonOlder # documentation build dependencies , sphinxHook , sphinx-prompt @@ -12,18 +13,25 @@ , sphinxemoji # runtime dependencies , sphinx +, setuptools }: buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "1.0.0"; - format = "pyproject"; - outputs = [ "out" "doc" ]; + pyproject = true; + + disabled = pythonOlder "3.8"; + + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-notfound-page"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; @@ -38,13 +46,22 @@ buildPythonPackage rec { sphinxemoji ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "notfound" ]; + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "notfound" + ]; meta = with lib; { description = "A sphinx extension to create a custom 404 page with absolute URLs hardcoded"; homepage = "https://github.com/readthedocs/sphinx-notfound-page"; + changelog = "https://github.com/readthedocs/sphinx-notfound-page/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; From 8254df478e3166c000840a10028baaed56261ef5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Jan 2024 09:08:21 +0100 Subject: [PATCH 2/2] python311Packages.sphinx-version-warning: refactor --- .../sphinx-version-warning/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 1fb89f3a2849..7561fcd0dba5 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -3,13 +3,15 @@ , fetchFromGitHub , fetchpatch , pythonImportsCheckHook +, pythonOlder +, setuptools , sphinx -, sphinxHook , sphinx-autoapi +, sphinx-prompt , sphinx-rtd-theme , sphinx-tabs -, sphinx-prompt , sphinxemoji +, sphinxHook }: # Latest tagged release release "1.1.2" (Nov 2018) does not contain @@ -18,9 +20,14 @@ buildPythonPackage { pname = "sphinx-version-warning"; version = "unstable-2019-08-10"; - format = "pyproject"; + pyproject = true; - outputs = [ "out" "doc" ]; + disabled = pythonOlder "3.7"; + + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "humitos"; @@ -40,21 +47,27 @@ buildPythonPackage { nativeBuildInputs = [ pythonImportsCheckHook - sphinxHook sphinx-autoapi + sphinx-prompt sphinx-rtd-theme sphinx-tabs - sphinx-prompt sphinxemoji + sphinxHook + setuptools ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "versionwarning" ]; + pythonImportsCheck = [ + "versionwarning" + ]; meta = with lib; { description = "A sphinx extension to show a warning banner at the top of your documentation"; homepage = "https://github.com/humitos/sphinx-version-warning"; + changelog = "https://github.com/humitos/sphinx-version-warning/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; };