Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'

4 files changed, 55 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
index fc55352fa126..2e9bdff2aa38 100644
--- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bcachefs-tools";
-  version = "2019-02-09";
+  version = "2019-03-13";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "17c5215c1c542dd7b6b4f891a0da16d8c98e0591";
-    sha256 = "1zm2lnvijfmz483m2nhxz1rhk7ghgh0c450nyiwi6wa7lc1y3339";
+    rev = "0894d547501fb9306ae7b1c669b66a7b49fb2205";
+    sha256 = "1vwzwag413kzlij2f1hw1b8g592m40dr03zwkc8k5snbl4daiwr6";
   };
 
   enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
index 55edf97d17bc..57dc51e41115 100644
--- a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "bonnie++-1.97.3";
+  name = "bonnie++-1.98";
   src = fetchurl {
-    url = "https://fossies.org/linux/privat/${name}.tgz";
-    sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
+    url = "https://www.coker.com.au/bonnie++/${name}.tgz";
+    sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf";
   };
 
   enableParallelBuilding = true;
 
+  buildInputs = [ perl ];
+
   meta = {
     homepage = http://www.coker.com.au/bonnie++/;
     description = "Hard drive and file system benchmark suite";
diff --git a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
index 697256982bbf..15bb390e3648 100644
--- a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     ./fix-format-security-error.patch
   ];
 
+  postPatch = ''
+    substituteInPlace src/main.c --replace "attr/xattr.h" "sys/xattr.h"
+    substituteInPlace src/tools.c --replace "attr/xattr.h" "sys/xattr.h"
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp mhddfs $out/bin/
diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
new file mode 100644
index 000000000000..03966533e3a3
--- /dev/null
+++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchzip
+, fetchFromGitHub
+, makeWrapper
+, python
+, fuse
+, pkgconfig
+, libpcap
+, file
+, zlib 
+}:
+
+stdenv.mkDerivation rec {
+  pname = "moosefs";
+  version = "3.0.103";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0pqralv57ci4zwd75hz4pxmd4l9d4nib2mcsvrb6jndxqkaqcvns";
+  };
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs =
+    [ fuse libpcap zlib ];
+
+  postInstall = ''
+    wrapProgram $out/sbin/mfscgiserv \
+        --prefix PATH ":" "${python}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://moosefs.com;
+    description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.mfossen ];
+  };
+}