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"; }; } diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index 9399a4d7150e..fa41be45ee56 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, @@ -53,11 +52,6 @@ # native gobject-introspection, - sphinxHook, - sphinx-design, - sphinx-copybutton, - sphinx-toolbox, - pydata-sphinx-theme, # buildInputs gst_all_1, @@ -162,11 +156,6 @@ buildPythonPackage (finalAttrs: { nativeBuildInputs = [ gobject-introspection - sphinxHook - sphinx-design - sphinx-copybutton - sphinx-toolbox - pydata-sphinx-theme ] ++ extraNativeBuildInputs; @@ -178,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 diff --git a/pkgs/development/python-modules/sphinx-toolbox/default.nix b/pkgs/development/python-modules/sphinx-toolbox/default.nix index f09dc61e58b3..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, @@ -19,13 +20,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="; }; @@ -47,6 +49,7 @@ buildPythonPackage rec { dict2css filelock html5lib + roman ruamel-yaml sphinx-autodoc-typehints sphinx-jinja2-compat @@ -57,7 +60,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 +69,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +})