Merge pull request #26929 from jfrankenau/mergerfs-2.22.1

mergerfs: 2.16.1 -> 2.22.1

Changed files
+8 -5
lib
pkgs
tools
filesystems
mergerfs
+1
lib/maintainers.nix
···
jensbin = "Jens Binkert <jensbin@protonmail.com>";
jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
jfb = "James Felix Black <james@yamtime.com>";
jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
jgertm = "Tim Jaeger <jger.tm@gmail.com>";
jgillich = "Jakob Gillich <jakob@gillich.me>";
···
jensbin = "Jens Binkert <jensbin@protonmail.com>";
jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
jfb = "James Felix Black <james@yamtime.com>";
+
jfrankenau = "Johannes Frankenau <johannes@frankenau.net>";
jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
jgertm = "Tim Jaeger <jger.tm@gmail.com>";
jgillich = "Jakob Gillich <jakob@gillich.me>";
+7 -5
pkgs/tools/filesystems/mergerfs/default.nix
···
-
{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }:
stdenv.mkDerivation rec {
name = "mergerfs-${version}";
-
version = "2.16.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";
deepClone = true;
};
-
buildInputs = [ fuse pkgconfig which attr pandoc git ];
makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
···
homepage = https://github.com/trapexit/mergerfs;
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux;
-
maintainers = with stdenv.lib.maintainers; [ makefu ];
};
}
···
+
{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }:
stdenv.mkDerivation rec {
name = "mergerfs-${version}";
+
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 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00";
deepClone = true;
+
leaveDotGit = true;
};
+
nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ];
+
buildInputs = [ attr libiconv ];
makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
···
homepage = https://github.com/trapexit/mergerfs;
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.linux;
+
maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];
};
}