From patchwork Fri Apr 12 08:01:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Mellor X-Patchwork-Id: 62937 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 3D8B827BBEA; Fri, 12 Apr 2024 09:02:08 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 EC04827BBE2 for ; Fri, 12 Apr 2024 09:02:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvBrC-00037v-2t; Fri, 12 Apr 2024 04:01:58 -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 1rvBr9-0002xD-Ri for guix-patches@gnu.org; Fri, 12 Apr 2024 04:01:55 -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 1rvBr9-0004DF-IC for guix-patches@gnu.org; Fri, 12 Apr 2024 04:01:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvBrI-0000Bl-SN for guix-patches@gnu.org; Fri, 12 Apr 2024 04:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70152] [PATCH v2] gnu: Borg: Update to 1.2.8. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2024 08:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70152@debbugs.gnu.org Cc: guix-devel-0brg6a@rdmp.org, leo@famulari.name X-Debbugs-Original-Cc: Dale Mellor , guix-patches@gnu.org, Leo Famulari Received: via spool by 70152-submit@debbugs.gnu.org id=B70152.1712908906485 (code B ref 70152); Fri, 12 Apr 2024 08:02:04 +0000 Received: (at 70152) by debbugs.gnu.org; 12 Apr 2024 08:01:46 +0000 Received: from localhost ([127.0.0.1]:57801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvBqy-00007P-9J for submit@debbugs.gnu.org; Fri, 12 Apr 2024 04:01:46 -0400 Received: from [195.15.247.228] (port=35308 helo=rdmp.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvBqt-00005B-C3 for 70152@debbugs.gnu.org; Fri, 12 Apr 2024 04:01:43 -0400 Received: from [127.0.0.1] (helo=localhost.localdomain) by rdmp.org with esmtp (Exim 4.96.1) (envelope-from ) id 1rvBqd-0000ya-1r; Fri, 12 Apr 2024 08:01:23 +0000 From: Dale Mellor Date: Fri, 12 Apr 2024 09:01:01 +0100 Message-ID: <20240412080101.1332966-1-guix-devel-0brg6a@rdmp.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <46673aa390af70cf1be667190e7d15afb5705b89.1712081885.git.leo@famulari.name> References: <46673aa390af70cf1be667190e7d15afb5705b89.1712081885.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 From: Leo Famulari * 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. Review: * guix lint throws false positive due to deprecation in package:inputs field * guix build --check is clean * guix install is clean * it works for me Reviewed-by: Dale Mellor Change-Id: I031bb4e6ac2f562a3e387a5e815b31416367766f --- gnu/packages/backup.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 699f4cbc8f..44365d3bcb 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -675,13 +675,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 @@ -723,18 +723,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" @@ -749,7 +741,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 "