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
@@ -21,13 +21,13 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "dolphin-emu";
-  version = "5.0-10879";
+  version = "5.0-11109";

  src = fetchFromGitHub {
    owner = "dolphin-emu";
    repo = "dolphin";
-    rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b";
-    sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj";
+    rev = "93d7b3d15962a3393cf2971e14c4acf54d90cecd";
+    sha256 = "1kkx3agdsc0qmf3yymlzq315nypm34qvq04qpjqycpfhmpx8gdnq";
  };

  enableParallelBuilding = true;