* Switch to QEMU/KVM 1.0.1.

svn path=/nixpkgs/trunk/; revision=33878

pkgs/os-specific/linux/qemu-kvm/1.0.nix

@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
-, libjpeg, libpng, ncurses, python, glib }:
-
-assert stdenv.isLinux;
-
-let version = "1.0.1"; in
-
-stdenv.mkDerivation rec {
-  name = "qemu-kvm-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
-    sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
-  };
-
-  patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
-
-  postPatch =
-    '' for i in $(find kvm -type f)
-       do
-         sed -i "$i" \
-             -e 's|/bin/bash|/bin/sh|g ;
-                 s|/usr/bin/python|${python}/bin/python|g ;
-                 s|/bin/rm|rm|g'
-       done
-    '';
-
-  configureFlags =
-    [ "--audio-drv-list=alsa"
-      "--smbd=smbd"                               # use `smbd' from $PATH
-    ];
-
-  enableParallelBuilding = true;
-
-  buildInputs =
-    [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
-      ncurses python glib
-    ];
-
-  postInstall =
-    ''
-      # Libvirt expects us to be called `qemu-kvm'.  Otherwise it will
-      # set the domain type to "qemu" rather than "kvm", which can
-      # cause architecture selection to misbehave.
-      ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
-    '';
-
-  meta = {
-    homepage = http://www.linux-kvm.org/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/os-specific/linux/qemu-kvm/default.nix

@@ -3,16 +3,28 @@
 
 assert stdenv.isLinux;
 
+let version = "1.0.1"; in
+
 stdenv.mkDerivation rec {
-  name = "qemu-kvm-0.15.1";
+  name = "qemu-kvm-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kvm/${name}.tar.gz";
+    url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
-    sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf";
+    sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
   };
 
   patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
 
+  postPatch =
+    '' for i in $(find kvm -type f)
+       do
+         sed -i "$i" \
+             -e 's|/bin/bash|/bin/sh|g ;
+                 s|/usr/bin/python|${python}/bin/python|g ;
+                 s|/bin/rm|rm|g'
+       done
+    '';
+
   configureFlags =
     [ "--audio-drv-list=alsa"
       "--smbd=smbd"                               # use `smbd' from $PATH
@@ -27,13 +39,10 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      # extboot.bin isn't installed due to a bug in the Makefile.
-      cp pc-bios/optionrom/extboot.bin $out/share/qemu/
-
       # Libvirt expects us to be called `qemu-kvm'.  Otherwise it will
       # set the domain type to "qemu" rather than "kvm", which can
       # cause architecture selection to misbehave.
-      ln -s $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
+      ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
     '';
 
   meta = {

pkgs/top-level/all-packages.nix

@@ -5998,7 +5998,6 @@ let
   pwdutils = callPackage ../os-specific/linux/pwdutils { };
 
   qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
-  qemu_kvm_1_0 = callPackage ../os-specific/linux/qemu-kvm/1.0.nix { };
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };