01/01: gnu: borg: Update to 1.1.5.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 620ab3a50ce3c9ec283dd585de48b49c7ca408fc
Author: Leo Famulari <address@hidden>
Date:   Sun Apr 1 16:18:51 2018 -0400

    gnu: borg: Update to 1.1.5.
    
    * gnu/packages/backup.scm (borg): Update to 1.1.5.
    [arguments]: Allow a more recent msgpack in an 'adjust-msgpack-dependency'
    phase.
---
 gnu/packages/backup.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 2fafa2c..a3782e1 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -453,13 +453,13 @@ detection, and lossless compression.")
 (define-public borg
   (package
     (name "borg")
-    (version "1.1.4")
+    (version "1.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgbackup" version))
        (sha256
-        (base32 "1cicqwh85wfp65y00qaq6q4i4jcyy9b66qz5gpl80qc880wab912"))
+        (base32 "0gbdnq7ks46diz6y2pf6wpwkb9hy6hp3immi7jg3h7w72b3ycmj3"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -491,6 +491,17 @@ detection, and lossless compression.")
                ;; HOME=/homeless-shelter.
                (setenv "HOME" "/tmp")
                #t)))
+         ;; Later versions of msgpack were disallowed to some warnings and lack
+         ;; of support for Python versions that we don't support anyways. So,
+         ;; it's okay to to keep using more recents versions of msgpack for
+         ;; Borg. Also see the note about msgpack in the list of inputs.
+         ;; 
https://github.com/borgbackup/borg/issues/3517#issuecomment-357221978
+         (add-before 'build 'adjust-msgpack-dependency
+           (lambda _
+             (substitute* "setup.py"
+               (("msgpack-python>=0.4.6,<0.5.0")
+                 "msgpack-python>=0.4.6"))
+             #t))
          ;; The tests need to be run after Borg is installed.
          (delete 'check)
          (add-after 'install 'check