* KVM 72, plus stable 2.6.26 kernel headers (needed for KVM).

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

4 files changed, 8 insertions, 52 deletions

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.26-rc5.nix b/pkgs/os-specific/linux/kernel-headers/2.6.26.2.nix
index 870b9a4c44c38..1226754e1fbe1 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.26-rc5.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.26.2.nix
@@ -3,13 +3,13 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.26-pre-rc5";
+  name = "linux-headers-2.6.26.2";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/testing/linux-2.6.26-rc5.tar.bz2";
-    sha256 = "0mxhxiivm2dyca2shxnr3689x8f3l2vlmqdl80fm6lmq1b3j7k75";
+    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.26.2.tar.bz2";
+    sha256 = "0xrkv6wk5l4qhza35a76cd00a7g9xv3ymw7znwskig2kmqswnp1m";
   };
 
   platform = 
diff --git a/pkgs/os-specific/linux/kvm/70.nix b/pkgs/os-specific/linux/kvm/70.nix
deleted file mode 100644
index ae7a1823596b7..0000000000000
--- a/pkgs/os-specific/linux/kvm/70.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation {
-  name = "kvm-70";
-   
-  src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-70.tar.gz;
-    sha256 = "16953f6z9f8hlvpmikwwn1n9k96zywq2wfj36xighwqkbvbdrlx0";
-  };
-
-  patches = [
-    # Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
-    ./smbd-path.patch
-    # The makefile copies stuff from the kernel directory and then
-    # tries to modify the copy, but it must be made writable first.
-    ./readonly-kernel.patch
-  ];
-
-  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
-
-  # e2fsprogs is needed for libuuid.
-  # rsync is a weird dependency used for copying kernel header files.
-  buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync];
-
-  preConfigure = ''
-    for i in configure user/configure; do
-      substituteInPlace $i --replace /bin/bash $shell
-    done
-    substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
-  '';
-
-  meta = {
-    homepage = http://kvm.qumranet.com/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-  };
-}
diff --git a/pkgs/os-specific/linux/kvm/69.nix b/pkgs/os-specific/linux/kvm/72.nix
index b8a6989458796..324bc24fc430e 100644
--- a/pkgs/os-specific/linux/kvm/69.nix
+++ b/pkgs/os-specific/linux/kvm/72.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
    
 stdenv.mkDerivation {
-  name = "kvm-69";
+  name = "kvm-72";
    
   src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-69.tar.gz;
-    sha256 = "05zkzw81lk5ap99vi0jqs6lyp13gapyi1046zgjmjm19q4xzsjz4";
+    url = mirror://sourceforge/kvm/kvm-72.tar.gz;
+    sha256 = "1f28nbb7bkyq0h3a9ph4aha5qibs2p1ll61ydcf95c71blqdfh2h";
   };
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf683fc5c2003..2059a7c1ff3b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4900,7 +4900,7 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26-rc5.nix {
+  kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix {
     inherit fetchurl stdenv;
   };
 
@@ -5295,13 +5295,7 @@ let pkgs = rec {
     kernelHeaders = kernelHeaders_2_6_23;
   };
 
-  kvm69 = import ../os-specific/linux/kvm/69.nix {
-    inherit fetchurl zlib e2fsprogs SDL alsaLib pkgconfig rsync;
-    stdenv = overrideGCC stdenv gcc34;
-    kernelHeaders = kernelHeaders_2_6_26;
-  };
-
-  kvm70 = import ../os-specific/linux/kvm/70.nix {
+  kvm72 = import ../os-specific/linux/kvm/72.nix {
     inherit fetchurl zlib e2fsprogs SDL alsaLib pkgconfig rsync;
     stdenv = overrideGCC stdenv gcc34;
     kernelHeaders = kernelHeaders_2_6_26;