Merging from trunk. I resolved some conflicts; I hope that well.

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

pkgs/tools/filesystems/mtools/default.nix

@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, texinfo }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.13";
+  name = "mtools-4.0.15";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1nj7lc2q1g66l3ma8z1c95nglf9himnr6k85b5rry99f9za7npbg";
+    sha256 = "169qjy3fmmhxiy0jljh84jvjh8mh1p8gglwqgjhq7hbw235fy399";
   };
 
-  buildInputs = [ texinfo ];
+  doCheck = true;
 
   meta = {
     homepage = http://www.gnu.org/software/mtools/;
-    description = "Utilities to access MS-DOS disks without mounting them";
+    description = "GNU mtools, utilities to access MS-DOS disks";
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/tools/filesystems/sshfs-fuse/default.nix

@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     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;
   };
 }