From 553b51654adf4004a7ef367f8c57bade5e41b145 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 12 Aug 2024 16:04:02 +0200 Subject: [PATCH 1/3] doxygen: use finalAttrs --- pkgs/development/tools/documentation/doxygen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 194b614a12d5..c566b8f287a1 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -13,14 +13,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "doxygen"; version = "1.13.2"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; - tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-tet2Ep2Mvucg2QBJbo9A6531cJhQ9L7+ZMmo07S8cwY="; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { ''; platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; }; -} +}) From 60d8424744c2f2d575614234d0ce3ac1554364a7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 28 Nov 2024 11:47:48 +0100 Subject: [PATCH 2/3] doxygen: clean iconv iconv is now properly found by CMake, ref. https://doxygen.nl/manual/changelog.html --- pkgs/development/tools/documentation/doxygen/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index c566b8f287a1..4a081b615660 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; cmakeFlags = [ - "-DICONV_INCLUDE_DIR=${libiconv}/include" "-Duse_sys_spdlog=ON" "-Duse_sys_sqlite3=ON" ] ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; From 8955bab27aff175d8b56f2fdaa0977244e0d3ab9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 12 Aug 2024 16:21:39 +0200 Subject: [PATCH 3/3] python3Packages.doxmlparser: init at 1.12.0 Co-authored-by: OTABI Tomoya Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- .../documentation/doxygen/doxmlparser.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/documentation/doxygen/doxmlparser.nix diff --git a/pkgs/development/tools/documentation/doxygen/doxmlparser.nix b/pkgs/development/tools/documentation/doxygen/doxmlparser.nix new file mode 100644 index 000000000000..e2da763cb289 --- /dev/null +++ b/pkgs/development/tools/documentation/doxygen/doxmlparser.nix @@ -0,0 +1,32 @@ +{ + buildPythonPackage, + doxygen, + lxml, + setuptools, + six, +}: +buildPythonPackage rec { + inherit (doxygen) version src; + pname = "doxmlparser"; + + sourceRoot = "${src.name}/addon/doxmlparser"; + + build-system = [ setuptools ]; + + dependencies = [ + lxml + six + ]; + + pythonImportsCheck = [ "doxmlparser" ]; + + meta = { + inherit (doxygen.meta) + license + homepage + changelog + platforms + ; + description = "Library to parse the XML output produced by doxygen"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7543f3ec1f8c..d4ad9223d82b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4058,6 +4058,8 @@ self: super: with self; { downloader-cli = callPackage ../development/python-modules/downloader-cli { }; + doxmlparser = callPackage ../development/tools/documentation/doxygen/doxmlparser.nix { }; + dparse = callPackage ../development/python-modules/dparse { }; dparse2 = callPackage ../development/python-modules/dparse2 { };