summary refs log tree commit diff
path: root/pkgs/tools/filesystems/mergerfs
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2019-05-16 19:28:58 +0200
committerGitHub <noreply@github.com>2019-05-16 19:28:58 +0200
commit927da26d344fbc94f7f516b687706d9f970416f1 (patch)
tree6c4d2fbc9524cadfdabd739a4b607b29999a646c /pkgs/tools/filesystems/mergerfs
parent3561ede7f6628385f2c66ef0be815d76ed92f7cd (diff)
downloadnixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.tar
nixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.tar.gz
nixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.tar.bz2
nixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.tar.lz
nixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.tar.xz
nixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.tar.zst
nixpkgs-927da26d344fbc94f7f516b687706d9f970416f1.zip
mergerfs: 2.26.0 -> 2.26.1
Changes:
https://github.com/trapexit/mergerfs/releases/tag/2.26.1
Diffstat (limited to 'pkgs/tools/filesystems/mergerfs')
-rw-r--r--pkgs/tools/filesystems/mergerfs/default.nix21
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index a0981de42b0..4d28869d160 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "mergerfs-${version}";
-  version = "2.26.0";
+  pname = "mergerfs";
+  version = "2.26.1";
 
   src = fetchFromGitHub {
     owner = "trapexit";
-    repo = "mergerfs";
+    repo = pname;
     rev = version;
-    sha256 = "1arq09rn1lmvv7gj3ymwdiygm620zdcx1jh2qpa1dxrdg8xrwqa9";
+    sha256 = "16dgm2n36n6k7s1nzprzsv5bdckk0x2s08qpcvc42ny6jbivpjn3";
   };
 
   nativeBuildInputs = [
@@ -17,21 +17,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ attr libiconv ];
 
   preConfigure = ''
-    cat > src/version.hpp <<EOF
-    #pragma once
-    static const char MERGERFS_VERSION[] = "${version}";
-    EOF
+    echo "${version}" > VERSION
   '';
 
-  makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ];
+  enableParallelBuilding = true;
 
   postFixup = ''
-    ln -s $out/bin/mergerfs $out/bin/mount.fuse.mergerfs
+    ln -srf $out/bin/mergerfs $out/bin/mount.fuse.mergerfs
+    ln -srf $out/bin/mergerfs $out/bin/mount.mergerfs
   '';
 
   meta = {
     description = "A FUSE based union filesystem";
-    homepage = https://github.com/trapexit/mergerfs;
+    homepage = "https://github.com/trapexit/mergerfs";
     license = stdenv.lib.licenses.isc;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];