diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 03785e791ba7..c5985b121047 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -247,6 +247,7 @@ jensbin = "Jens Binkert "; jerith666 = "Matt McHenry "; jfb = "James Felix Black "; + jfrankenau = "Johannes Frankenau "; jgeerds = "Jascha Geerds "; jgertm = "Tim Jaeger "; jgillich = "Jakob Gillich "; 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 ]; }; }