Merge master into staging-next

pkgs/tools/filesystems/bonnie/default.nix

@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.coker.com.au/bonnie++/";
     description = "Hard drive and file system benchmark suite";
     license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

pkgs/tools/filesystems/dosfstools/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
     homepage = "https://github.com/dosfstools/dosfstools";
-    platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     license = lib.licenses.gpl3;
   };
 }