Merge branch 'staging-next' into staging

2019-09-06 03:21:30 +02:00
parent e5dece4cbf cdf426488b
commit 306cc9b311
247 changed files with 3153 additions and 2159 deletions
@@ -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;