Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2020-10-22 21:20:32 +02:00
138 changed files with 1470 additions and 763 deletions
+3 -3
View File
@@ -21,13 +21,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-11824";
version = "5.0-12716";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "1b97f081b8eff9012132a4124537968bdb0e03e0";
sha256 = "1v96hcn34040vjsw83k8p0r0nb8rrdcz80h4ngirxzm36b3l7w6m";
rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333";
sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg";
};
enableParallelBuilding = true;
+2 -2
View File
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
name = "${prefix}jack2-${version}";
version = "1.9.14";
version = "1.9.16";
src = fetchFromGitHub {
owner = "jackaudio";
repo = "jack2";
rev = "v${version}";
sha256 = "1prxg1l8wrxfp2mh7l4mvjvmml6816fciq1la88ylhwm1qnfvnax";
sha256 = "0pzgrjy5fi2nif2j442fs3j2bbshxpnmq9kzwcqz54wx1w8fzdfr";
};
nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];