01/02: gnu: ganeti: Prepare for Sphinx 4.0.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 711ee48f81d62785b6e1fedcba20ed3078b8ab01
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Oct 13 22:23:14 2021 +0200

    gnu: ganeti: Prepare for Sphinx 4.0.
    
    * gnu/packages/patches/ganeti-sphinx-compat.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/virtualization.scm (ganeti)[source](patches): Add it.
---
 gnu/local.mk                                    |  1 +
 gnu/packages/patches/ganeti-sphinx-compat.patch | 24 ++++++++++++++++++++++++
 gnu/packages/virtualization.scm                 |  1 +
 3 files changed, 26 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6f03793..8c30eaa 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1068,6 +1068,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch                \
   %D%/packages/patches/ganeti-shepherd-master-failover.patch   \
   %D%/packages/patches/ganeti-shepherd-support.patch           \
+  %D%/packages/patches/ganeti-sphinx-compat.patch              \
   %D%/packages/patches/gash-utils-ls-test.patch                        \
   %D%/packages/patches/gawk-shell.patch                                \
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
diff --git a/gnu/packages/patches/ganeti-sphinx-compat.patch 
b/gnu/packages/patches/ganeti-sphinx-compat.patch
new file mode 100644
index 0000000..4e84abb
--- /dev/null
+++ b/gnu/packages/patches/ganeti-sphinx-compat.patch
@@ -0,0 +1,24 @@
+Adjust documentation for Sphinx 4.0.
+
+Discussed upstream at <https://github.com/ganeti/ganeti/pull/1615>.
+
+diff --git a/doc/index.rst b/doc/index.rst
+--- a/doc/index.rst
++++ b/doc/index.rst
+@@ -119,7 +119,6 @@ Draft designs
+    design-hotplug.rst
+    design-internal-shutdown.rst
+    design-kvmd.rst
+-   design-location.rst
+    design-linuxha.rst
+    design-location.rst
+    design-lu-generated-jobs.rst
+diff --git a/lib/build/shell_example_lexer.py 
b/lib/build/shell_example_lexer.py
+--- a/lib/build/shell_example_lexer.py
++++ b/lib/build/shell_example_lexer.py
+@@ -79,4 +79,4 @@ class ShellExampleLexer(RegexLexer):
+ 
+ 
+ def setup(app):
+-  app.add_lexer("shell-example", ShellExampleLexer())
++  app.add_lexer("shell-example", ShellExampleLexer)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 772a0ac..0dd05a6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -519,6 +519,7 @@ firmware blobs.  You can
               (file-name (git-file-name name version))
               (patches (search-patches "ganeti-shepherd-support.patch"
                                        "ganeti-shepherd-master-failover.patch"
+                                       "ganeti-sphinx-compat.patch"
                                        "ganeti-haskell-compat.patch"
                                        "ganeti-haskell-pythondir.patch"
                                        "ganeti-disable-version-symlinks.patch"