From 98245d66c0fc6ee25ad2b58ff3d08a1468f4992a Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 29 Dec 2024 00:29:39 +0800 Subject: [PATCH 1/2] doxygen: format --- .../tools/documentation/doxygen/default.nix | 52 ++++++++++++------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index e3a0f9609c0e..92a81056f32d 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, fetchpatch -, python3 -, flex -, bison -, qt5 -, CoreServices -, libiconv -, spdlog -, sqlite +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + fetchpatch, + python3, + flex, + bison, + qt5, + CoreServices, + libiconv, + spdlog, + sqlite, }: stdenv.mkDerivation rec { @@ -49,8 +50,19 @@ stdenv.mkDerivation rec { bison ]; - buildInputs = [ libiconv spdlog sqlite ] - ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) + buildInputs = + [ + libiconv + spdlog + sqlite + ] + ++ lib.optionals (qt5 != null) ( + with qt5; + [ + qtbase + wrapQtAppsHook + ] + ) ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cmakeFlags = [ @@ -60,18 +72,21 @@ stdenv.mkDerivation rec { ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; # put examples in an output so people/tools can test against them - outputs = [ "out" "examples" ]; + outputs = [ + "out" + "examples" + ]; + postInstall = '' cp -r ../examples $examples ''; meta = { license = lib.licenses.gpl2Plus; - homepage = "https://www.doxygen.nl/"; + homepage = "https://www.doxygen.nl"; changelog = "https://www.doxygen.nl/manual/changelog.html"; description = "Source code documentation generator tool"; mainProgram = "doxygen"; - longDescription = '' Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming @@ -81,7 +96,6 @@ stdenv.mkDerivation rec { off-line reference manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; }; } From 5922ada38dd89f2bd22b560120a251617d535b27 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 29 Dec 2024 00:39:51 +0800 Subject: [PATCH 2/2] doxygen: 1.12.0 -> 1.13.0 --- .../tools/documentation/doxygen/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 92a81056f32d..66ccab402e2f 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -3,7 +3,6 @@ stdenv, cmake, fetchFromGitHub, - fetchpatch, python3, flex, bison, @@ -16,25 +15,15 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; - rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-4zSaM49TjOaZvrUChM4dNJLondCsQPSArOXZnTHS4yI="; + tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-XKzH2nMByE0WE7WX4YYj2boq9+iwD7SyO5w9/4g9cGE="; }; - patches = [ - # fix clang-19 build. can drop on next update - # https://github.com/doxygen/doxygen/pull/11064 - (fetchpatch { - name = "fix-clang-19-build.patch"; - url = "https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f.patch"; - hash = "sha256-TtkVfV9Ep8/+VGbTjP4NOP8K3p1+A78M+voAIQ+lzOk="; - }) - ]; - # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 postPatch = '' substituteInPlace CMakeLists.txt \