From 14317f96859a24a0517c0e89487d5dd10c33cff1 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Thu, 13 Nov 2025 07:54:36 -0800
Subject: [PATCH] rocmPackages.rocdbgapi: remove workaround for doxygen <1.15
 table bug

We were applying a workaround due to a doxygen issue with tables.
https://github.com/doxygen/doxygen/issues/11634

This issue has been fixed in doxygen 1.15.

Fixes: #461156
---
 .../rocm-modules/6/rocdbgapi/default.nix      | 19 +---
 .../6/rocdbgapi/override_doxygen_tables.sty   | 89 -------------------
 2 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty

diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
index b3203f03d4c3..ba4cd52b2a74 100644
--- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
+++ b/pkgs/development/rocm-modules/6/rocdbgapi/default.nix
@@ -37,15 +37,10 @@ let
         helvetic
         wasy
         courier
-        # FIXME: The following packages are used in the Doxygen table
-        # workaround, can be removed once
-        # https://github.com/doxygen/doxygen/issues/11634 is fixed, depending
-        # on what the fix is
         tabularray
+        ltablex
         ninecolors
-        codehigh
-        catchfile
-        environ
+        xltabular
       ]
     )
   );
@@ -68,16 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Rr8+SNeFps0rjk4Jn2+rFmtRJfL42l0tNOz13oZQy+I=";
   };
 
-  # FIXME: remove once https://github.com/doxygen/doxygen/issues/11634 is resolved
-  # Applies workaround based on what was suggested in
-  # https://github.com/doxygen/doxygen/issues/11634#issuecomment-3027000655,
-  # but rewritten to use the `tabularray` LaTeX package. Unfortunately,
-  # verbatim code snippets in the documentation are not formatted very nicely
-  # with this workaround.
-  postPatch = ''
-    substituteInPlace doc/Doxyfile.in --replace 'LATEX_EXTRA_STYLESHEET =' 'LATEX_EXTRA_STYLESHEET = ${./override_doxygen_tables.sty}'
-  '';
-
   nativeBuildInputs = [
     cmake
     rocm-cmake
diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty b/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty
deleted file mode 100644
index 6732649570ad..000000000000
--- a/pkgs/development/rocm-modules/6/rocdbgapi/override_doxygen_tables.sty
+++ /dev/null
@@ -1,89 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-
-% Packages used by this style file
-\RequirePackage{doxygen}
-\RequirePackage{tabularray}
-\UseTblrLibrary{varwidth}
-\RequirePackage{codehigh}
-\RequirePackage{environ}
-
-% Used by parameter lists
-\renewenvironment{DoxyParams}[2][]{%
-    \par%
-    \ifthenelse{\equal{#1}{}}%
-      {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|}}}% name + description
-    {\ifthenelse{\equal{#1}{1}}%
-      {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|X[-1,l]|}}}% in/out + name + desc
-      {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,l]|X[-1,l]|X[-1,l]|}}}% in/out + type + name + desc
-    }
-    \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #2 \\[1ex]%
-    \hline%
-}{%
-    \end{longtblr}%
-    \vspace{6pt}%
-}
-
-% Used for fields of simple structs
-\renewenvironment{DoxyFields}[1]{%
-    \par%
-    \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|X[-1,l]|}}%
-    \SetCell[c=3]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]%
-    \hline%
-}{%
-    \end{longtblr}%
-    \vspace{6pt}%
-}
-
-% Used for fields simple class style enums
-\renewenvironment{DoxyEnumFields}[2][]{%
-    \par%
-    \ifthenelse{\equal{#1}{2}}%
-      {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}}%
-      {\begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,l]|X[-1,r]|X[-1,l]|}}}% with init value
-    \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #2 \\[1ex]%
-    \hline%
-}{%
-    \end{longtblr}%
-    \vspace{6pt}%
-}
-
-% Used by return value lists
-\renewenvironment{DoxyRetVals}[1]{%
-    \par%
-    \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}%
-    \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]%
-    \hline%
-}{%
-    \end{longtblr}%
-    \vspace{6pt}%
-}
-
-% Used by exception lists
-\renewenvironment{DoxyExceptions}[1]{%
-    \par%
-    \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|l[-1,r]|l[-1,l]|}}%
-    \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]%
-    \hline%
-}{%
-    \end{longtblr}%
-    \vspace{6pt}%
-}
-
-% Used by template parameter lists
-\renewenvironment{DoxyTemplParams}[1]{%
-    \par%
-    \begin{longtblr}[l]{rowhead=1,measure=vbox,colspec={|X[-1,r]|X[-1,l]|}}%
-    \SetCell[c=2]{l} \hspace{-6pt}\bfseries\fontseries{bc}\selectfont\color{darkgray} #1 \\[1ex]%
-    \hline%
-}{%
-    \end{longtblr}%
-    \vspace{6pt}%
-}
-
-% NOTE: this is not a perfect workaround, and known to loose linebreaks, repeated spaces, etc
-\RenewEnviron{DoxyVerb}{%
-  \par%
-  \footnotesize%
-  \ExpandArgs{o}\fakeverb{\BODY}%
-  \normalsize%
-}