Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2019-09-06 03:21:30 +02:00
247 changed files with 3153 additions and 2159 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
version = "2.4.11";
meta = with stdenv.lib; {
description = "Web content rendering engine, GTK+ port";
description = "Web content rendering engine, GTK port";
homepage = http://webkitgtk.org/;
license = licenses.bsd2;
platforms = with platforms; linux ++ darwin;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
version = "2.24.4";
meta = {
description = "Web content rendering engine, GTK+ port";
description = "Web content rendering engine, GTK port";
homepage = https://webkitgtk.org/;
license = licenses.bsd2;
platforms = platforms.linux;