GNU bug report logs - #70152
[PATCH] gnu: Borg: Update to 1.2.8.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 70152 in the body.
You can then email your comments to 70152 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Borg: Update to 1.2.8.
Date: Tue,  2 Apr 2024 14:18:05 -0400

* 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(-)

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 "

base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e
-- 
2.41.0

Message #10 received at 70152 <at> debbugs.gnu.org (full text, mbox):

From: Dale Mellor <guix-devel-0brg6a <at> rdmp.org>
To: 70152 <at> debbugs.gnu.org
Cc: Dale Mellor <guix-devel-0brg6a <at> rdmp.org>, guix-patches <at> gnu.org,
 Leo Famulari <leo <at> famulari.name>
Subject: [PATCH v2] gnu: Borg: Update to 1.2.8.
Date: Fri, 12 Apr 2024 09:01:01 +0100

From: Leo Famulari <leo <at> famulari.name>

* 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 <guix-devel-0brg6a <at> rdmp.org>

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 "
-- 
2.41.0

Message #18 received at 70152-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Dale Mellor <guix-devel-0brg6a <at> rdmp.org>
Cc: 70152-done <at> debbugs.gnu.org, leo <at> famulari.name
Subject: Re: [bug#70152] [PATCH v2] gnu: Borg: Update to 1.2.8.
Date: Mon, 15 Apr 2024 10:32:53 +0100

[Message part 1 (text/plain, inline)]

Dale Mellor <guix-devel-0brg6a <at> rdmp.org> writes:

> From: Leo Famulari <leo <at> famulari.name>
>
> * 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 <guix-devel-0brg6a <at> rdmp.org>
>
> Change-Id: I031bb4e6ac2f562a3e387a5e815b31416367766f
> ---
>  gnu/packages/backup.scm | 17 ++++-------------
>  1 file changed, 4 insertions(+), 13 deletions(-)

Thanks both, I've pushed this to master as
2c059863483b698c4f6f50a2ce4daaef5f1de83f.

Chris

[signature.asc (application/pgp-signature, inline)]

Message #21 received at 70152-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 70152-done <at> debbugs.gnu.org, Dale Mellor <guix-devel-0brg6a <at> rdmp.org>
Subject: Re: [bug#70152] [PATCH v2] gnu: Borg: Update to 1.2.8.
Date: Wed, 17 Apr 2024 14:06:27 -0400

On Mon, Apr 15, 2024 at 10:32:53AM +0100, Christopher Baines wrote:
> Thanks both, I've pushed this to master as
> 2c059863483b698c4f6f50a2ce4daaef5f1de83f.

Thanks to Dale and Chris!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.