summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-02-11 09:24:26 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-02-11 10:55:07 +0100
commit3eda07c3cd2faeb2683a64479636af9b29472757 (patch)
treed14f20c9078340b1c70f22630145ae9e048433f9
parent674bfaf5e533346e63e246321307ee6246672965 (diff)
downloadnixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.tar
nixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.tar.gz
nixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.tar.bz2
nixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.tar.lz
nixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.tar.xz
nixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.tar.zst
nixpkgs-3eda07c3cd2faeb2683a64479636af9b29472757.zip
gtk-doc: 1.33.1 -> 1.33.2
https://gitlab.gnome.org/GNOME/gtk-doc/-/compare/1.33.1...1.33.2

- Removed anytree – NIHing because of Debian.
- Updated metadata.
-rw-r--r--pkgs/development/tools/documentation/gtk-doc/default.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index d82c288e5aa..e74a6b9c3c6 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -5,7 +5,7 @@
 , pkg-config
 , python3
 , docbook_xml_dtd_43
-, docbook_xsl
+, docbook-xsl-nons
 , libxslt
 , gettext
 , gnome3
@@ -14,7 +14,9 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gtk-doc";
-  version = "1.33.1";
+  version = "1.33.2";
+
+  outputDevdoc = "out";
 
   format = "other";
 
@@ -23,15 +25,13 @@ python3.pkgs.buildPythonApplication rec {
     owner = "GNOME";
     repo = pname;
     rev = version;
-    sha256 = "L9CjhZ60F42xbo50x7cdKfJrav/9mf38pff8S4xkEVo=";
+    sha256 = "A6OXpazrJ05SUIO1ZPVN0xHTXOSov8UnPvUolZAv/Iw=";
   };
 
   patches = [
     passthru.respect_xml_catalog_files_var_patch
   ];
 
-  outputDevdoc = "out";
-
   nativeBuildInputs = [
     pkg-config
     gettext
@@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
 
   buildInputs = [
     docbook_xml_dtd_43
-    docbook_xsl
+    docbook-xsl-nons
     libxslt
   ] ++ lib.optionals withDblatex [
     dblatex
@@ -50,7 +50,6 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonPath = with python3.pkgs; [
     pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
-    (anytree.override { withGraphviz = false; })
     lxml
   ];
 
@@ -79,8 +78,8 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Tools to extract documentation embedded in GTK and GNOME source code";
-    homepage = "https://www.gtk.org/gtk-doc";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ pSub worldofpeace ];
+    homepage = "https://gitlab.gnome.org/GNOME/gtk-doc";
+    license = licenses.gpl2Plus;
+    maintainers = teams.gnome.members ++ (with maintainers; [ pSub ]);
   };
 }