From 451be596d3f640426736b6c1bbc19deaac1008aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 May 2019 10:38:16 +0200 Subject: [PATCH 1/5] Revert "gtk-doc: fix css file permissions" This reverts commit 0e2768050a7fee157556679b31773b75a935d01d. Let's revert the gtk-doc update for now; it causes too many problems. --- ...ghlight-fix-permission-on-file-style.patch | 24 ------------------- .../tools/documentation/gtk-doc/default.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch diff --git a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch deleted file mode 100644 index f7e37a1a5e5a..000000000000 --- a/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Sat, 18 May 2019 14:44:08 -0400 -Subject: [PATCH] highlight: fix permission on file style - ---- - gtkdoc/highlight.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py -index 8f6e470..d11c432 100644 ---- a/gtkdoc/highlight.py -+++ b/gtkdoc/highlight.py -@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): - - - def append_style_defs(css_file_name): -- os.chmod(css_file_name, stat.S_IWRITE) -+ os.chmod(css_file_name, 0o664) - with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: - css.write(HTML_FORMATTER.get_style_defs()) --- -2.21.0 - diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 44b5384106ea..ee2ca64ffebf 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { patches = [ passthru.respect_xml_catalog_files_var_patch - # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 - ./0001-highlight-fix-permission-on-file-style.patch ]; outputDevdoc = "out"; From 7c1568645bb8eb7cba5d408eedaffa9982514541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 May 2019 10:38:28 +0200 Subject: [PATCH 2/5] Revert "gtk-doc: build with meson" This reverts commit 064ca0afe9c9983d6735cf10d28be6c430409cae. The previous gtk-doc version won't build with our current meson. --- .../tools/documentation/gtk-doc/default.nix | 49 +++++-------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index ee2ca64ffebf..91bd12a90a23 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,15 +1,5 @@ -{ stdenv -, fetchFromGitLab -, meson -, ninja -, pkgconfig -, python3 -, libxml2Python -, docbook_xml_dtd_43 -, docbook_xsl -, libxslt -, gettext -, gnome3 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3 , withDblatex ? false, dblatex }: @@ -17,12 +7,9 @@ stdenv.mkDerivation rec { pname = "gtk-doc"; version = "1.30"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; - sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4"; }; patches = [ @@ -31,27 +18,13 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; - nativeBuildInputs = [ - gettext - meson - ninja - ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = + [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + gnome-doc-utils gettext which itstool + ] ++ stdenv.lib.optional withDblatex dblatex; - buildInputs = [ - docbook_xml_dtd_43 - docbook_xsl - libxslt - pkgconfig - python3 - libxml2Python - ] - ++ stdenv.lib.optional withDblatex dblatex - ; - - mesonFlags = [ - "-Dtests=false" - "-Dyelp_manual=false" - ]; + configureFlags = [ "--disable-scrollkeeper" ]; # Make pygments available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. From b41ef4c7ba3208b2b0f041cfedc7d0628c5a5181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 May 2019 10:38:58 +0200 Subject: [PATCH 3/5] Revert "gtk-doc: 1.29 -> 1.30" This reverts commit 765079fbf98904de0559756083ebdcbba2545e6f. Problems, usually around https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 91bd12a90a23..f6083a78bf89 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gtk-doc"; - version = "1.30"; + version = "1.29"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4"; + sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql"; }; patches = [ From ea01202e5ef1f9543df7d072b8bcdd97c5337454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 May 2019 10:40:04 +0200 Subject: [PATCH 4/5] Revert "libical: temporarily don't build docs to unblock staging-next" This reverts commit dae72e7e7dab5ae89d382471f4cccb888a5458e9. Not needed now. --- pkgs/development/libraries/libical/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 916530220526..8ca3dd727545 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libical-${version}"; version = "3.0.4"; - outputs = [ "out" "dev" ]; #"devdoc" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "libical"; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig cmake ninja vala gobject-introspection (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests -# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 -# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs + gtk-doc docbook_xsl docbook_xml_dtd_43 # docs ]; buildInputs = [ glib libxml2 icu ]; From 8809ebe42a6e2ebd4fd8e742efbebb343f422572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 May 2019 10:40:06 +0200 Subject: [PATCH 5/5] Revert "libpsl: don't build docs" This reverts commit 7c62ef8685730fcdfbd544bbc5720bf18f13a5fd. Not needed now. --- pkgs/development/libraries/libpsl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index b32732fa88cf..65da1f8e9d1d 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-builtin" "--disable-static" -# "--enable-gtk-doc" + "--enable-gtk-doc" "--enable-man" ];