about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJohannes Frankenau <johannes@frankenau.net>2017-06-28 14:32:13 +0200
committerJohannes Frankenau <johannes@frankenau.net>2017-06-29 02:54:48 +0200
commit8461e31dc95f8092d4645021e049f0d164e008f4 (patch)
tree5a516c630fd29b9a1d53c50a9e2ab6a4285aca46 /pkgs/tools
parent32e492251b2e4358a459d20ac4e8fdbc5841f112 (diff)
downloadnixlib-8461e31dc95f8092d4645021e049f0d164e008f4.tar
nixlib-8461e31dc95f8092d4645021e049f0d164e008f4.tar.gz
nixlib-8461e31dc95f8092d4645021e049f0d164e008f4.tar.bz2
nixlib-8461e31dc95f8092d4645021e049f0d164e008f4.tar.lz
nixlib-8461e31dc95f8092d4645021e049f0d164e008f4.tar.xz
nixlib-8461e31dc95f8092d4645021e049f0d164e008f4.tar.zst
nixlib-8461e31dc95f8092d4645021e049f0d164e008f4.zip
mergerfs: 2.16.1 -> 2.22.1
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/mergerfs/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 81f82108995d..0259af7a63ec 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }:
+{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "mergerfs-${version}";
-  version = "2.16.1";
+  version = "2.22.1";
 
   # not using fetchFromGitHub because of changelog being built with git log
   src = fetchgit {
     url = "https://github.com/trapexit/mergerfs";
     rev = "refs/tags/${version}";
-    sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf";
+    sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00";
     deepClone = true;
+    leaveDotGit = true;
   };
 
-  buildInputs = [ fuse pkgconfig which attr pandoc git ];
+  nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ];
+  buildInputs = [ attr libiconv ];
 
   makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
 
@@ -21,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/trapexit/mergerfs;
     license = stdenv.lib.licenses.isc;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ makefu ];
+    maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];
   };
 }