all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Jonathan Pieper via Guix-patches via <guix-patches@gnu.org>
To: 66891@debbugs.gnu.org
Subject: [bug#66891] [PATCH] Update duplicity to 2.1.4.
Date: Wed, 1 Nov 2023 19:45:57 +0100	[thread overview]
Message-ID: <0dfeb94d-d8ce-43d2-08cd-08fd31e6c86c@mailbox.org> (raw)

This Patch updates duplicity to the newest version. Launchpad only 
offers versions up to 1.2.3 so the origin record needs to be updated to 
fetch from gitlab.

fix-version is needed as the $version variable does not get updated when 
calling setup.py install.

---
  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..bbf8fbdcb5 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") ,version))))
           (add-before 'check 'set-up-tests
             (lambda* (#:key inputs #:allow-other-keys)
               (setenv "HOME" (getcwd))   ; gpg needs to write to $HOME
-- 
2.41.0






             reply	other threads:[~2023-11-02 12:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-01 18:45 Jonathan Pieper via Guix-patches via [this message]
2023-11-23  9:55 ` bug#66891: [PATCH] Update duplicity to 2.1.4 Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0dfeb94d-d8ce-43d2-08cd-08fd31e6c86c@mailbox.org \
    --to=guix-patches@gnu.org \
    --cc=66891@debbugs.gnu.org \
    --cc=jpieper@mailbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.