JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32703 from volth/patch-80

Browse Source 
qemu: 2.10.1 -> 2.11.0
This commit is contained in:
Orivej Desh 2017-12-17 02:23:17 +00:00 committed by GitHub
commit 24b7408881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/virtualization/qemu/default.nix
View File

@ -18,8 +18,8 @@
with stdenv.lib;
let
version = "2.10.1";
sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f";
version = "2.11.0";
sha256 = "1jvzw6rdhimn583dz6an8xiw07n3ycvxmj3jpv1s312scv3k9w64";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
@ -62,16 +62,7 @@ stdenv.mkDerivation rec {
patches = [ ./no-etc-install.patch ]
++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optional pulseSupport ./fix-hda-recording.patch
++ [ (fetchpatch {
name = "qemu-CVE-2017-15118.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=51ae4f8455c9e32c54770c4ebc25bf86a8128183";
sha256 = "0f9i096dz3h1i8g92y99vak23rjs1shf7prlcxqizsz0fah7wx7h"; })
(fetchpatch {
name = "qemu-CVE-2017-17381.patch";
url = "https://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git/patch/?id=758ead31c7e17bf17a9ef2e0ca1c3e86ab296b43";
sha256 = "17yw4bqsbywdrbmrikr94yjnfsg853bf4i3k4y3k169387da2yc5"; })
];
++ optional pulseSupport ./fix-hda-recording.patch;
hardeningDisable = [ "stackprotector" ];