From 66e588868da8df9b7b30520b137553db61647dfc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Mar 2026 22:36:01 +0200 Subject: [PATCH 1/5] python3.pkgs.sphinx-toolbox: use finalAttrs: --- .../python-modules/sphinx-toolbox/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-toolbox/default.nix b/pkgs/development/python-modules/sphinx-toolbox/default.nix index f09dc61e58b3..6621e979bad2 100644 --- a/pkgs/development/python-modules/sphinx-toolbox/default.nix +++ b/pkgs/development/python-modules/sphinx-toolbox/default.nix @@ -19,13 +19,14 @@ tabulate, python, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "sphinx-toolbox"; version = "4.1.2"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "sphinx_toolbox"; hash = "sha256-wwpPhsTCnpetsOuTN9NfUJPLlqRPScr/z31bxYqIt4E="; }; @@ -57,7 +58,7 @@ buildPythonPackage rec { # Not PEP420 compliant, some variables are imported from within the package. postFixup = '' - echo '__version__: str = "${version}"' > $out/${python.sitePackages}/sphinx_toolbox/__init__.py + echo '__version__: str = "${finalAttrs.version}"' > $out/${python.sitePackages}/sphinx_toolbox/__init__.py ''; meta = { @@ -66,4 +67,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 2dec8dfc39dd4b2db6cc78ff1096437533d8dfbe Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Mar 2026 22:36:31 +0200 Subject: [PATCH 2/5] python3.pkgs.sphinx-toolbox: add missing roman dependency --- pkgs/development/python-modules/sphinx-toolbox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sphinx-toolbox/default.nix b/pkgs/development/python-modules/sphinx-toolbox/default.nix index 6621e979bad2..82328a7efd23 100644 --- a/pkgs/development/python-modules/sphinx-toolbox/default.nix +++ b/pkgs/development/python-modules/sphinx-toolbox/default.nix @@ -11,6 +11,7 @@ dict2css, filelock, html5lib, + roman, ruamel-yaml, sphinx-autodoc-typehints, sphinx-jinja2-compat, @@ -48,6 +49,7 @@ buildPythonPackage (finalAttrs: { dict2css filelock html5lib + roman ruamel-yaml sphinx-autodoc-typehints sphinx-jinja2-compat From a7b73cd3e19748043f409e59ab2f0b17e76c118a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Mar 2026 22:47:14 +0200 Subject: [PATCH 3/5] python3.pkgs.autodocsumm: mark as broken (conditionally) Closes #493540 . - sphinx<9.0,>=4.0 not satisfied by version 9.1.0 --- pkgs/development/python-modules/autodocsumm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/autodocsumm/default.nix b/pkgs/development/python-modules/autodocsumm/default.nix index 0b576f6bc422..a2cc266e2634 100644 --- a/pkgs/development/python-modules/autodocsumm/default.nix +++ b/pkgs/development/python-modules/autodocsumm/default.nix @@ -31,5 +31,7 @@ buildPythonPackage rec { homepage = "https://github.com/Chilipp/autodocsumm"; license = lib.licenses.asl20; maintainers = [ ]; + # https://github.com/Chilipp/autodocsumm/issues/108 + broken = lib.versionAtLeast sphinx.version "9.0"; }; } From 720fa66f86a2a417bcf0991018b758a931d73f94 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Mar 2026 22:51:55 +0200 Subject: [PATCH 4/5] python3.pkgs.beets: remove unused fetchpatch argument --- pkgs/development/python-modules/beets/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index 9399a4d7150e..328a2ccd7c19 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -29,7 +29,6 @@ buildPythonPackage, pythonAtLeast, fetchFromGitHub, - fetchpatch, # build-system poetry-core, From 68f1afdb4d8a88a29ae113eacff48b78fdb7913d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Mar 2026 22:53:07 +0200 Subject: [PATCH 5/5] python3.pkgs.beets: remove sphinx man pages These are optional, and `sphinx-toolbox` requires `autodocsumm` which is broken due to lack of support for sphinx 9. Relevant issues: - https://github.com/NixOS/nixpkgs/issues/493540#issuecomment-3979235580 - https://github.com/sphinx-toolbox/sphinx-toolbox/issues/197 - https://github.com/Chilipp/autodocsumm/issues/108 --- .../python-modules/beets/default.nix | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index 328a2ccd7c19..fa41be45ee56 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -52,11 +52,6 @@ # native gobject-introspection, - sphinxHook, - sphinx-design, - sphinx-copybutton, - sphinx-toolbox, - pydata-sphinx-theme, # buildInputs gst_all_1, @@ -161,11 +156,6 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ gobject-introspection - sphinxHook - sphinx-design - sphinx-copybutton - sphinx-toolbox - pydata-sphinx-theme ] ++ extraNativeBuildInputs; @@ -177,19 +167,7 @@ buildPythonPackage (finalAttrs: { outputs = [ "out" - "doc" - "man" ]; - sphinxBuilders = [ - "html" - "man" - ]; - # Causes an installManPage error. Not clear why this directory gets generated - # with the manpages. The same directory is observed correctly in - # $doc/share/doc/beets-${version}/html - preInstallSphinx = '' - rm -r .sphinx/man/man/_sphinx_design_static - ''; postInstall = '' mkdir -p $out/share/zsh/site-functions