Merge pull request #106669 from Mic92/lizardfs

lizardfs: 3.12.0 -> 3.13.0-rc3 (fixes build)

2 files changed, 8 insertions, 42 deletions

diff --git a/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch b/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
deleted file mode 100644
index 51ffa92652e3..000000000000
--- a/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-12-10 10:39:37.775694976 +0100
-+++ b/CMakeLists.txt	2020-12-10 10:40:41.984575938 +0100
-@@ -127,6 +127,7 @@
- add_definitions(-D__STDC_LIMIT_MACROS)
- add_definitions(-D__STDC_CONSTANT_MACROS)
- add_definitions(-D__STDC_FORMAT_MACROS)
-+add_definitions(-DSPDLOG_FMT_EXTERNAL)
- if(MINGW)
-   add_definitions(-DWINVER=0x0602)
-   add_definitions(-D_WIN32_WINNT=0x0602)
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index 13086c067b0a..e0bb39a6f0bc 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 , cmake
 , makeWrapper
-, python2
+, python3
 , db
 , fuse
 , asciidoc
@@ -17,50 +17,27 @@
 , pam
 , spdlog
 , fmt
+, systemdMinimal
 , zlib # optional
 }:
 
 stdenv.mkDerivation rec {
   pname = "lizardfs";
-  version = "3.12.0";
+  version = "3.13.0-rc3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax";
+    rev = version;
+    sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
   };
 
-  patches = [
-    # Use system-provided spdlog instead of downloading an old one (next two patches)
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/lizardfs/raw/d003c371/debian/patches/system-spdlog.patch";
-      sha256 = "1znpqqzb0k5bb7s4d7abfxzn5ry1khz8r76sb808c95cpkw91a9i";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch";
-      sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md";
-    })
-    # Fix https://github.com/lizardfs/lizardfs/issues/655
-    # (Remove upon update to 3.13)
-    (fetchpatch {
-      url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch";
-      sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv";
-    })
-    # Add SPDLOG_FMT_EXTERNAL flag to disable spdlog from using bundled fmt
-    # Would use https://github.com/lizardfs/lizardfs/commit/31b0cd40f84ee75f99643ad19122061e3d6fb6cc.patch
-    # if it didn't failed to patch
-    ./cmake-def-spdlog-fmt-external.patch
-  ];
-
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 
-  buildInputs =
-  [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
-    zlib boost judy pam spdlog fmt python2
+  buildInputs = [
+    db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
+    zlib boost judy pam spdlog fmt python3 systemdMinimal
   ];
-  
-  cmakeFlags = [ "-DSPDLOG_FMT_EXTERNAL=ON" ];
 
   meta = with stdenv.lib; {
     homepage = "https://lizardfs.com";