unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#57311] [PATCH] gnu: Add snapper.
@ 2022-08-20 21:39 Nicolas Graves via Guix-patches via
  2023-02-10 16:43 ` Nicolas Graves via Guix-patches via
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2022-08-20 21:39 UTC (permalink / raw)
  To: 57311

* 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




^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#57311] [PATCH] gnu: Add snapper.
  2022-08-20 21:39 [bug#57311] [PATCH] gnu: Add snapper Nicolas Graves via Guix-patches via
@ 2023-02-10 16:43 ` Nicolas Graves via Guix-patches via
  2024-02-03 13:31 ` [bug#57311] [PATCH v2] " Nicolas Graves via Guix-patches via
  2024-02-16 21:06 ` [bug#57311] QA review for 57311 Hartmut Goebel
  2 siblings, 0 replies; 5+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2023-02-10 16:43 UTC (permalink / raw)
  To: 57311


Quick reminder for this forgotten patch ;) 

-- 
Best regards,
Nicolas Graves




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#57311] [PATCH v2] gnu: Add snapper.
  2022-08-20 21:39 [bug#57311] [PATCH] gnu: Add snapper Nicolas Graves via Guix-patches via
  2023-02-10 16:43 ` Nicolas Graves via Guix-patches via
@ 2024-02-03 13:31 ` Nicolas Graves via Guix-patches via
  2024-02-18 14:50   ` bug#57311: " Ludovic Courtès
  2024-02-16 21:06 ` [bug#57311] QA review for 57311 Hartmut Goebel
  2 siblings, 1 reply; 5+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-02-03 13:31 UTC (permalink / raw)
  To: 57311; +Cc: ngraves

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

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 4a0976ad84..be035c5ee1 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
@@ -82,6 +83,8 @@ (define-module (gnu packages file-systems)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages man)
+  #: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)
@@ -106,6 +109,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
@@ -1219,6 +1223,57 @@ (define-public apfs-fuse
       (home-page "https://github.com/sgan81/apfs-fuse")
       (license license:gpl2+))))
 
+(define-public snapper
+  (package
+    (name "snapper")
+    (version "0.10.7")
+    (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 "0nwmyzjwid1lf29dsr6w72dr781c81xyrjpk5y3scn4r55b5df0h"))
+       (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))
+    (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
+can create and compare snapshots, revert differences between them, and
+supports automatic snapshots timelines.")
+    (license license:gpl2)))
+
 (define-public xfstests
   ;; The last release (1.1.0) is from 2011.
   (let ((revision "3")
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#57311] QA review for 57311
  2022-08-20 21:39 [bug#57311] [PATCH] gnu: Add snapper Nicolas Graves via Guix-patches via
  2023-02-10 16:43 ` Nicolas Graves via Guix-patches via
  2024-02-03 13:31 ` [bug#57311] [PATCH v2] " Nicolas Graves via Guix-patches via
@ 2024-02-16 21:06 ` Hartmut Goebel
  2 siblings, 0 replies; 5+ messages in thread
From: Hartmut Goebel @ 2024-02-16 21:06 UTC (permalink / raw)
  To: control, 57311

user guix
usertag 57311 + reviewed-looks-good
thanks

Guix QA review form submission:
- If this is btrfs-only, the synobsis should mention btrfs.
- Please re-wrap the desription to not have an escaped newline. Start 
text jsut after opening quote.

Items marked as checked: Package builds, Commit messages, New package 
licenses, New package tests

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |





^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#57311: [PATCH v2] gnu: Add snapper.
  2024-02-03 13:31 ` [bug#57311] [PATCH v2] " Nicolas Graves via Guix-patches via
@ 2024-02-18 14:50   ` Ludovic Courtès
  0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2024-02-18 14:50 UTC (permalink / raw)
  To: Nicolas Graves; +Cc: Hartmut Goebel, 57311-done

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

Hi Nicolas,

Nicolas Graves <ngraves@ngraves.fr> skribis:

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

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

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 2989 bytes --]

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-02-18 14:53 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-20 21:39 [bug#57311] [PATCH] gnu: Add snapper Nicolas Graves via Guix-patches via
2023-02-10 16:43 ` Nicolas Graves via Guix-patches via
2024-02-03 13:31 ` [bug#57311] [PATCH v2] " Nicolas Graves via Guix-patches via
2024-02-18 14:50   ` bug#57311: " Ludovic Courtès
2024-02-16 21:06 ` [bug#57311] QA review for 57311 Hartmut Goebel

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).