From patchwork Wed Nov 1 18:45:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Pieper X-Patchwork-Id: 55827 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AC44B27BBEA; Thu, 2 Nov 2023 12:46:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B127527BBE9 for ; Thu, 2 Nov 2023 12:46:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyX5J-0007OL-Cs; Thu, 02 Nov 2023 08:46:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyQe1-0007mp-0e for guix-patches@gnu.org; Thu, 02 Nov 2023 01:53:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyQe0-0008Vy-Oz for guix-patches@gnu.org; Thu, 02 Nov 2023 01:53:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyQeZ-0003An-GA for guix-patches@gnu.org; Thu, 02 Nov 2023 01:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66891] [PATCH] Update duplicity to 2.1.4. Resent-From: Jonathan Pieper Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 05:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66891 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66891@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169890442612138 (code B ref -1); Thu, 02 Nov 2023 05:54:03 +0000 Received: (at submit) by debbugs.gnu.org; 2 Nov 2023 05:53:46 +0000 Received: from localhost ([127.0.0.1]:53681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyQeF-00039b-50 for submit@debbugs.gnu.org; Thu, 02 Nov 2023 01:53:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyGF1-0004NK-Hx for submit@debbugs.gnu.org; Wed, 01 Nov 2023 14:47:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyGEC-0007P6-PV for guix-patches@gnu.org; Wed, 01 Nov 2023 14:46:10 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1qyGE9-0001sD-7t for guix-patches@gnu.org; Wed, 01 Nov 2023 14:46:08 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4SLGDS0N1Nz9t0C for ; Wed, 1 Nov 2023 19:46:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1698864360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgA0yhsvHkHuYkW7O5aglNrAJCwgU81XgNa4qvvsPYA=; b=sAQ8kVnkYY7iTYU9SxoGDvs5hgEnf1vieBNCcE6kY2tc1iLJXdCDxwLOLJO2P30VVd4tup Wckq1BzINminkbM+wgKv5G/TMnvqi7vKT/qEoUlnNvTMAoqWd9kgr9DqmAfBbQ9wuGsuO2 8EMKqV4F2qYDLKY469vLk2VLiasDTy2iMxZBvvzUvkCsaIGwXe4LF24bzjExncfBtYUtBM QgHFAckBBRhEEekofrCJvH39OicypsV90jCQkK9nEf2W9WBWVjFIL0kOa/faymKUVUq3/g bf30aIwAcYSi1PcCIvw0NIIdGC63yReISAIOxTdMX669ugMF+qK80WjhCXrbPw== Message-ID: <0dfeb94d-d8ce-43d2-08cd-08fd31e6c86c@mailbox.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1698864357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgA0yhsvHkHuYkW7O5aglNrAJCwgU81XgNa4qvvsPYA=; b=lgmqNTYN9F1ouqqdGI+c99Yaea2nTytG0cbBO7FNQMCzmCwnvuZVWevkS05Ovf/LXIGTWM fUTqDPp2fCmjvrqr75A8gZVkDXc2lNUQeyOTSjxzNdBKXWwtoaAur2Uzz24GQ5tx/EyZWD yVRT24XeQznbKtdZ2t82gBgzA5dL3sl0FeN9/fk0VyYO0rePZ4rw2DRueT+2/jcaYbdgpw QbFr8eUI/ZWNCIG+2XAQba4pai+Yj5pM6+uaY4N2hVEZcD+UV3+aJ0kGuPVULQtUuC7FnM sdL9ya2ighss0ggiUNpU5RyeCTz38zNwLIh8ZNj5znTvcSES3cYZBhth+IIGwA== Date: Wed, 1 Nov 2023 19:45:57 +0100 MIME-Version: 1.0 Content-Language: en-US X-MBO-RS-META: rkzwhee93hjx4qebk1pfgtdfn5d9uj5m X-MBO-RS-ID: 0c5b1415c3aba21d4f1 Received-SPF: pass client-ip=80.241.56.171; envelope-from=jpieper@mailbox.org; helo=mout-p-201.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 02 Nov 2023 01:53:40 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 02 Nov 2023 08:46:03 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Pieper X-ACL-Warn: , Jonathan Pieper via Guix-patches X-Patchwork-Original-From: Jonathan Pieper via Guix-patches via From: Jonathan Pieper Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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