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

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 18 Feb 2024 14:54:02 +0000

Your bug report

#57311: [PATCH] gnu: Add snapper.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
57311: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57311
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#57311] [PATCH v2] gnu: Add snapper.
From: Ludovic Courtès <[email-masked]>
To: Nicolas Graves <[email-masked]>
Cc: Hartmut Goebel <[email-masked]>, [email-masked]
Date: Sun, 18 Feb 2024 15:50:35 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

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)))

Subject: [PATCH] gnu: Add snapper.
From: Nicolas Graves <[email-masked]>
To: [email-masked]
Date: Sat, 20 Aug 2022 23:39:13 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/file-systems.scm (snapper): New variable.
---
 gnu/packages/file-systems.scm | 66 +++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index d326b9cc3d..41f03f686f 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crypto)
@@ -59,6 +60,7 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
@@ -66,6 +68,8 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nfs)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages openldap)
@@ -85,6 +89,7 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xml))

 (define-public autofs
@@ -1539,6 +1544,67 @@ (define-public python-dropbox
 Dropbox API v2.")
     (license license:expat)))

+(define-public snapper
+  (package
+    (name "snapper")
+    (version "0.10.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openSUSE/snapper")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0x9anracaa19yqkc0x8wangrkdrx01kdy07c55lvlqrjyimfm4ih"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (delete-file-recursively "dists")
+           (delete-file-recursively "zypp-plugin")
+           (substitute* '("configure.ac" "doc/Makefile.am")
+             ((".*dists.*") "")
+             ((".*zypp-plugin.*") ""))
+           (substitute* "Makefile.am"
+             (("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@")))))))
+    (home-page "https://snapper.io")
+    (native-inputs
+     (list glibc-locales autoconf automake libtool pkg-config dbus))
+    (inputs
+    `(("btrfs" ,btrfs-progs)
+      ("e2fs" ,e2fsprogs)
+      ("libmount" ,util-linux "lib")
+      ("dbus" ,dbus)
+      ("libxml" ,libxml2)
+      ("json-c" ,json-c)
+      ("libacl" ,acl)
+      ("boost" ,boost)
+      ("libxslt" ,libxslt)
+      ("docbook-xsl" ,docbook-xsl)
+      ("gettext" ,gettext-minimal)
+      ("pam" ,linux-pam)
+      ("ncurses" ,ncurses/tinfo)))
+    (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
+can create and compare snapshots, revert differences between them, and
+supports automatic snapshots timelines.")
+    (license license:gpl2)))
+
 (define-public dbxfs
   (package
     (name "dbxfs")
--
2.37.2

-- 
Best regards,
Nicolas Graves