* Sync with the trunk.

svn path=/nixpkgs/branches/modular-python/; revision=26678
2011-04-04 13:36:05 +00:00
parent f1c1bd7bbf 4eab75bb92
commit f99c0dd302
64 changed files with 2068 additions and 169 deletions
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -209,6 +209,7 @@ in
      name = "aufs2.1";
      patch = ./aufs2.1-37.patch;
      features.aufsBase = true;
+      features.aufs2_1 = true;
    };

  # Increase the timeout on CIFS requests from 15 to 120 seconds to