summary refs log tree commit diff
path: root/gnu/packages/file-systems.scm
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2020-10-03 12:15:19 +0200
committerLudovic Courtès <ludo@gnu.org>2020-10-05 10:42:00 +0200
commitf13849a54f5ad4b0f7dbdf11f48eb60109c78cf6 (patch)
tree5c5e316b10a25319983c556601820e100467ab6d /gnu/packages/file-systems.scm
parent203cf9d673c3bf12b3efe2cb7006a477301c73a8 (diff)
downloadguix-f13849a54f5ad4b0f7dbdf11f48eb60109c78cf6.tar.gz
gnu: mergerfs: Update to 2.31.0.
* gnu/packages/file-systems.scm (mergerfs) [version]: Update to 2.31.0.
[arguments]: Adjust Makefile substitutions.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/file-systems.scm')
-rw-r--r--gnu/packages/file-systems.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 0d897a6307..f021e81612 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -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)))