nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: duplicity: Update to 0.7.18.1. 

* gnu/packages/backup.scm (duplicity): Update to 0.7.18.1.
[arguments]: Remove upstreamed '--ignore-mdc-error' kluge.
Rename 'patch-source' phase to 'use-store-file-names'.
This commit is contained in:
Tobias Geerinckx-Rice 2018-08-29 23:15:18 +02:00
parent 99e0fb24fb
commit 7bb7920f64
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/backup.scm
View File

@ -67,7 +67,7 @@
(define-public duplicity (define-public duplicity
(package (package
(name "duplicity") (name "duplicity")
(version "0.7.18") (version "0.7.18.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -77,7 +77,7 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b")))) "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("util-linux" ,util-linux) ; setsid command, for the tests `(("util-linux" ,util-linux) ; setsid command, for the tests
@ -99,21 +99,12 @@
#:test-target "test" #:test-target "test"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'patch-source (add-before 'build 'use-store-file-names
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Embed gpg store name.
(substitute* "duplicity/gpginterface.py" (substitute* "duplicity/gpginterface.py"
(("self.call = 'gpg'") (("self.call = 'gpg'")
(string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
;; This matches up with an unreleased upstream fix, it should be
;; removed when the package is updated.
;; https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1308
(substitute* "duplicity/gpg.py"
(("--no-secmem-warning'\\)")
"--no-secmem-warning')
gnupg.options.extra_args.append('--ignore-mdc-error')"))
(substitute* '("testing/functional/__init__.py" (substitute* '("testing/functional/__init__.py"
"testing/overrides/bin/lftp") "testing/overrides/bin/lftp")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))