aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2021-08-04 01:21:00 -0400
committerLeo Famulari <leo@famulari.name>2021-07-27 12:35:00 -0400
commit5e71375361c0d6a11e1890b61e464f030596d0de (patch)
treedf74f8d7b600c727903532039daed6eac6d388b3
parentfdd2f57359cb01b2a867aaff88b86989597c2953 (diff)
downloadguix-5e71375361c0d6a11e1890b61e464f030596d0de.tar
guix-5e71375361c0d6a11e1890b61e464f030596d0de.tar.gz
gnu: Borg: Use bundled msgpack.
This is an old and customized version of msgpack-python. * gnu/packages/backup.scm (borg)[source]: In the snippet, don't delete the bundled 'msgpack' directory, and remove the related substition applied to setup.py. [arguments]: Remove the 'use-system-msgpack' phase. [inputs]: Remove 'python-msgpack-transitional'.
-rw-r--r--gnu/packages/backup.scm17
1 files changed, 1 insertions, 16 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index b35dbe4b76..d05cb55163 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -659,12 +659,7 @@ detection, and lossless compression.")
;; Remove bundled shared libraries.
(with-directory-excursion "src/borg/algorithms"
(for-each delete-file-recursively
- (list "blake2" "lz4" "msgpack" "zstd")))
- ;; Purge some msgpack references from setup.py or the resulting
- ;; sources will be unbuildable.
- (substitute* "setup.py"
- ((".*Extension\\('borg\\.algorithms\\.msgpack\\..*") "")
- (("msgpack_packer_source, msgpack_unpacker_source") ""))
+ (list "blake2" "lz4" "zstd")))
#t))))
(build-system python-build-system)
(arguments
@@ -688,12 +683,6 @@ detection, and lossless compression.")
;; HOME=/homeless-shelter.
(setenv "HOME" "/tmp")
#t)))
- (add-after 'unpack 'use-system-msgpack
- (lambda _
- (substitute* "src/borg/helpers.py"
- (("prefer_system_msgpack = False")
- "prefer_system_msgpack = True"))
- #t))
;; The tests need to be run after Borg is installed.
(delete 'check)
(add-after 'install 'check
@@ -757,10 +746,6 @@ detection, and lossless compression.")
("lz4" ,lz4)
("openssl" ,openssl)
("python-llfuse" ,python-llfuse)
- ;; The Python msgpack library changed its name so Borg requires this
- ;; transitional package for now:
- ;; <https://bugs.gnu.org/30662>
- ("python-msgpack" ,python-msgpack-transitional)
("zstd" ,zstd "lib")))
(synopsis "Deduplicated, encrypted, authenticated and compressed backups")
(description "Borg is a deduplicating backup program. Optionally, it