From f7995b6644c8ac8af7209a59e595510aa383f6a2 Mon Sep 17 00:00:00 2001 From: Jonathan Pieper Date: Wed, 1 Nov 2023 19:45:57 +0100 Subject: gnu: duplicity: Update to 2.1.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/backup.scm (duplicity): Update to 2.1.4. [source]: Switch to ‘git-fetch’ and change URL. [arguments]: Add ‘fix-version’ phase. Signed-off-by: Ludovic Courtès Change-Id: I0a19d19741f665ddb84da83d4bbefc959290fe42 --- gnu/packages/backup.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 12c4a45b9d..f10c7914d5 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -104,16 +104,16 @@ (define-module (gnu packages backup) (define-public duplicity (package (name "duplicity") - (version "0.8.21") + (version "2.1.4") (source (origin - (method url-fetch) - (uri (string-append "https://code.launchpad.net/duplicity/" - (version-major+minor version) - "-series/" version "/+download/duplicity-" - version ".tar.gz")) - (sha256 - (base32 "0ld4bhsi6iv4bvy99pblbr7vlwy9jbgfd6flyvb8qwbl8rvadzjp")))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/duplicity/duplicity") + (commit (string-append "rel." version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) ; for msgfmt @@ -155,6 +155,10 @@ (define-public duplicity (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 -- cgit v1.2.3 From ad40a5d0e23fd038780ee87ceb4b4363c575f018 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Nov 2023 16:15:16 +0100 Subject: gnu: duplicity: Use ‘search-input-file’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/backup.scm (duplicity)[arguments]: In ‘use-store-file-names’ phase, use ‘search-input-file’. Change-Id: I4b66a22283fc6e426377ad9f4f4c451598eb74e0 --- gnu/packages/backup.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f10c7914d5..5aa0d5688f 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -146,12 +146,14 @@ (define-public duplicity (lambda* (#:key inputs #:allow-other-keys) (substitute* "duplicity/gpginterface.py" (("self.call = u'gpg'") - (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/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'" - (assoc-ref inputs "dbus") - "/bin/dbus-launch']"))) + (search-input-file inputs "/bin/dbus-launch") + "']"))) (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))))) -- cgit v1.2.3 From 9363ec208b892e3ea43eb573ea4d41d8e269044a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Nov 2023 16:28:02 +0100 Subject: 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(-) (limited to 'gnu/packages/backup.scm') 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 @@ (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,36 +137,41 @@ (define-public duplicity 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 -- cgit v1.2.3