diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-26 11:27:09 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-26 11:27:09 +0100 |
| commit | 925b3356077e2791bf636f68fa4e8cc93d6961bf (patch) | |
| tree | 2f8f61fdd095cfef2fdb074d2233ad5e7e3dc664 /pkgs/applications/virtualization | |
| parent | b191034d8ad7ba5f490d1a8751d298b7b5a528b0 (diff) | |
| parent | 8ebfce0eda627ffa739e16279ac543f4d50cd60c (diff) | |
| download | nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.tar nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.tar.gz nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.tar.bz2 nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.tar.lz nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.tar.xz nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.tar.zst nixpkgs-925b3356077e2791bf636f68fa4e8cc93d6961bf.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 759f0a6ad33..40f8b713d1b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex -, bison, lzo, snappy, libaio, gnutls, nettle +, bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2 zlib pkgconfig glib ncurses perl pixman vde2 texinfo libuuid flex bison makeWrapper lzo snappy - gnutls nettle + gnutls nettle curl ] ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] ++ optionals seccompSupport [ libseccomp ] @@ -123,6 +123,11 @@ stdenv.mkDerivation rec { url = "http://git.qemu.org/?p=qemu.git;a=patch;h=8caed3d564672e8bc6d2e4c6a35228afd01f4723"; sha256 = "19sq6fh7nh8wrk52skky4vwm80029lhm093g11f539krmzjgipik"; }) + (fetchpatch { + name = "qemu-CVE-2016-7907.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=070c4b92b8cd5390889716677a0b92444d6e087a"; + sha256 = "0in89697r6kwkf302v3cg16390q7qs33n2b4kba26m4x65632dxm"; + }) # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html |