From f7995b6644c8ac8af7209a59e595510aa383f6a2 Mon Sep 17 00:00:00 2001 From: Jonathan Pieper Date: Wed, 1 Nov 2023 19:45:57 +0100 Subject: [PATCH] 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(-) 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-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 @@ (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