From patchwork Sat Jul 13 18:13:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 29268 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 7ED8527BBEA; Sat, 13 Jul 2024 19:14:40 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 B93C927BBE2 for ; Sat, 13 Jul 2024 19:14:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sShGK-0002lG-Ni; Sat, 13 Jul 2024 14:14:26 -0400 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 1sShFx-0002hM-Jo for guix-patches@gnu.org; Sat, 13 Jul 2024 14:14:03 -0400 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 1sShFx-00081t-Ar for guix-patches@gnu.org; Sat, 13 Jul 2024 14:14:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sShFy-0000G8-7b for guix-patches@gnu.org; Sat, 13 Jul 2024 14:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72096] [PATCH 2/2] gnu: borg: Update to 1.4.0. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jul 2024 18:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72096 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72096@debbugs.gnu.org Received: via spool by 72096-submit@debbugs.gnu.org id=B72096.1720894420955 (code B ref 72096); Sat, 13 Jul 2024 18:14:02 +0000 Received: (at 72096) by debbugs.gnu.org; 13 Jul 2024 18:13:40 +0000 Received: from localhost ([127.0.0.1]:56764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sShFc-0000FJ-5M for submit@debbugs.gnu.org; Sat, 13 Jul 2024 14:13:40 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]:55439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sShFZ-0000En-4M for 72096@debbugs.gnu.org; Sat, 13 Jul 2024 14:13:37 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 0A1FB1380877; Sat, 13 Jul 2024 14:13:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 13 Jul 2024 14:13:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mesmtp; t=1720894411; x= 1720980811; bh=2/fXj72dUoAJ3JR+vku4FxVytim90gjOVayCgwyPP2c=; b=c URR1Va2yqKU+VBrOTr1BVgf5G509zIWu9/I8Reof4zRCsLmqIi6hyO3NsitzfRjW ICNL6aQGvAN9/hCwXJTiNzJvEmNQY1hyo/SUQmMWIup4yTWNyrgWXmAAuxZWPWQl VPvjnY3gjaB7UTPCgrpLQ9p93Ji8cD6N2YLAFufONI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1720894411; x=1720980811; bh=2/fXj72dUoAJ3 JR+vku4FxVytim90gjOVayCgwyPP2c=; b=aUmhFp5wyr0H0kyEU5ZZp3Z6o1UN+ nB0mMfat8kXtKv/dDDaCupR9KwVNvKFq1kNCpKvD1nCVh+1+QDCpfwzyjXhv40mK jitDLUe4VyxWGpnlZ8xvt+56p01myVBgb5xteKbojslNT0e/yqkuE7Myh39Tc2pP H3YonuBgcU/mTMD/6StEi4NzoO9iDb5jcQUbB5dnnLhEpSU+7lFBHG1pDtOXnae1 SqWlz/xOFVdZ3ZR9htTMosC25GArIdfpsiEcQ4I91PB9YaQmcR3+p1iVPHNGFiZ9 pAZSQgenCWWmrvpSfxJhHzafl0yIGsaNIPsgI5oK5XqRwObF2ywWtsqRQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrfeekgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephfeggeetiedtvdduudevueehvdehhf efhefghedvhfdugeeukeehvdfhfffhhfegnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <72096@debbugs.gnu.org>; Sat, 13 Jul 2024 14:13:29 -0400 (EDT) From: Leo Famulari Date: Sat, 13 Jul 2024 14:13:25 -0400 Message-ID: <8454c8010e5a791f52c785c296c0e98d2466ab65.1720894405.git.leo@famulari.name> X-Mailer: git-send-email 2.45.2 In-Reply-To: <48cb877e625a319f0732f4063a19e7df345c226e.1720894405.git.leo@famulari.name> References: <48cb877e625a319f0732f4063a19e7df345c226e.1720894405.git.leo@famulari.name> 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 * gnu/packages/backup.scm (borg): Update to 1.4.0. [source]: Remove obsolete snippet components. [arguments]: Export a newly required environment variable in the 'set-env' phase. Adjust the custom 'install-doc' phase to install miscellaneous documentation into a directory named after the package name and version. Change-Id: I688bb4e6c67506226418b6b4a47595f2a10c10ae --- gnu/packages/backup.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 637a873fbf..1c79be7078 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -675,14 +675,13 @@ (define-public libchop (define-public borg (package (name "borg") - (version "1.2.8") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "1aplj54x6hcyg3mnzscnwi07npy7nrws2246ss25ax6bsaq257fk")) - (modules '((guix build utils))) + (base32 "0agdyrmj7yy2vn0qghcpq458v9d09q9jvzzrszz6dyj3aqalak65")) (snippet #~(begin ;; Delete files generated by Cython. We used to have a regex that @@ -701,11 +700,7 @@ (define-public borg "src/borg/platform/linux.c" "src/borg/platform/posix.c" "src/borg/platform/syncfilerange.c" - "src/borg/platform/windows.c")) - ;; Remove bundled shared libraries. - (with-directory-excursion "src/borg/algorithms" - (for-each delete-file-recursively - (list "lz4" "xxh64" "zstd"))))))) + "src/borg/platform/windows.c")))))) (build-system python-build-system) (arguments (list @@ -716,10 +711,12 @@ (define-public borg #~(modify-phases %standard-phases (add-after 'unpack 'set-env (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl #$(this-package-input "openssl")) + (let ((acl #$(this-package-input "acl")) + (openssl #$(this-package-input "openssl")) (lz4 #$(this-package-input "lz4")) (xxhash #$(this-package-input "xxhash")) (zstd #$(this-package-input "zstd"))) + (setenv "BORG_LIBACL_PREFIX" openssl) (setenv "BORG_OPENSSL_PREFIX" openssl) (setenv "BORG_LIBLZ4_PREFIX" lz4) (setenv "BORG_LIBXXHASH_PREFIX" xxhash) @@ -756,7 +753,8 @@ (define-public borg (add-after 'install 'install-doc (lambda _ (let ((man (string-append #$output "/share/man/man1")) - (misc (string-append #$output "/share/borg/misc"))) + (misc (string-append #$output "/share/doc/borg-" + #$(package-version this-package)))) (for-each (cut install-file <> misc) '("docs/misc/create_chunker-params.txt" "docs/misc/borg-data-flow.png"