From 5a45d6423f7cf801cd6ad07f30e39513e3c31e07 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 3 Oct 2020 12:15:19 +0200
Subject: [PATCH 1/2] gnu: mergerfs: Update to 2.31.0.
* gnu/packages/file-systems.scm (mergerfs) [version]: Update to 2.31.0.
[arguments]: Adjust Makefile substitutions.
---
gnu/packages/file-systems.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
@@ -768,7 +768,7 @@ community.")
(define-public mergerfs
(package
(name "mergerfs")
- (version "2.29.0")
+ (version "2.31.0")
(source
(origin
(method url-fetch)
@@ -776,7 +776,7 @@ community.")
version "/mergerfs-" version ".tar.gz"))
(sha256
(base32
- "17gizw4vgbqqjd2ykkfpp276942jb5qclp0lkiwkmq1yjgyjqfmk"))))
+ "0k4asbg5n9dhy5jpjkw6simqqnr1zira2y4i71cq05091dfwm90p"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests exist.
@@ -797,8 +797,9 @@ community.")
;; The Makefile does not allow overriding PREFIX via make variables.
(substitute* '("Makefile" "libfuse/Makefile")
(("= /usr/local") (string-append "= " (assoc-ref outputs "out")))
+ (("= /sbin") "= $(EXEC_PREFIX)/sbin")
;; cannot chown as build user
- (("chown root:root") "true"))
+ (("chown root(:root)?") "true"))
#t)))))
;; mergerfs bundles a heavily modified copy of libfuse.
(inputs `(("util-linux" ,util-linux)))
--
2.26.2