diff --git a/pkgs/applications/virtualization/qemu/cve-2014-2894.patch b/pkgs/applications/virtualization/qemu/cve-2014-2894.patch deleted file mode 100644 index 4f4bcfc06ad..00000000000 --- a/pkgs/applications/virtualization/qemu/cve-2014-2894.patch +++ /dev/null @@ -1,14 +0,0 @@ - -diff --git a/hw/ide/core.c b/hw/ide/core.c -index e1dfe54..c943a4d 100644 ---- a/hw/ide/core.c -+++ b/hw/ide/core.c -@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd) - case 2: /* extended self test */ - s->smart_selftest_count++; - if (s->smart_selftest_count > 21) { -- s->smart_selftest_count = 0; -+ s->smart_selftest_count = 1; - } - n = 2 + (s->smart_selftest_count - 1) * 24; - s->smart_selftest_data[n] = s->sector; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ac9b3448a14..176d196b064 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,17 +7,17 @@ , x86Only ? false }: -let n = "qemu-1.7.1"; in +let n = "qemu-2.0.0"; in stdenv.mkDerivation rec { name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1x5y06zhp0gc97g1sb98vf7dkawg63xywv0mbnpfnbi20jh452fn"; + sha256 = "0frsahiw56jr4cqr9m6s383lyj4ar9hfs2wp3y4yr76krah1mk30"; }; - patches = [ ./cve-2014-0150.patch ./cve-2014-2894.patch ]; + patches = [ ./cve-2014-0150.patch ]; buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap