* Added AUFS, another Unionfs.

svn path=/nixpkgs/trunk/; revision=10387

pkgs/os-specific/linux/aufs/default.nix

@@ -0,0 +1,35 @@
+{stdenv, fetchurl, kernel}:
+
+stdenv.mkDerivation {
+  name = "aufs-20080128";
+  
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/aufs-20080128.tar.bz2;
+    sha256 = "0732zp6wfss09x9d6n0a3v65rifn739m9nffi5d3952vglg4va6l";
+  };
+
+  buildPhase = ''
+    mkdir kernelsrc
+    tar xvf ${kernel.src} -C kernelsrc
+  
+    kernelVersion=$(cd ${kernel}/lib/modules && ls)
+    substituteInPlace fs/aufs/Makefile --replace srctree srctree2
+    make KDIR=${kernel}/lib/modules/$kernelVersion/build srctree2=$(pwd)/kernelsrc/* -f local.mk
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp util/aulchown $out/bin
+
+    ensureDir $out/share/man/man5
+    cp util/aufs.5 $out/share/man/man5
+
+    ensureDir $out/lib/modules/$kernelVersion/misc
+    cp aufs.ko $out/lib/modules/$kernelVersion/misc
+  '';
+
+  meta = {
+    description = "Another Unionfs implementation for Linux";
+    homepage = http://aufs.sourceforge.net/;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -150,8 +150,7 @@ rec {
 
   # The same, another syntax.
   # Warning: syntax for configuration.nix changed too
-  useVersion = name: f: f
-  {
+  useVersion = name: f: f {
     version = getConfig [ "environment" "versions" name ];
   };
 
@@ -3276,10 +3275,14 @@ rec {
 
   atherosVersion = "r3122";
 
-  atherosFunCurrent = theKernel: (atherosFun {
+  atherosFunCurrent = kernel: atherosFun {
     version = atherosVersion;
-    kernel = theKernel;
-  } null);
+    inherit kernel;
+  } null;
+
+  aufs = import ../os-specific/linux/aufs {
+    inherit fetchurl stdenv kernel;
+  };
 
   bridge_utils = import ../os-specific/linux/bridge_utils {
     inherit fetchurl stdenv autoconf automake;