Merge branch 'master.upstream' into staging.upstream

2015-06-17 11:57:40 -07:00
parent e4316b8c17 d4fc2b4d99
commit 8e19ac8d7c
139 changed files with 2778 additions and 1524 deletions
@@ -17,6 +17,7 @@ stdenv.mkDerivation {
    description = "A FUSE filesystem for MTP devices like Android phones";
    homepage = https://github.com/JasonFerrara/jmtpfs;
    license = licenses.gpl3;
+    platforms = platforms.linux;
    maintainers = [ maintainers.coconnor ];
  };
 }