diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-17 02:23:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 02:23:17 +0000 |
| commit | 24b7408881752fc28fc19dd020c4b866ed2529c1 (patch) | |
| tree | ce912cd141e0df77e8650691119c80fdf723684f /pkgs/applications/virtualization | |
| parent | 1b3f8370025e57325e83460735abac634bb80f2d (diff) | |
| parent | fbaa749621ae0ec1ff213f074b16c95685acca0e (diff) | |
| download | nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.tar nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.tar.gz nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.tar.bz2 nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.tar.lz nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.tar.xz nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.tar.zst nixlib-24b7408881752fc28fc19dd020c4b866ed2529c1.zip | |
Merge pull request #32703 from volth/patch-80
qemu: 2.10.1 -> 2.11.0
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 533567281365..5d70c6716005 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -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" ]; |