From patchwork Sun Feb 18 14:50:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 60473 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 5104227BBE9; Sun, 18 Feb 2024 14:54:04 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 12CE327BBE2 for ; Sun, 18 Feb 2024 14:53:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rbiY5-0004dr-Q4; Sun, 18 Feb 2024 09:53:45 -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 1rbiY1-0004dL-Ms for guix-patches@gnu.org; Sun, 18 Feb 2024 09:53:41 -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 1rbiY1-0001X7-EZ for guix-patches@gnu.org; Sun, 18 Feb 2024 09:53:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rbiYL-0000uv-To for guix-patches@gnu.org; Sun, 18 Feb 2024 09:54:01 -0500 Subject: bug#57311: [PATCH v2] gnu: Add snapper. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 14:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 57311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves Cc: Hartmut Goebel , 57311-done@debbugs.gnu.org Mail-Followup-To: 57311@debbugs.gnu.org, ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 57311-done@debbugs.gnu.org id=D57311.17082680023452 (code D ref 57311); Sun, 18 Feb 2024 14:54:01 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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’. 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)))