Updating from trunk. I only had to take away the usual stdenv2 in

all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553

1 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 327b16bd202..cdaa9da57d9 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -204,20 +204,25 @@ in
     };
 
   guruplug_defconfig =
-    {
-      # Default configuration for the GuruPlug.  From
+    { # Default configuration for the GuruPlug.  From
       # <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
       name = "guruplug-defconfig";
       patch = ./guruplug-defconfig.patch;
     };
 
   guruplug_arch_number =
-    {
-      # Hack to match the `arch_number' of the U-Boot that ships with the
+    { # Hack to match the `arch_number' of the U-Boot that ships with the
       # GuruPlug.  This is only needed when using this specific U-Boot
       # binary.  See
       # <http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
       name = "guruplug-arch-number";
       patch = ./guruplug-mach-type.patch;
     };
+
+  xen_pvclock_resume =
+    { # Fix the clock after a DomU restore following a Dom0 reboot or migration.
+      name = "xen-pvclock-resume";
+      patch = ./xen-pvclock-resume.patch;
+    };
+  
 }