Updating from trunk. I resolved simple conflicts.

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

pkgs/tools/filesystems/e2fsprogs/default.nix

@@ -1,14 +1,14 @@
-{stdenv, fetchurl, pkgconfig, libuuid}:
+{ stdenv, fetchurl, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.41.9";
+  name = "e2fsprogs-1.41.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1s365fpv5w5m8n6n5fnn6q003whr1clr22xn25wkssx1c51f7wfb";
+    sha256 = "084zpg4ma6g4y4plz7alfqc1q78jss8lfmpk4w7zvnmz43fd09lw";
   };
 
-  buildInputs = [pkgconfig libuuid];
+  buildInputs = [ pkgconfig libuuid ];
 
   crossAttrs = {
     preConfigure = ''

pkgs/tools/filesystems/encfs/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, openssl, fuse, boost, rlog }:
+
+stdenv.mkDerivation {
+  name = "encfs-1.6.1";
+
+  src = fetchurl {
+    url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz";
+    sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw";
+  };
+
+  buildInputs = [ boost fuse openssl rlog ];
+
+  configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem";
+
+  meta = {
+    homepage = http://www.arg0.net/encfs;
+    description = "EncFS provides an encrypted filesystem in user-space via FUSE";
+  };
+}