Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

1 files changed, 10 insertions, 26 deletions

diff --git a/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
index e2cb603ca3d5..e0bb39a6f0bc 100644
--- a/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/lizardfs/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 , cmake
 , makeWrapper
-, python2
+, python3
 , db
 , fuse
 , asciidoc
@@ -16,43 +16,27 @@
 , judy
 , 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=";
   };
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 
-  buildInputs =
-    [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
-      zlib boost judy pam spdlog python2
-    ];
-
-  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";
-    })
+  buildInputs = [
+    db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
+    zlib boost judy pam spdlog fmt python3 systemdMinimal
   ];
 
   meta = with stdenv.lib; {
@@ -60,6 +44,6 @@ stdenv.mkDerivation rec {
     description = "A highly reliable, scalable and efficient distributed file system";
     platforms = platforms.linux;
     license = licenses.gpl3;
-    maintainers = [ maintainers.rushmorem ];
+    maintainers = with maintainers; [ rushmorem shamilton ];
   };
 }