gtk-doc: 1.30 -> 1.32

Drop patch for "Wrong permissions for style CSS file".
It was fixed in 1.31

https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/NEWS

+13 -30
-24
pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
··· 1 - From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001 2 - From: worldofpeace <worldofpeace@protonmail.ch> 3 - Date: Sat, 18 May 2019 14:44:08 -0400 4 - Subject: [PATCH] highlight: fix permission on file style 5 - 6 - --- 7 - gtkdoc/highlight.py | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py 11 - index 8f6e470..d11c432 100644 12 - --- a/gtkdoc/highlight.py 13 - +++ b/gtkdoc/highlight.py 14 - @@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): 15 - 16 - 17 - def append_style_defs(css_file_name): 18 - - os.chmod(css_file_name, stat.S_IWRITE) 19 - + os.chmod(css_file_name, 0o664) 20 - with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: 21 - css.write(HTML_FORMATTER.get_style_defs()) 22 - -- 23 - 2.21.0 24 -
+13 -6
pkgs/development/tools/documentation/gtk-doc/default.nix
··· 13 13 , withDblatex ? false, dblatex 14 14 }: 15 15 16 + let 17 + 18 + # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 19 + python = python3.withPackages (p: with p; [ 20 + pygments 21 + ]); 22 + 23 + in 24 + 16 25 stdenv.mkDerivation rec { 17 26 pname = "gtk-doc"; 18 - version = "1.30"; 27 + version = "1.32"; 19 28 20 29 src = fetchFromGitLab { 21 30 domain = "gitlab.gnome.org"; 22 31 owner = "GNOME"; 23 32 repo = pname; 24 33 rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; 25 - sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; 34 + sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk"; 26 35 }; 27 36 28 37 patches = [ 29 38 passthru.respect_xml_catalog_files_var_patch 30 - # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 31 - ./0001-highlight-fix-permission-on-file-style.patch 32 39 ]; 33 40 34 41 outputDevdoc = "out"; ··· 44 51 docbook_xsl 45 52 libxslt 46 53 pkgconfig 47 - python3 54 + python 48 55 libxml2Python 49 56 ] 50 57 ++ stdenv.lib.optional withDblatex dblatex ··· 77 84 description = "Tools to extract documentation embedded in GTK and GNOME source code"; 78 85 homepage = "https://www.gtk.org/gtk-doc"; 79 86 license = licenses.gpl2; 80 - maintainers = with maintainers; [ pSub ]; 87 + maintainers = with maintainers; [ pSub worldofpeace ]; 81 88 }; 82 89 }