diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 48d4b08af60c5ba9f48fa62d149ac973e83cebc8..2fafa2c4a6d06b16b5c1b153d699e9d2e714764b 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -547,7 +547,10 @@ (define-public borg ("lz4" ,lz4) ("openssl" ,openssl) ("python-llfuse" ,python-llfuse) - ("python-msgpack" ,python-msgpack) + ;; 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))) (synopsis "Deduplicated, encrypted, authenticated and compressed backups") (description "Borg is a deduplicating backup program. Optionally, it diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 064d79002dd3d86005bdcafe6ddbfa16d3ac2a80..69101c78b9ff1b62c582a7c3da288185a2e10d5b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5869,6 +5869,24 @@ (define-public python-msgpack (home-page "https://pypi.python.org/pypi/msgpack/") (license license:asl2.0))) +;; This msgpack library's name changed from "python-msgpack" to "msgpack" with +;; release 0.5. Some packages like borg still call it by the old name for now. +;; <https://bugs.gnu.org/30662> +(define-public python-msgpack-transitional + (package + (inherit python-msgpack) + (arguments + (substitute-keyword-arguments (package-arguments python-msgpack) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'configure-transitional + (lambda _ + ;; Keep using the old name. + (substitute* "setup.py" + (("TRANSITIONAL = False") + "TRANSITIONAL = 1")) + #t)))))))) + (define-public python2-msgpack (package-with-python2 python-msgpack))