[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#53558] [PATCH 3/3] WIP: Borg: Update to 1.2.0b4.
|
From: |
Leo Famulari |
|
Subject: |
[bug#53558] [PATCH 3/3] WIP: Borg: Update to 1.2.0b4. |
|
Date: |
Wed, 26 Jan 2022 14:36:39 -0500 |
XXX
borgbackup 1.2.0b4 beta release - do not use this on production backup
repositories.
XXX
Upstream discussions:
https://github.com/borgbackup/borg/discussions/6166
https://github.com/borgbackup/borg/issues/4360
* gnu/packages/backup.scm (borg): Update to 1.2.0b4.
[source]: Adjust the list of Cython files to rebuild. Remove an obsolete
substitution. Delete the bundled xxhash. Blake2 is no longer bundled.
[native-inputs]: Add python-dateutil.
[inputs]: Add xxhash. Add python-msgpack-1.2. Remove libb2.
[arguments]: Export BORG_LIBXXHASH_PREFIX to ensure the build script can find
xxhash. Adjust the list of skipped tests and make the custom 'check' phase honor
tests?. Install some more documentation.
---
gnu/packages/backup.scm | 100 ++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index d847287d13..c55dbc12ba 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
-;;; Copyright © 2015, 2016, 2017, 2021 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -62,6 +62,7 @@ (define-module (gnu packages backup)
#:use-module (gnu packages crypto)
#:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
+ #:use-module (gnu packages digest)
#:use-module (gnu packages dbm)
#:use-module (gnu packages dejagnu)
#:use-module (gnu packages ftp)
@@ -629,13 +630,13 @@ (define-public libchop
(define-public borg
(package
(name "borg")
- (version "1.1.17")
+ (version "1.2.0b4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "borgbackup" version))
(sha256
- (base32 "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs"))
+ (base32 "1h4gni8p2kyg1qry2nmzscj6zai7lygyqwdzxgd6y531780lx6pk"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -645,8 +646,6 @@ (define-public borg
;; generate the wrong list.
(for-each delete-file
'("src/borg/algorithms/checksums.c"
- "src/borg/algorithms/msgpack/_packer.cpp"
- "src/borg/algorithms/msgpack/_unpacker.cpp"
"src/borg/chunker.c"
"src/borg/compress.c"
"src/borg/crypto/low_level.c"
@@ -656,15 +655,17 @@ (define-public borg
"src/borg/platform/freebsd.c"
"src/borg/platform/linux.c"
"src/borg/platform/posix.c"
- "src/borg/platform/syncfilerange.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 "blake2" "lz4" "zstd")))
+ (list "lz4" "xxh64" "zstd")))
#t))))
(build-system python-build-system)
(arguments
- `(#:modules ((srfi srfi-26) ; for cut
+ `(#:tests? #f ; The tests pass. Skip them all while debugging FUSE 3
+ #:modules ((srfi srfi-26) ; for cut
(guix build utils)
(guix build python-build-system))
#:phases
@@ -672,12 +673,12 @@ (define-public borg
(add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl"))
- (libb2 (assoc-ref inputs "libb2"))
(lz4 (assoc-ref inputs "lz4"))
+ (xxhash (assoc-ref inputs "xxhash"))
(zstd (assoc-ref inputs "zstd")))
(setenv "BORG_OPENSSL_PREFIX" openssl)
- (setenv "BORG_LIBB2_PREFIX" libb2)
(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
@@ -687,32 +688,37 @@ (define-public borg
;; The tests need to be run after Borg is installed.
(delete 'check)
(add-after 'install 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; 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"
- (invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k"
- (string-append
- ;; These tests need to write to '/var'.
- "not test_get_cache_dir "
- "and not test_get_config_dir "
- "and not test_get_keys_dir "
- "and not test_get_security_dir "
- ;; These tests assume there is a root user in
- ;; '/etc/passwd'.
- "and not test_access_acl "
- "and not test_default_acl "
- "and not test_non_ascii_acl "
- "and not test_create_stdin "
- ;; This test needs the unpackaged pytest-benchmark.
- "and not benchmark "
- ;; These tests assume the kernel supports FUSE.
- "and not test_fuse "
- "and not test_fuse_allow_damaged_files "
- "and not test_mount_hardlinks "
- "and not test_readonly_mount ")))))
+ (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"
+ (invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k"
+ (string-append
+ ;; These tests need to write to '/var'.
+ "not test_get_cache_dir "
+ "and not test_get_config_dir "
+ "and not test_get_keys_dir "
+ "and not test_get_security_dir "
+ ;; These tests assume there is a root user in
'/etc/passwd'.
+ "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 "
+ ;; We don't need to run benchmarks
+ "and not benchmark "
+ ;; These tests assume the kernel supports FUSE.
+ "and not test_fuse "
+ "and not test_fuse_allow_damaged_files "
+ "and not test_mount_hardlinks "
+ "and not test_readonly_mount "
+ "and not test_fuse_versions_view "
+ "and not test_migrate_lock_alive"))))))
(add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -720,10 +726,10 @@ (define-public borg
(misc (string-append out "/share/borg/misc")))
(for-each (cut install-file <> misc)
'("docs/misc/create_chunker-params.txt"
+ "docs/misc/borg-data-flow.png"
"docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt"))
- (copy-recursively "docs/man" man)
- #t)))
+ (copy-recursively "docs/man" man))))
(add-after 'install-docs 'install-shell-completions
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -735,24 +741,28 @@ (define-public borg
(install-file "zsh/_borg"
(string-append share "/zsh/site-functions"))
(install-file "fish/borg.fish"
- (string-append share
"/fish/vendor_completions.d")))
- #t))))))
+ (string-append share
"/fish/vendor_completions.d")))))))))
(native-inputs
- (list python-cython python-setuptools-scm python-pytest))
+ (list python-cython python-dateutil python-setuptools-scm python-pytest))
(inputs
(list acl
- libb2
lz4
openssl
+ ;; This is the latest version of msgpack accepted by 'setup.py'.
+ python-msgpack-1.0.2
+ ;; FUSE 3 isn't working well, so we stick with FUSE 2 for now:
+ ;; <https://issues.guix.gnu.org/53407>
python-llfuse
- `(,zstd "lib")))
+; python-pyfuse3
+ `(,zstd "lib")
+ xxhash))
(synopsis "Deduplicated, encrypted, authenticated and compressed backups")
(description "Borg is a deduplicating backup program. Optionally, it
supports compression and authenticated encryption. The main goal of Borg is to
provide an efficient and secure way to backup data. The data deduplication
technique used makes Borg suitable for daily backups since only changes are
-stored. The authenticated encryption technique makes it suitable for
-storing backups on untrusted computers.")
+stored. The authenticated encryption technique makes it suitable for storing
+backups on untrusted computers.")
(home-page "https://www.borgbackup.org/";)
(license license:bsd-3)))
--
2.34.0