From patchwork Sat Aug 20 21:39:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41787 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 36F2D27BBEA; Sat, 20 Aug 2022 22:40:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9141927BBE9 for ; Sat, 20 Aug 2022 22:40:30 +0100 (BST) Received: from localhost ([::1]:43862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oPWCj-0004fH-OX for patchwork@mira.cbaines.net; Sat, 20 Aug 2022 17:40:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oPWCY-0004dy-AG for guix-patches@gnu.org; Sat, 20 Aug 2022 17:40:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oPWCJ-0001MT-10 for guix-patches@gnu.org; Sat, 20 Aug 2022 17:40:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oPWCI-0003ZX-HK for guix-patches@gnu.org; Sat, 20 Aug 2022 17:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57311] [PATCH] gnu: Add snapper. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Aug 2022 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57311@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166103158413700 (code B ref -1); Sat, 20 Aug 2022 21:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Aug 2022 21:39:44 +0000 Received: from localhost ([127.0.0.1]:33563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPWBz-0003Yu-VE for submit@debbugs.gnu.org; Sat, 20 Aug 2022 17:39:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:59704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPWBu-0003Yj-Ox for submit@debbugs.gnu.org; Sat, 20 Aug 2022 17:39:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oPWBt-0004XW-GG for guix-patches@gnu.org; Sat, 20 Aug 2022 17:39:38 -0400 Received: from 14.mo550.mail-out.ovh.net ([178.32.97.215]:54561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oPWBm-0001Kh-Td for guix-patches@gnu.org; Sat, 20 Aug 2022 17:39:37 -0400 Received: from player755.ha.ovh.net (unknown [10.109.143.183]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 59FFD20A52 for ; Sat, 20 Aug 2022 21:39:16 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player755.ha.ovh.net (Postfix) with ESMTPSA id 9C7B92DC57586 for ; Sat, 20 Aug 2022 21:39:14 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0067e61d223-006d-4a99-a2e6-360f0d839db9, E8D669522EBF9563DD73AFA6039B8208903F1EF4) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 Date: Sat, 20 Aug 2022 23:39:13 +0200 Message-ID: <8735dqmw72.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6089992597305025274 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdeigedgtdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeelvddtvdeivefgfefgheejvdehkeejhedtfeegfeetvefgueelhfdvleehueehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpshhnrghpphgvrhdrihhonecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejheehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedt Received-SPF: pass client-ip=178.32.97.215; envelope-from=ngraves@ngraves.fr; helo=14.mo550.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * gnu/packages/file-systems.scm (snapper): New variable. --- gnu/packages/file-systems.scm | 66 +++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) -- 2.37.2 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")