From 24bf9c5de6f7e7fbc250dcaf7cc938de8743be71 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Sep 2024 17:07:14 +0200
Subject: [PATCH] python3Packages.sphinx: 7.3.7 -> 7.4.7

https://www.sphinx-doc.org/en/master/changes.html
---
 .../python-modules/sphinx/default.nix         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 16e2a81e5043..dc79c8b664e5 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -4,7 +4,6 @@
   pythonAtLeast,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   isPyPy,
 
   # build-system
@@ -29,6 +28,7 @@
   sphinxcontrib-serializinghtml,
   sphinxcontrib-websupport,
   tomli,
+  typing-extensions,
 
   # check phase
   defusedxml,
@@ -40,8 +40,9 @@
 
 buildPythonPackage rec {
   pname = "sphinx";
-  version = "7.3.7";
-  format = "pyproject";
+  version = "7.4.7";
+  pyproject = true;
+
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
@@ -55,17 +56,9 @@ buildPythonPackage rec {
       mv tests/roots/test-images/{testimäge,testimæge}.png
       sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst}
     '';
-    hash = "sha256-XGGRWEvd1SbQsK8W5yxDzBd5hlvXcDzr8t5Qa6skH/M=";
+    hash = "sha256-/5zH9IdLmTGnn5MY4FFSuZOIeF/x1L9Ga/wp57XrAQo=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "python-3.13-compat.patch";
-      url = "https://github.com/sphinx-doc/sphinx/commit/3496de62b743942115acb486cf35dfcc102586c3.patch";
-      hash = "sha256-5VBPOQeGyj3a8VBq4hc9S/eKaeVZeGCTNislwgsauZo=";
-    })
-  ];
-
   build-system = [ flit-core ];
 
   dependencies =
@@ -99,6 +92,7 @@ buildPythonPackage rec {
     html5lib
     pytestCheckHook
     pytest-xdist
+    typing-extensions
   ];
 
   preCheck = ''
@@ -121,6 +115,8 @@ buildPythonPackage rec {
       "test_class_alias_having_doccomment"
       "test_class_alias_for_imported_object_having_doccomment"
       "test_decorators"
+      # Assertion error
+      "test_gettext_literalblock_additional"
       # requires cython_0, but fails miserably on 3.11
       "test_cython"
       # Could not fetch remote image: http://localhost:7777/sphinx.png