diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/documentation')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix | 28 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix | 10 |
2 files changed, 16 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix index 772b654df935..613dec86d7cd 100644 --- a/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,15 +1,14 @@ -{ stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }: +{ stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: stdenv.mkDerivation rec { - - name = "doxygen-1.8.19"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. - "http://doxygen.nl/files/${name}.src.tar.gz" - ]; - sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc"; + pname = "doxygen"; + version = "1.8.20"; + + src = fetchFromGitHub { + owner = "doxygen"; + repo = "doxygen"; + rev = "Release_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh"; }; nativeBuildInputs = [ @@ -20,19 +19,18 @@ stdenv.mkDerivation rec { ]; buildInputs = - stdenv.lib.optional (qt4 != null) qt4 + stdenv.lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) ++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ - stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; + stdenv.lib.optional (qt5 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; - enableParallelBuilding = true; - doCheck = false; # fails + enableParallelBuilding = false; meta = { license = stdenv.lib.licenses.gpl2Plus; @@ -47,6 +45,6 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt5 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix index c93ee954ceab..10b48d511918 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.32"; + version = "1.33.1"; format = "other"; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; - sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk"; + rev = version; + sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo="; }; patches = [ @@ -68,10 +68,6 @@ python3.pkgs.buildPythonApplication rec { --replace "${python3}" "" ''; - # find: ‘...-gtk-doc-1.32/lib/python3.8/site-packages’: No such file or directory - # https://github.com/NixOS/nixpkgs/pull/90208#issuecomment-644051108 - dontUsePythonRecompileBytecode = true; - passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; |