diff --git a/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch b/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch deleted file mode 100644 index 0a19e7af1048..000000000000 --- a/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 08c4225b87..3a9bbe4ed0 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -1402,6 +1402,8 @@ class _sage_doc: - sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst') - True - sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx sagemath_doc_html -+ ... -+ FutureWarning: The configuration setting "embed_images" will be removed in Docutils 1.2. Use "image_loading: link". - '...div...File:...Type:...Definition:...identity_matrix...' - - In the 'text' version, double colons have been replaced with diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index a0375a5184a8..514cbb66ea7d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -112,22 +112,27 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch - # docutils 0.18.1 now triggers Sphinx warnings. tolerate them for - # now, because patching Sphinx is not feasible. remove when Sphinx - # 5.0 hits nixpkgs. - # https://github.com/sphinx-doc/sphinx/pull/10372 - ./patches/docutils-0.18.1-deprecation.patch - (fetchSageDiff { name = "eclib-20220621-update.patch"; base = "9.7.beta4"; rev = "9b65d73399b33043777ba628a4d318638aec6e0e"; sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI="; }) + + # https://trac.sagemath.org/ticket/34149 + (fetchSageDiff { + name = "sphinx-5-update.patch"; + base = "9.7.beta6"; + rev = "6f9ceb7883376a1cacda51d84ec7870121860482"; + sha256 = "sha256-prTCwBfl/wNXIkdjKLiMSe/B64wCXOjOTr4AVNiFruw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; + # do not create .orig backup files if patch applies with fuzz + patchFlags = [ "--no-backup-if-mismatch" "-p1" ]; + postPatch = '' # Make sure sage can at least be imported without setting any environment # variables. It won't be close to feature complete though.