Subject: Re: [bug#57311] [PATCH v2] gnu: Add snapper.

From: Ludovic Courtès <[email-masked]>
Date: Sun, 18 Feb 2024 15:50:35 +0100

Hi Nicolas,

Nicolas Graves <[email-masked]> skribis:

> * gnu/packages/file-systems.scm (snapper): New variable.

Applied with the changes below, most of which suggested by Hartmut.

Thanks!

Ludo’.

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index f1035ac86a..40f1383a56 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1250,28 +1250,41 @@ (define-public snapper
              (("zypp-plugin") ""))))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'relative-file-locations
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out")))
-               (substitute* (list "scripts/Makefile.am" "data/Makefile.am")
-                 (("/usr/share") (string-append out "/share"))
-                 (("/usr/lib") (string-append out "/lib"))
-                 (("/etc/") (string-append out "/etc/"))))
-               (substitute* "client/Makefile.am"
-                 (("/usr/lib") "@libdir@")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'relative-file-locations
+                          (lambda* (#:key outputs #:allow-other-keys)
+                            (let* ((out (assoc-ref outputs "out")))
+                              (substitute* (list "scripts/Makefile.am"
+                                                 "data/Makefile.am")
+                                (("/usr/share")
+                                 (string-append out "/share"))
+                                (("/usr/lib")
+                                 (string-append out "/lib"))
+                                (("/etc/")
+                                 (string-append out "/etc/"))))
+                            (substitute* "client/Makefile.am"
+                              (("/usr/lib")
+                               "@libdir@")))))))
     (home-page "https://snapper.io")
     (native-inputs
      (list glibc-locales autoconf automake libtool pkg-config))
     (inputs
-     (list btrfs-progs e2fsprogs `(,util-linux "lib") linux-pam
-           dbus libxml2 json-c acl boost ncurses/tinfo
-           libxslt docbook-xsl gettext-minimal))
-    (synopsis "Manage filesystem snapshots and allow roll-backs")
-    (description "\
-This package provides Snapper, a tool that helps with managing
-snapshots of Btrfs subvolumes and thin-provisioned LVM volumes.  It
+     (list btrfs-progs
+           e2fsprogs
+           `(,util-linux "lib")
+           linux-pam
+           dbus
+           libxml2
+           json-c
+           acl
+           boost
+           ncurses/tinfo
+           libxslt
+           docbook-xsl
+           gettext-minimal))
+    (synopsis "Manage Btrfs file system snapshots and allow roll-backs")
+    (description "This package provides Snapper, a tool that helps with
+managing snapshots of Btrfs subvolumes and thin-provisioned LVM volumes.  It
 can create and compare snapshots, revert differences between them, and
 supports automatic snapshots timelines.")
     (license license:gpl2)))