Merge remote-tracking branch 'master' into staging.

3 files changed, 22 insertions, 3 deletions

diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix
index 7f7d956afd2..acb992b24ad 100644
--- a/pkgs/tools/filesystems/genext2fs/default.nix
+++ b/pkgs/tools/filesystems/genext2fs/default.nix
@@ -8,8 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://genext2fs.sourceforge.net/;
     description = "A tool to generate ext2 filesystem images without requiring root privileges";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
new file mode 100644
index 00000000000..4c509444b74
--- /dev/null
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
+
+stdenv.mkDerivation {
+  name = "sshfs-fuse-1.78";
+  src = fetchurl {
+    url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz;
+    sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n";
+  };
+  preConfigure = "./autogen.sh";
+  buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ];
+  
+  meta = {
+    description = "Mount an S3 bucket as filesystem through FUSE";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index 0f7b5c4a770..4761980a18d 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "tmsu-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   go-sqlite3 = fetchgit {
     url = "git://github.com/mattn/go-sqlite3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "oniony";
     repo = "tmsu";
     rev = "v${version}";
-    sha256 = "1as8whsk3dq9nkn4czc8q73nvlab343mdvm1sjllrnfkmz0s4cab";
+    sha256 = "1fr80p5c3hd3956gn7ri5pv3gblaxw95xkpf6wz1llkmrr2i8ncp";
   };
 
   buildInputs = [ go fuse ];