From 69c91f30ce88cba86b31ac90e0c6805aaf8f27d4 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sat, 7 Jan 2012 15:06:49 +0000
Subject: [PATCH] applications/virtualization/qemu: Added 0.15.nix

svn path=/nixpkgs/trunk/; revision=31401
---
 .../applications/virtualization/qemu/0.15.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/virtualization/qemu/0.15.nix

diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix
new file mode 100644
index 00000000000..f75b2129243
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/0.15.nix
@@ -0,0 +1,19 @@
+{ 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f38efd5161b..302b4675822 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7279,7 +7279,9 @@ let
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
-  qemu = callPackage ../applications/virtualization/qemu/0.13.nix { };
+  qemu = callPackage ../applications/virtualization/qemu/0.15.nix { };
+
+  qemu_0_13 = callPackage ../applications/virtualization/qemu/0.13.nix { };
 
   qemuSVN = callPackage ../applications/virtualization/qemu/svn-6642.nix { };