me
/
guix
Archived
1
0
Fork 0

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
master
Ludovic Courtès 2023-11-22 16:28:02 +01:00
parent ad40a5d0e2
commit 9363ec208b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 48 additions and 45 deletions

View File

@ -116,22 +116,20 @@
(base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng")))) (base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) ; for msgfmt (list gettext-minimal ; for msgfmt
("util-linux" ,util-linux) ; setsid command, for the tests util-linux ; setsid command, for the tests
("par2cmdline" ,par2cmdline) par2cmdline
("python-fasteners" ,python-fasteners) python-fasteners
("python-future" ,python-future) ; for tests python-future ; for tests
("python-paramiko" ,python-paramiko) python-paramiko
("python-pexpect" ,python-pexpect) python-pexpect
("python-pytest" ,python-pytest) python-pytest
("python-pytest-runner" ,python-pytest-runner) python-pytest-runner
("python-setuptools-scm" ,python-setuptools-scm) python-setuptools-scm
("tzdata" ,tzdata-for-tests) tzdata-for-tests
("mock" ,python-mock))) python-mock))
(propagated-inputs (propagated-inputs
`(("lockfile" ,python-lockfile) (list python-lockfile python-pygobject python-urllib3))
("pygobject" ,python-pygobject)
("urllib3" ,python-urllib3)))
(inputs (inputs
(list dbus ; dbus-launch (Gio backend) (list dbus ; dbus-launch (Gio backend)
librsync librsync
@ -139,36 +137,41 @@
gnupg ; gpg executable needed gnupg ; gpg executable needed
util-linux)) ; for setsid util-linux)) ; for setsid
(arguments (arguments
`(#:test-target "test" (list #:test-target "test"
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'use-store-file-names (add-before 'build 'use-store-file-names
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "duplicity/gpginterface.py" (substitute* "duplicity/gpginterface.py"
(("self.call = u'gpg'") (("self.call = u'gpg'")
(string-append "self.call = '" (string-append "self.call = '"
(search-input-file inputs "/bin/gpg") (search-input-file inputs
"'"))) "/bin/gpg")
(substitute* "duplicity/backends/giobackend.py" "'")))
(("subprocess.Popen\\(\\[u'dbus-launch'\\]") (substitute* "duplicity/backends/giobackend.py"
(string-append "subprocess.Popen([u'" (("subprocess.Popen\\(\\[u'dbus-launch'\\]")
(search-input-file inputs "/bin/dbus-launch") (string-append "subprocess.Popen([u'"
"']"))) (search-input-file inputs
(substitute* '("testing/functional/__init__.py" "/bin/dbus-launch") "']")))
"testing/overrides/bin/lftp") (substitute* '("testing/functional/__init__.py"
(("/bin/sh") (which "sh"))))) "testing/overrides/bin/lftp")
(add-before 'build 'fix-version (("/bin/sh")
(lambda _ (which "sh")))))
(substitute* "duplicity/__init__.py" (add-before 'build 'fix-version
(("\\$version") ,(package-version this-package))))) (lambda _
(add-before 'check 'set-up-tests (substitute* "duplicity/__init__.py"
(lambda* (#:key inputs #:allow-other-keys) (("\\$version")
(setenv "HOME" (getcwd)) ; gpg needs to write to $HOME #$(package-version this-package)))))
(setenv "TZDIR" ; some timestamp checks need TZDIR (add-before 'check 'set-up-tests
(search-input-directory inputs "share/zoneinfo")) (lambda* (#:key inputs #:allow-other-keys)
;; Some things respect TMPDIR, others hard-code /tmp, and the (setenv "HOME"
;; defaults don't match up, breaking test_restart. Fix it. (getcwd)) ; gpg needs to write to $HOME
(setenv "TMPDIR" "/tmp")))))) (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/") (home-page "https://duplicity.gitlab.io/duplicity-web/")
(synopsis "Encrypted backup using rsync algorithm") (synopsis "Encrypted backup using rsync algorithm")
(description (description