From patchwork Tue Apr 2 18:18:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 62649 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 6CBC827BBEA; Tue, 2 Apr 2024 19:19:30 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 700B127BBE2 for ; Tue, 2 Apr 2024 19:19:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrij4-0005B1-IR; Tue, 02 Apr 2024 14:19:14 -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 1rriis-00056m-1M for guix-patches@gnu.org; Tue, 02 Apr 2024 14:19: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 1rriip-0007P7-Uz for guix-patches@gnu.org; Tue, 02 Apr 2024 14:19:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rriit-0003vI-PN for guix-patches@gnu.org; Tue, 02 Apr 2024 14:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70152] [PATCH] gnu: Borg: Update to 1.2.8. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Apr 2024 18:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70152@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171208192114939 (code B ref -1); Tue, 02 Apr 2024 18:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Apr 2024 18:18:41 +0000 Received: from localhost ([127.0.0.1]:56305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rriiU-0003sh-Hi for submit@debbugs.gnu.org; Tue, 02 Apr 2024 14:18:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rriiR-0003rn-Jz for submit@debbugs.gnu.org; Tue, 02 Apr 2024 14:18:37 -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 1rrii8-0004Nh-GG for guix-patches@gnu.org; Tue, 02 Apr 2024 14:18:21 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrii6-0007E9-CG for guix-patches@gnu.org; Tue, 02 Apr 2024 14:18:16 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id 1F9CF138014C; Tue, 2 Apr 2024 14:18:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 02 Apr 2024 14:18:13 -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:message-id:mime-version:reply-to:subject:subject:to :to; s=mesmtp; t=1712081893; x=1712168293; bh=Q+UTuWdNtdbXp0xOaF auQpbZvUHe7jxxs2nt64Si+Lo=; b=w6ZnWEWJ5A4RKRh+6wcjzN+naSplW9z7qn VQOW1ZH6+IExIQyA7jEdTEKDL7UPXiGYfPjQaSWZ26ZVHXY5EERnMR5/jacFaWny VM6dpF1MYiytruwfTBo/IMAdO6KOn9pcXgLsujeVnz/ORnbw5Th0whmGnCswZkoT rLGwdvAOw= 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 :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1712081893; x=1712168293; bh=Q+UTuWdNtdbXp0xOaFauQpbZvUHe 7jxxs2nt64Si+Lo=; b=Zb1krR320gtU4sJ/rWJOVHzMwCqY6eKdxAEWCHJDCBSi gaXsBgO+/dz4gWyqTiAV6S38PcZWJhAK/bgMm00+St+t5w1OPrugLj8FMvMGq4oY CbarayzkbEzjYXbQ7NbZ9WY1ju7RY0I50WLF9iBlylZUCilUFIJxIQnqc9+5uTjO QgFLAPQqUs65tvkrQ/agTtaNNoow1nvyrUIOo8CdlsPf614ddhqrvQYtmIO+RTV0 UntPxiy7DPjBPFc3QvOHcVpdAPiRqMWwtxqHBEzPhPxMN8Dj/FzOX5GjEWR1Hlg1 Yj5n+z65WXHwB22h+qKWON78lqOmmH6MzfwbRALsPA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefvddguddvfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuud dvgeeiffevkeeuffefteduvdfhhfduhfenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 2 Apr 2024 14:18:12 -0400 (EDT) From: Leo Famulari Date: Tue, 2 Apr 2024 14:18:05 -0400 Message-ID: <46673aa390af70cf1be667190e7d15afb5705b89.1712081885.git.leo@famulari.name> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=103.168.172.149; envelope-from=leo@famulari.name; helo=fout6-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/backup.scm (borg): Update to 1.2.8. [arguments]: Remove a variety of workarounds that have been obviated by changes upstream and in the Python package build tools. Change-Id: I031bb4e6ac2f562a3e387a5e815b31416367766f --- gnu/packages/backup.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 4fa39b741c..d671a6283e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -655,13 +655,13 @@ (define-public libchop (define-public borg (package (name "borg") - (version "1.2.7") + (version "1.2.8") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "06j1v4bw9jkjh6m29ns5sigmp0cslcf0cyy8rrqij11w72ijhgzn")) + (base32 "1aplj54x6hcyg3mnzscnwi07npy7nrws2246ss25ax6bsaq257fk")) (modules '((guix build utils))) (snippet #~(begin @@ -703,18 +703,10 @@ (define-public borg (setenv "BORG_OPENSSL_PREFIX" openssl) (setenv "BORG_LIBLZ4_PREFIX" lz4) (setenv "BORG_LIBXXHASH_PREFIX" xxhash) - (setenv "BORG_LIBZSTD_PREFIX" zstd) - (setenv "PYTHON_EGG_CACHE" "/tmp") - ;; The test 'test_return_codes[python]' fails when - ;; HOME=/homeless-shelter. - (setenv "HOME" "/tmp")))) - ;; The tests need to be run after Borg is installed. - (delete 'check) - (add-after 'install 'check + (setenv "BORG_LIBZSTD_PREFIX" zstd)))) + (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? - ;; Make the installed package available for the test suite. - (add-installed-pythonpath inputs outputs) ;; The tests should be run in an empty directory. (mkdir-p "tests") (with-directory-excursion "tests" @@ -729,7 +721,6 @@ (define-public borg "and not test_access_acl " "and not test_default_acl " "and not test_get_item_uid_gid " - "and not test_non_ascii_acl " "and not test_create_content_from_command " "and not test_create_content_from_command_with_failed_command " "and not test_create_stdin "