Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
247 changed files with 3153 additions and 2159 deletions

View File

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
description = "Tools to extract documentation embedded in GTK+ and GNOME source code";
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 ];