1 files changed, 31 insertions, 42 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 672464e89655..9fb597be72c5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -36,23 +36,23 @@ let
       };
     };
 
-    makeAufs3StandalonePatch =  {version, rev, sha256}:
+  makeAufs3StandalonePatch = {version, rev, sha256}:
 
-      stdenv.mkDerivation {
-        name = "aufs3-standalone-${version}.patch";
+    stdenv.mkDerivation {
+      name = "aufs3-standalone-${version}.patch";
 
-        src = fetchgit {
-          url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
-          inherit sha256 rev;
-        };
+      src = fetchgit {
+        url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git;
+        inherit sha256 rev;
+      };
 
-        phases = [ "unpackPhase" "installPhase" ];
+      phases = [ "unpackPhase" "installPhase" ];
 
-        #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
-        installPhase = ''
-          cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
-        '';
-      };
+      # Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4
+      installPhase = ''
+        cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out
+      '';
+    };
 
 in
 
@@ -297,12 +297,26 @@ rec {
   aufs3_0 = rec {
     name = "aufs3.0";
     version = "3.0";
-    utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155";
-    utilHash = "4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535";
+    utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
+    utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
     patch = makeAufs3StandalonePatch {
       inherit version;
-      rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
-      sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d";
+      rev = "517b27621cdfb793959acac849dae9888338526a";
+      sha256 = "8085200ac78d0c1e082d4c721a09f4a4c1d96ae86e307075836d09c3e7d502df";
+    };
+    features.aufsBase = true;
+    features.aufs3 = true;
+  };
+
+  aufs3_1 = rec {
+    name = "aufs3.1";
+    version = "3.1";
+    utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
+    utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
+    patch = makeAufs3StandalonePatch {
+      inherit version;
+      rev = "7386b57432ec5e73632a5375804239b02b6c00f0";
+      sha256 = "af4e9ad890e1b72d14170c97d8ead53291f09e275db600932724e6181530be2d";
     };
     features.aufsBase = true;
     features.aufs3 = true;
@@ -383,31 +397,6 @@ rec {
       patch = ./guruplug-mach-type.patch;
     };
 
-  tuxonice_2_6_34 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.34";
-    sha256 = "0bagqinmky1kmvg3vw8cdysqklxrsfjm7gqrpxviq9jq8vyycviz";
-  };
-
-  tuxonice_2_6_35 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.35";
-    sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q";
-  };
-
-  tuxonice_2_6_36 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.36";
-    sha256 = "1vcw3gpjdghnkli46j37pc6rp8mqk8dh688jv8rppzsry0ll7b7k";
-  };
-
-  tuxonice_2_6_37 = makeTuxonicePatch {
-    version = "3.2-rc2";
-    kernelVersion = "2.6.37";
-    url = "http://tuxonice.net/files/current-tuxonice-for-2.6.37.patch_0.bz2";
-    sha256 = "0acllabvbm9pmjnh0zx9mgnp47xbrl9ih6i037c85h0ymnjsxdhk";
-  };
-
   glibc_getline =
     {
       # Patch to work around conflicting types for the `getline' function