diff options
Diffstat (limited to 'pkgs/tools/filesystems/lizardfs/default.nix')
-rw-r--r-- | pkgs/tools/filesystems/lizardfs/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 7b6f2e17dcf5..ac20b735abc1 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -4,8 +4,9 @@ , makeWrapper , python , fuse -# The following are required for manpages -#, asciidoc, libxml2 +, asciidoc +, libxml2 +, libxslt , boost , pkgconfig , judy @@ -15,27 +16,25 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.9.4"; + version = "3.10.0"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; rev = "v.${version}"; - sha256 = "1vg33jy280apm4lp5dn3x51pkf7035ijqjm8wbmyha2g35gfjrlx"; + sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8"; }; - # Manpages don't build in the current release - buildInputs = [ cmake fuse /* asciidoc libxml2.bin */ zlib boost pkgconfig judy pam makeWrapper ]; + buildInputs = [ cmake fuse asciidoc libxml2 libxslt zlib boost pkgconfig judy pam makeWrapper ]; - # Fixed in upcoming 3.10.0 - patches = [ ./check-includes.patch ]; + patches = [ ./412.patch ]; postInstall = '' wrapProgram $out/sbin/lizardfs-cgiserver \ --prefix PATH ":" "${python}/bin" # mfssnapshot and mfscgiserv are deprecated - rm -f $out/bin/mfssnapshot $out/sbin/mfscgiserv + rm $out/bin/mfssnapshot $out/sbin/mfscgiserv ''; meta = with stdenv.lib; { |