From patchwork Sat Feb 3 13:31:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 59705 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 A07B127BBEB; Sat, 3 Feb 2024 13:33:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 9F1FC27BBE9 for ; Sat, 3 Feb 2024 13:33:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWG8a-0005Xj-9z; Sat, 03 Feb 2024 08:32:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rWG8Y-0005XI-Na for guix-patches@gnu.org; Sat, 03 Feb 2024 08:32:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rWG8Y-00022D-F0 for guix-patches@gnu.org; Sat, 03 Feb 2024 08:32:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWG8j-0005XW-Kk for guix-patches@gnu.org; Sat, 03 Feb 2024 08:33:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57311] [PATCH v2] gnu: Add snapper. References: <8735dqmw72.fsf@ngraves.fr> In-Reply-To: <8735dqmw72.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Feb 2024 13:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57311@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 57311-submit@debbugs.gnu.org id=B57311.170696715021256 (code B ref 57311); Sat, 03 Feb 2024 13:33:01 +0000 Received: (at 57311) by debbugs.gnu.org; 3 Feb 2024 13:32:30 +0000 Received: from localhost ([127.0.0.1]:45981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWG8E-0005Wl-0k for submit@debbugs.gnu.org; Sat, 03 Feb 2024 08:32:30 -0500 Received: from 8.mo583.mail-out.ovh.net ([178.32.116.78]:60675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWG8A-0005Wb-Ro for 57311@debbugs.gnu.org; Sat, 03 Feb 2024 08:32:28 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.153]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 618522897B for <57311@debbugs.gnu.org>; Sat, 3 Feb 2024 13:32:13 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-xwx9m (unknown [10.111.182.49]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1B7D91FDF1; Sat, 3 Feb 2024 13:32:13 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-xwx9m with ESMTPSA id HxiXAV1AvmXvngAA993phA (envelope-from ); Sat, 03 Feb 2024 13:32:13 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004cb164e1e-8593-4fb2-9a4f-9d7235127b31, F5ADB67915646DBFD32EB3060FF73679FEA22C13) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 3 Feb 2024 14:31:59 +0100 Message-ID: <20240203133159.16379-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4637863192203879138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfeduiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudevfeejfffhheeggeeljedtgeduuefhgeeufeffkeeflefhhfetiedviefgfedunecuffhomhgrihhnpehgihhthhhusgdrtghomhdpshhnrghpphgvrhdrihhonecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjeefudduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth 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: , 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 Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")