qemu-1.3.1

Also, old qemu is unreferenced in nixos and nixpkgs tree, so remove it absent explicit need.

3 files changed, 21 insertions, 38 deletions

diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix
deleted file mode 100644
index f75b21292430..000000000000
--- a/pkgs/applications/virtualization/qemu/0.15.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
-
-stdenv.mkDerivation rec {
-  name = "qemu-0.15.1";
-
-  src = fetchurl {
-    url = "http://wiki.qemu.org/download/${name}.tar.gz";
-    sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp";
-  };
-
-  buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
-
-  meta = {
-    description = "QEmu processor emulator";
-    license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/virtualization/qemu/1.0.nix b/pkgs/applications/virtualization/qemu/1.0.nix
deleted file mode 100644
index daa0b74ee329..000000000000
--- a/pkgs/applications/virtualization/qemu/1.0.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
-
-stdenv.mkDerivation rec {
-  name = "qemu-1.0.1";
-
-  src = fetchurl {
-    url = "http://wiki.qemu.org/download/${name}.tar.gz";
-    sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r";
-  };
-
-  buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
-
-  meta = {
-    description = "QEmu processor emulator";
-    license = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
new file mode 100644
index 000000000000..fabe3fed47df
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-1.3.1";
+
+  src = fetchurl {
+    url = "http://wiki.qemu.org/download/${name}.tar.bz2";
+    sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip";
+  };
+
+  buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "QEmu processor emulator";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [ viric shlevy ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}