[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/14: gnu: duplicity: Remove input labels and use gexps.
From: |
guix-commits |
Subject: |
11/14: gnu: duplicity: Remove input labels and use gexps. |
Date: |
Wed, 22 Nov 2023 10:52:44 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 9363ec208b892e3ea43eb573ea4d41d8e269044a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Nov 22 16:28:02 2023 +0100
gnu: duplicity: Remove input labels and use gexps.
* gnu/packages/backup.scm (duplicity)[native-inputs, propagated-inputs]:
Remove labels.
[arguments]: Use labels.
Change-Id: I08c7d20cca5d2f96edf9da77df9a1a3a8e5c2e5b
---
gnu/packages/backup.scm | 93 +++++++++++++++++++++++++------------------------
1 file changed, 48 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 5aa0d5688f..49b0fe2620 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -116,22 +116,20 @@
(base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng"))))
(build-system python-build-system)
(native-inputs
- `(("gettext" ,gettext-minimal) ; for msgfmt
- ("util-linux" ,util-linux) ; setsid command, for the tests
- ("par2cmdline" ,par2cmdline)
- ("python-fasteners" ,python-fasteners)
- ("python-future" ,python-future) ; for tests
- ("python-paramiko" ,python-paramiko)
- ("python-pexpect" ,python-pexpect)
- ("python-pytest" ,python-pytest)
- ("python-pytest-runner" ,python-pytest-runner)
- ("python-setuptools-scm" ,python-setuptools-scm)
- ("tzdata" ,tzdata-for-tests)
- ("mock" ,python-mock)))
+ (list gettext-minimal ; for msgfmt
+ util-linux ; setsid command, for the tests
+ par2cmdline
+ python-fasteners
+ python-future ; for tests
+ python-paramiko
+ python-pexpect
+ python-pytest
+ python-pytest-runner
+ python-setuptools-scm
+ tzdata-for-tests
+ python-mock))
(propagated-inputs
- `(("lockfile" ,python-lockfile)
- ("pygobject" ,python-pygobject)
- ("urllib3" ,python-urllib3)))
+ (list python-lockfile python-pygobject python-urllib3))
(inputs
(list dbus ; dbus-launch (Gio backend)
librsync
@@ -139,36 +137,41 @@
gnupg ; gpg executable needed
util-linux)) ; for setsid
(arguments
- `(#:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'use-store-file-names
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "duplicity/gpginterface.py"
- (("self.call = u'gpg'")
- (string-append "self.call = '"
- (search-input-file inputs "/bin/gpg")
- "'")))
- (substitute* "duplicity/backends/giobackend.py"
- (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
- (string-append "subprocess.Popen([u'"
- (search-input-file inputs "/bin/dbus-launch")
- "']")))
- (substitute* '("testing/functional/__init__.py"
- "testing/overrides/bin/lftp")
- (("/bin/sh") (which "sh")))))
- (add-before 'build 'fix-version
- (lambda _
- (substitute* "duplicity/__init__.py"
- (("\\$version") ,(package-version this-package)))))
- (add-before 'check 'set-up-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME
- (setenv "TZDIR" ; some timestamp checks need TZDIR
- (search-input-directory inputs "share/zoneinfo"))
- ;; Some things respect TMPDIR, others hard-code /tmp, and the
- ;; defaults don't match up, breaking test_restart. Fix it.
- (setenv "TMPDIR" "/tmp"))))))
+ (list #:test-target "test"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'use-store-file-names
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "duplicity/gpginterface.py"
+ (("self.call = u'gpg'")
+ (string-append "self.call = '"
+ (search-input-file inputs
+ "/bin/gpg")
+ "'")))
+ (substitute* "duplicity/backends/giobackend.py"
+ (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
+ (string-append "subprocess.Popen([u'"
+ (search-input-file inputs
+ "/bin/dbus-launch")
"']")))
+ (substitute* '("testing/functional/__init__.py"
+ "testing/overrides/bin/lftp")
+ (("/bin/sh")
+ (which "sh")))))
+ (add-before 'build 'fix-version
+ (lambda _
+ (substitute* "duplicity/__init__.py"
+ (("\\$version")
+ #$(package-version this-package)))))
+ (add-before 'check 'set-up-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "HOME"
+ (getcwd)) ; gpg needs to write to $HOME
+ (setenv "TZDIR" ; some timestamp checks need TZDIR
+ (search-input-directory inputs
+ "share/zoneinfo"))
+ ;; Some things respect TMPDIR, others hard-code /tmp, and
the
+ ;; defaults don't match up, breaking test_restart. Fix it.
+ (setenv "TMPDIR" "/tmp"))))))
(home-page "https://duplicity.gitlab.io/duplicity-web/")
(synopsis "Encrypted backup using rsync algorithm")
(description
- branch master updated (857f501750 -> b150c546b0), guix-commits, 2023/11/22
- 04/14: gnu: tilda: Run guix style on tilda@1.5.4, guix-commits, 2023/11/22
- 03/14: gnu: tilda: Fix lint error by updating input list format for v1.5.4, guix-commits, 2023/11/22
- 01/14: style: ‘guix style -f’ warns when passed zero arguments., guix-commits, 2023/11/22
- 02/14: gnu: tilda: Add version 1.6-alpha with D-Bus support, guix-commits, 2023/11/22
- 07/14: gnu: babeltrace: Do not install bindings as egg., guix-commits, 2023/11/22
- 08/14: gnu: Add babeltrace/dev., guix-commits, 2023/11/22
- 10/14: gnu: duplicity: Use ‘search-input-file’., guix-commits, 2023/11/22
- 11/14: gnu: duplicity: Remove input labels and use gexps.,
guix-commits <=
- 12/14: read-print: Properly indent ‘parameterize’., guix-commits, 2023/11/22
- 09/14: gnu: duplicity: Update to 2.1.4., guix-commits, 2023/11/22
- 05/14: gnu: Add findimagedupes., guix-commits, 2023/11/22
- 06/14: gnu: Add clifm., guix-commits, 2023/11/22
- 13/14: gnu: cuirass: Update to bdc1f9f., guix-commits, 2023/11/22
- 14/14: git: Shell out to ‘git gc’ when necessary., guix-commits, 2023/11/22