diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
| commit | 6af7c2b178b4d9bf16aced8bbfc1518643425f13 (patch) | |
| tree | c71a79116d94659576096362907160d5b82b367d /gnu/packages/backup.scm | |
| parent | 869250809bddcf8eab26ecdedabad6fc060751dd (diff) | |
| parent | e921234d02c926b5a95498aed1280b6346dd0878 (diff) | |
| download | guix-6af7c2b178b4d9bf16aced8bbfc1518643425f13.tar guix-6af7c2b178b4d9bf16aced8bbfc1518643425f13.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 74ee67c70c..f55dd1a139 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -105,6 +105,15 @@ (substitute* "duplicity/gpginterface.py" (("self.call = '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" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) |