qemu: Update 1.5.2 -> 1.7.0

This commit is contained in:
William A. Kennington III 2014-02-20 14:02:55 -06:00 committed by Eelco Dolstra
parent de57c0eb66
commit b6d3526c53

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
, attr, libcap, vde2, alsaLib, texinfo, libuuid , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison
, makeWrapper , makeWrapper
, sdlSupport ? true, SDL , sdlSupport ? true, SDL
, vncSupport ? true, libjpeg, libpng , vncSupport ? true, libjpeg, libpng
@ -7,19 +7,19 @@
, x86Only ? false , x86Only ? false
}: }:
let n = "qemu-1.5.2"; in let n = "qemu-1.7.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = n + (if x86Only then "-x86-only" else ""); name = n + (if x86Only then "-x86-only" else "");
src = fetchurl { src = fetchurl {
url = "http://wiki.qemu.org/download/${n}.tar.bz2"; url = "http://wiki.qemu.org/download/${n}.tar.bz2";
sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; sha256 = "050kq9mz8c2jcshm7nn7dldypsk8jr590ybnlw2wc51dbyl37wri";
}; };
buildInputs = buildInputs =
[ python zlib pkgconfig glib ncurses perl pixman attr libcap [ python zlib pkgconfig glib ncurses perl pixman attr libcap
vde2 alsaLib texinfo libuuid makeWrapper vde2 alsaLib texinfo libuuid flex bison makeWrapper
] ]
++ stdenv.lib.optionals sdlSupport [ SDL ] ++ stdenv.lib.optionals sdlSupport [ SDL ]
++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ]
@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
fi fi
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://www.qemu.org/; homepage = http://www.qemu.org/;
description = "A generic and open source machine emulator and virtualizer"; description = "A generic and open source machine emulator and virtualizer";
license = "GPLv2+"; license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ viric shlevy eelco ]; maintainers = with maintainers; [ viric shlevy eelco ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }