From unknown Fri Aug 15 20:50:17 2025 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 From: Nicolas Graves Date: Sat, 20 Aug 2022 23:39:13 +0200 Message-ID: <8735dqmw72.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 From unknown Fri Aug 15 20:50:17 2025 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: Fri, 10 Feb 2023 16:44:02 +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 Received: via spool by 57311-submit@debbugs.gnu.org id=B57311.16760474184027 (code B ref 57311); Fri, 10 Feb 2023 16:44:02 +0000 Received: (at 57311) by debbugs.gnu.org; 10 Feb 2023 16:43:38 +0000 Received: from localhost ([127.0.0.1]:37978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQWUr-00012t-UF for submit@debbugs.gnu.org; Fri, 10 Feb 2023 11:43:38 -0500 Received: from 14.mo581.mail-out.ovh.net ([178.33.251.19]:36147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQWUm-00012h-FQ for 57311@debbugs.gnu.org; Fri, 10 Feb 2023 11:43:36 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.20.52]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 3BB8524391 for <57311@debbugs.gnu.org>; Fri, 10 Feb 2023 16:43:29 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-qq26s (unknown [10.111.172.37]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 693411FE24 for <57311@debbugs.gnu.org>; Fri, 10 Feb 2023 16:43:28 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-qq26s with ESMTPSA id FZ3LGzB05mNlMAEAE4wpxg (envelope-from ) for <57311@debbugs.gnu.org>; Fri, 10 Feb 2023 16:43:28 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003dbab8c03-7fe5-4ecd-b3ed-5067d3e2e39f, 8EC7CB749FFEB3CFF848516D1F8ECDC746C83FCB) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves In-Reply-To: <8735dqmw72.fsf@ngraves.fr> References: <8735dqmw72.fsf@ngraves.fr> Date: Fri, 10 Feb 2023 17:43:27 +0100 Message-ID: <87mt5lbhe8.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 8372473182513849000 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrudehhedgledtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffujghffffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieejgfffffduieevgfduiefhtdfgleejhfdvvefhgeekjeevtdfhtdefleejhefgnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjeefudduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Quick reminder for this forgotten patch ;) -- Best regards, Nicolas Graves From unknown Fri Aug 15 20:50:17 2025 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 From: Nicolas Graves 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 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4637863192203879138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfeduiedgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudevfeejfffhheeggeeljedtgeduuefhgeeufeffkeeflefhhfetiedviefgfedunecuffhomhgrihhnpehgihhthhhusgdrtghomhdpshhnrghpphgvrhdrihhonecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjeefudduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From unknown Fri Aug 15 20:50:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#57311] QA review for 57311 References: <8735dqmw72.fsf@ngraves.fr> In-Reply-To: <8735dqmw72.fsf@ngraves.fr> Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 21:07: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: control@debbugs.gnu.org, 57311@debbugs.gnu.org Received: via spool by 57311-submit@debbugs.gnu.org id=B57311.170811762129183 (code B ref 57311); Fri, 16 Feb 2024 21:07:01 +0000 Received: (at 57311) by debbugs.gnu.org; 16 Feb 2024 21:07:01 +0000 Received: from localhost ([127.0.0.1]:60262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rb5QC-0007aZ-Uh for submit@debbugs.gnu.org; Fri, 16 Feb 2024 16:07:01 -0500 Received: from mail03.noris.net ([62.128.1.223]:52123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rb5Q8-0007aL-Tv; Fri, 16 Feb 2024 16:06:59 -0500 Received: from p57b0974f.dip0.t-ipconnect.de ([87.176.151.79] helo=hermia.goebel-consult.de) by mail03.noris.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) (envelope-from ) id 1rb5Po-00036P-0Z; Fri, 16 Feb 2024 22:06:36 +0100 Received: from [127.0.0.1] (hermia.goebel-consult.de [192.168.110.7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hermia.goebel-consult.de (Postfix) with ESMTPS id 432C25F52F; Fri, 16 Feb 2024 22:06:33 +0100 (CET) Message-ID: <0f8aca45-1bd9-4a9c-efb7-3adb43f693a9@crazy-compilers.com> Date: Fri, 16 Feb 2024 22:06:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: de-DE, en-US From: Hartmut Goebel Organization: crazy-compilers.com Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Noris-IP: 87.176.151.79 X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) 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 | From unknown Fri Aug 15 20:50:17 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#57311: closed (Re: [bug#57311] [PATCH v2] gnu: Add snapper.) Message-ID: References: <87le7hn7wk.fsf@gnu.org> <8735dqmw72.fsf@ngraves.fr> X-Gnu-PR-Message: they-closed 57311 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 57311@debbugs.gnu.org Date: Sun, 18 Feb 2024 14:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1708268042-3521-1" This is a multi-part message in MIME format... ------------=_1708268042-3521-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 57311@debbugs.gnu.org. --=20 57311: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D57311 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1708268042-3521-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 57311-done) by debbugs.gnu.org; 18 Feb 2024 14:53:22 +0000 Received: from localhost ([127.0.0.1]:34317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbiXh-0000tb-IR for submit@debbugs.gnu.org; Sun, 18 Feb 2024 09:53:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbiXd-0000tK-Rw for 57311-done@debbugs.gnu.org; Sun, 18 Feb 2024 09:53:21 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbiV4-0001I1-I1; Sun, 18 Feb 2024 09:50:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=1LrknXSb2U0WoBHizoXfTLBnB09eX+dnwNTZXTdddws=; b=SDuMulBvzB/uq3M9CnQo j6NuupN4Z1G6FusFhdk32w4nve62v9xaKOG9FAIss4LfY6EXDnZ8kdYzyWjzIOSUC8X0ZvhZ7UKVd xfxLH9JghhtkB4N+pspI8mHtb8zkTeOZNfdLMBXndmBqnEyAUlddXCMZhQNjRicp5waA+xKPxg4OF 93nXGzd9l0Ky9cN1qcBfiofqBRIIh+bKy7d3FKyQ7sgIp3fmrV38UYKamgr4G5cSsS+vWWaXdZOf5 H2jtbcz+tSXAwS+uC0R7UPphLF3eYQZ2hLMxTExA2O/as8IFi6YKh/tMxlwWpKzhFpyllcaU/ISJh VuIjIUdIgI2PXA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Graves Subject: Re: [bug#57311] [PATCH v2] gnu: Add snapper. In-Reply-To: <20240203133159.16379-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Sat, 3 Feb 2024 14:31:59 +0100") References: <8735dqmw72.fsf@ngraves.fr> <20240203133159.16379-1-ngraves@ngraves.fr> Date: Sun, 18 Feb 2024 15:50:35 +0100 Message-ID: <87le7hn7wk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -4.2 (----) X-Debbugs-Envelope-To: 57311-done Cc: Hartmut Goebel , 57311-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.2 (-----) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Nicolas, Nicolas Graves skribis: > * gnu/packages/file-systems.scm (snapper): New variable. Applied with the changes below, most of which suggested by Hartmut. Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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))) --=-=-=-- ------------=_1708268042-3521-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] gnu: Add snapper. Date: Sat, 20 Aug 2022 23:39:13 +0200 Message-ID: <8735dqmw72.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 ------------=_1708268042-3521-1--