public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26929 from jfrankenau/mergerfs-2.22.1

Browse Source 
mergerfs: 2.16.1 -> 2.22.1
This commit is contained in:
Jörg Thalheim 2017-06-29 08:34:44 +01:00 committed by GitHub
commit d0a6e05b9a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -248,6 +248,7 @@
jensbin = "Jens Binkert <jensbin@protonmail.com>"; jensbin = "Jens Binkert <jensbin@protonmail.com>";
jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>"; jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
jfb = "James Felix Black <james@yamtime.com>"; jfb = "James Felix Black <james@yamtime.com>";
jfrankenau = "Johannes Frankenau <johannes@frankenau.net>";
jgeerds = "Jascha Geerds <jascha@jgeerds.name>"; jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
jgertm = "Tim Jaeger <jger.tm@gmail.com>"; jgertm = "Tim Jaeger <jger.tm@gmail.com>";
jgillich = "Jakob Gillich <jakob@gillich.me>"; jgillich = "Jakob Gillich <jakob@gillich.me>";

12
pkgs/tools/filesystems/mergerfs/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "mergerfs-${version}"; name = "mergerfs-${version}";
version = "2.16.1"; version = "2.22.1";
# not using fetchFromGitHub because of changelog being built with git log # not using fetchFromGitHub because of changelog being built with git log
src = fetchgit { src = fetchgit {
url = "https://github.com/trapexit/mergerfs"; url = "https://github.com/trapexit/mergerfs";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf"; sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00";
deepClone = true; 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" ]; makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
@ -21,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/trapexit/mergerfs; homepage = https://github.com/trapexit/mergerfs;
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ]; maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];
}; };
} }