Merge branch 'master.upstream' into staging.upstream

2015-06-22 10:57:36 -07:00
parent ad779acd3b 22172b8e43
commit 282d03befa
114 changed files with 1394 additions and 412 deletions
@@ -14,9 +14,10 @@ stdenv.mkDerivation rec {
    ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
  '';

-  meta = {
+  meta = with stdenv.lib; {
    homepage = http://fuse.sourceforge.net/sshfs.html;
    description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
  };
 }