Updating from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
parent 659a9a835a 15083226fd
commit 70dd97620c
25 changed files with 784 additions and 484 deletions
--- a/pkgs/os-specific/linux/kernel/config-blocks.nix
+++ b/pkgs/os-specific/linux/kernel/config-blocks.nix
@@ -32,7 +32,7 @@ rec {

      noPAE = ''
        HIGHMEM64G? n
-        PAE n
+        PAE? n
      '';

      usefulSubsystems = ''
--- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
@@ -19,6 +19,7 @@ import ../kernel/generic.nix (

    kernelPatches = [
      {
+         name = "zen4"; 
         patch = runCommand "2.6.32-zen4.patch" {} "${xz}/bin/lzma -d < ${ fetchurl {
 	   name = "2.6.32-zen4";
           url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma";