Merge staging-next into staging

2019-11-11 12:09:26 +01:00
parent 539e94030c cf27abf534
commit 73b88e17dd
442 changed files with 23507 additions and 19144 deletions
@@ -16,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
  pname = "webkitgtk";
-  version = "2.26.1";
+  version = "2.26.2";

  meta = {
    description = "Web content rendering engine, GTK port";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb";
+    sha256 = "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b";
  };

  patches = optionals stdenv.isLinux [