summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2007-10-31 16:23:53 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2007-10-31 16:23:53 +0000
commit58873a9e3db52a7da81685f098bb40a150f7376d (patch)
tree05ca24553c967c8b1b2a8b55f3dc841c6bdafdbf /pkgs/top-level/all-packages.nix
parent2be68dea281f212207ca329e57845a2b0f032f75 (diff)
downloadnixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.tar
nixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.tar.gz
nixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.tar.bz2
nixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.tar.lz
nixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.tar.xz
nixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.tar.zst
nixpkgs-58873a9e3db52a7da81685f098bb40a150f7376d.zip
* Latest KVM.
svn path=/nixpkgs/trunk/; revision=9566
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa39c8f260d..dfb7a0e3218 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2813,6 +2813,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.1.nix {
+    inherit fetchurl stdenv;
+  };
+
   kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "arm-linux";
@@ -2992,7 +2996,7 @@ rec {
 	kernel = systemKernel;
   };
 
-  kvm = kvm12;
+  kvm = kvm49;
 
   kvm12 = import ../os-specific/linux/kvm/12.nix {
     inherit fetchurl zlib e2fsprogs SDL alsaLib;
@@ -3006,6 +3010,12 @@ rec {
     kernelHeaders = kernelHeaders_2_6_21;
   };
 
+  kvm49 = import ../os-specific/linux/kvm/49.nix {
+    inherit fetchurl zlib e2fsprogs SDL alsaLib;
+    stdenv = overrideGCC stdenv gcc34;
+    kernelHeaders = kernelHeaders_2_6_23;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv;
   };