ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: duplicity: Remove input labels and use gexps.

Browse source 
* gnu/packages/backup.scm (duplicity)[native-inputs, propagated-inputs]:
Remove labels.
[arguments]: Use labels.

Change-Id: I08c7d20cca5d2f96edf9da77df9a1a3a8e5c2e5b
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/backup.scm
View file

@ -116,22 +116,20 @@ (define-public duplicity
(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,33 +137,38 @@ (define-public duplicity
gnupg ; gpg executable needed
util-linux)) ; for setsid
(arguments
`(#:test-target "test"
(list #:test-target "test"
#:phases
(modify-phases %standard-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")
(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")
"']")))
(search-input-file inputs
"/bin/dbus-launch") "']")))
(substitute* '("testing/functional/__init__.py"
"testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))))
(("/bin/sh")
(which "sh")))))
(add-before 'build 'fix-version
(lambda _
(substitute* "duplicity/__init__.py"
(("\\$version") ,(package-version this-package)))))
(("\\$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 "HOME"
(getcwd)) ; gpg needs to write to $HOME
(setenv "TZDIR" ; some timestamp checks need TZDIR
(search-input-directory inputs "share/zoneinfo"))
(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"))))))