* [bug#70152] [PATCH] gnu: Borg: Update to 1.2.8.
@ 2024-04-02 18:18 Leo Famulari
2024-04-12 8:01 ` [bug#70152] [PATCH v2] " Dale Mellor
0 siblings, 1 reply; 4+ messages in thread
From: Leo Famulari @ 2024-04-02 18:18 UTC (permalink / raw)
To: 70152
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#70152] [PATCH v2] gnu: Borg: Update to 1.2.8.
2024-04-02 18:18 [bug#70152] [PATCH] gnu: Borg: Update to 1.2.8 Leo Famulari
@ 2024-04-12 8:01 ` Dale Mellor
2024-04-15 9:32 ` bug#70152: " Christopher Baines
0 siblings, 1 reply; 4+ messages in thread
From: Dale Mellor @ 2024-04-12 8:01 UTC (permalink / raw)
To: 70152; +Cc: guix-devel-0brg6a, leo
From: Leo Famulari <leo@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@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-17 18:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-02 18:18 [bug#70152] [PATCH] gnu: Borg: Update to 1.2.8 Leo Famulari
2024-04-12 8:01 ` [bug#70152] [PATCH v2] " Dale Mellor
2024-04-15 9:32 ` bug#70152: " Christopher Baines
2024-04-17 18:06 ` [bug#70152] " Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).