Merge pull request #288364 from SuperSandro2000/sphinx-3.12

python312Packages.sphinx: drop sphinxcontrib-apidoc
2024-02-17 13:32:20 +01:00
parent e662338182 e1c94f69a4
commit 991faad3e5
3 changed files with 3 additions and 6 deletions
@@ -41,7 +41,7 @@ buildPythonPackage rec {
    wheel

    # docs
-    (sphinx.override { sphinxcontrib-apidoc = null; }) # avoid pbr dependency pn 3.12, remove once the situtation around that is improved
+    sphinx
  ];

  outputs = [
@@ -11,6 +11,7 @@
 , python-novaclient
 , requests-mock
 , sphinx
+, sphinxcontrib-apidoc
 , stestr
 }:

@@ -28,6 +29,7 @@ buildPythonPackage rec {
    installShellFiles
    openstackdocstheme
    sphinx
+    sphinxcontrib-apidoc
  ];

  propagatedBuildInputs = [
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
@@ -19,7 +18,6 @@
 , pygments
 , requests
 , snowballstemmer
-, sphinxcontrib-apidoc
 , sphinxcontrib-applehelp
 , sphinxcontrib-devhelp
 , sphinxcontrib-htmlhelp
@@ -77,9 +75,6 @@ buildPythonPackage rec {
    sphinxcontrib-serializinghtml
    # extra[docs]
    sphinxcontrib-websupport
-
-    # extra plugins which are otherwise not found by sphinx-build
-    sphinxcontrib-apidoc
  ] ++ lib.optionals (pythonOlder "3.10") [
    importlib-metadata
  ];