From 7d1ac249dfce996a8287eddbe24812d650e0dd6c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 3 Jun 2019 15:54:04 -0400 Subject: [PATCH 1/5] Revert "Revert "gtk-doc: 1.29 -> 1.30"" This reverts commit b41ef4c7ba3208b2b0f041cfedc7d0628c5a5181. --- 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 f6083a78bf8..91bd12a90a2 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.29"; + version = "1.30"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql"; + sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4"; }; patches = [ From 93cac33f95e5cb0312db366c48f6c163abcd0b0a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 3 Jun 2019 15:54:27 -0400 Subject: [PATCH 2/5] Revert "Revert "gtk-doc: build with meson"" This reverts commit 7c1568645bb8eb7cba5d408eedaffa9982514541. --- .../tools/documentation/gtk-doc/default.nix | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 91bd12a90a2..ee2ca64ffeb 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3 +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkgconfig +, python3 +, libxml2Python +, docbook_xml_dtd_43 +, docbook_xsl +, libxslt +, gettext +, gnome3 , withDblatex ? false, dblatex }: @@ -7,9 +17,12 @@ stdenv.mkDerivation rec { pname = "gtk-doc"; version = "1.30"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; + sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; }; patches = [ @@ -18,13 +31,27 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; - 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; + nativeBuildInputs = [ + gettext + meson + ninja + ]; - configureFlags = [ "--disable-scrollkeeper" ]; + buildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + libxslt + pkgconfig + python3 + libxml2Python + ] + ++ stdenv.lib.optional withDblatex dblatex + ; + + mesonFlags = [ + "-Dtests=false" + "-Dyelp_manual=false" + ]; # 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 9096648a2e6aa21e3c6a6ee5b114daed58701d5e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 3 Jun 2019 15:54:46 -0400 Subject: [PATCH 3/5] Revert "Revert "gtk-doc: fix css file permissions"" This reverts commit 451be596d3f640426736b6c1bbc19deaac1008aa. --- ...ghlight-fix-permission-on-file-style.patch | 24 +++++++++++++++++++ .../tools/documentation/gtk-doc/default.nix | 2 ++ 2 files changed, 26 insertions(+) create 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 new file mode 100644 index 00000000000..f7e37a1a5e5 --- /dev/null +++ b/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch @@ -0,0 +1,24 @@ +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 ee2ca64ffeb..44b5384106e 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -27,6 +27,8 @@ 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 daf8b6897180e8a54b7b1f71da8fa0fcebe5764f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 3 Jun 2019 15:55:07 -0400 Subject: [PATCH 4/5] Revert "Revert "libpsl: don't build docs"" This reverts commit 8809ebe42a6e2ebd4fd8e742efbebb343f422572. --- 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 65da1f8e9d1..b32732fa88c 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" ]; From ff3049f67de99c90f4ca10609eb21e5c6eea84a6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 3 Jun 2019 15:55:19 -0400 Subject: [PATCH 5/5] Revert "Revert "libical: temporarily don't build docs to unblock staging-next"" This reverts commit ea01202e5ef1f9543df7d072b8bcdd97c5337454. --- pkgs/development/libraries/libical/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 8ca3dd72754..91653022052 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,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig cmake ninja vala gobject-introspection (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests - gtk-doc docbook_xsl docbook_xml_dtd_43 # docs +# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 +# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs ]; buildInputs = [ glib libxml2 icu ];