Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-04-13 18:50:35 +02:00
9807 changed files with 28240 additions and 18640 deletions
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/libchamplain;
homepage = "https://wiki.gnome.org/Projects/libchamplain";
license = licenses.lgpl2Plus;
description = "C library providing a ClutterActor to display maps";