lizardfs: 3.9.4 -> 3.10.0

3 files changed, 51 insertions, 39 deletions

diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch
new file mode 100644
index 00000000000..a2890cad399
--- /dev/null
+++ b/pkgs/tools/filesystems/lizardfs/412.patch
@@ -0,0 +1,43 @@
+From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001
+From: Maksymilian Paszkiewicz <mpaszkiewicz@skytechnology.pl>
+Date: Mon, 23 May 2016 12:25:19 +0200
+Subject: [PATCH] common: Fix minor compile and copyright issues
+
+This commit adds include <cmath> directive to
+slice_read_planner.cc and fixes copyright
+statement in filesystem_operations.cc
+
+Closes #411
+Closes #412
+
+Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68
+---
+ src/common/slice_read_planner.cc    | 2 ++
+ src/master/filesystem_operations.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc
+index 94c106c..d0284f1 100644
+--- a/src/common/slice_read_planner.cc
++++ b/src/common/slice_read_planner.cc
+@@ -20,6 +20,8 @@
+ 
+ #include "common/slice_read_planner.h"
+ 
++#include <cmath>
++
+ /*!
+  * Prepares read planner for serving selected parts of a slice type.
+  * Firstly, function checks if:
+diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc
+index 69ff270..dc30b1f 100644
+--- a/src/master/filesystem_operations.cc
++++ b/src/master/filesystem_operations.cc
+@@ -1,5 +1,6 @@
+ /*
+-   Copyright 2013-2015 Skytechnology sp. z o.o..
++   Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare,
++   2013-2016 Skytechnology sp. z o.o..
+ 
+    This file is part of LizardFS.
+ 
diff --git a/pkgs/tools/filesystems/lizardfs/check-includes.patch b/pkgs/tools/filesystems/lizardfs/check-includes.patch
deleted file mode 100644
index 49aa0375762..00000000000
--- a/pkgs/tools/filesystems/lizardfs/check-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 60f64d7077ebd2b29b18faa3b25ee593e126e347 Mon Sep 17 00:00:00 2001
-From: Dmitry Smirnov <onlyjob@member.fsf.org>
-Date: Sun, 20 Dec 2015 14:03:20 +1100
-Subject: [PATCH] build: Fix FTBFS with CMake-3.4
-
-Closes: #363
-
-~~~~
- CMake Error at CheckIncludes.cmake:4 (check_include_files):
-   Unknown CMake command "check_include_files".
- Call Stack (most recent call first):
-   CMakeLists.txt:113 (check_includes)
-~~~~
-
-Change-Id: I70f03d829c40ae560083a98c2bcf6344dbac3ad6
-Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
----
- CheckIncludes.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CheckIncludes.cmake b/CheckIncludes.cmake
-index 19ed485..f51075a 100644
---- a/CheckIncludes.cmake
-+++ b/CheckIncludes.cmake
-@@ -1,3 +1,5 @@
-+include(CheckIncludeFiles)
-+
- function(check_includes INCLUDES)
-   set(INCLUDE_MISSING FALSE)
-   foreach(INCLUDE_FILE ${INCLUDES})
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index 7b6f2e17dcf..ac20b735abc 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; {