From patchwork Sun Dec 19 18:56:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35475 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 1A0AA27BBEB; Sun, 19 Dec 2021 18:57:14 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 B7C5927BBE9 for ; Sun, 19 Dec 2021 18:57:13 +0000 (GMT) Received: from localhost ([::1]:56356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz1Mu-0005fG-PZ for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 13:57:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz1Ml-0005el-B0 for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz1Ml-0001xT-0g for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mz1Mk-0003Ps-Vx for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52659] [WIP v2 3/4] Vorta: patch Borg invocation Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 18:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52659 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52659@debbugs.gnu.org Received: via spool by 52659-submit@debbugs.gnu.org id=B52659.163994021113093 (code B ref 52659); Sun, 19 Dec 2021 18:57:02 +0000 Received: (at 52659) by debbugs.gnu.org; 19 Dec 2021 18:56:51 +0000 Received: from localhost ([127.0.0.1]:48144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MY-0003P0-Pb for submit@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:51 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:47039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MR-0003OP-9I for 52659@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:43 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 8F27732009E5; Sun, 19 Dec 2021 13:56:37 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 19 Dec 2021 13:56:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=xx9uBgW0Na QNoKpm5FxmbbLPF/h4T12mE6GxO1E0jrM=; b=MLoReCyyejCGcMXrHCF2k8Cz96 Dz7BXWpDsX5QECUbnqHpIbDYtXkUjxaRkCgAyomdTJKScYVkLXrsbEpXzU4KeieV MgmiM7mqIP0fZttkd2xd8e02OEexESTGV85Sm9J+7Nw0bCkNMITcXzvgLBu6aZos 1r2nMXXYDocEPlbXQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=xx9uBgW0NaQNoKpm5FxmbbLPF/h4T12mE6GxO1E0jrM=; b=VT1DwQQu R2oeCd50Q+W/5YVuFWql54ABuvhzmXboEHd9iFhFucVnSraTKeed/doMphTSglwX Og2J5932sKB25j/2fOSw86PGEKM6Y3K4+h7nGNwISfYEbSFEYzdi/SY5vbvanVGQ 3vgLh401qt2aDXMdVOvr/ZCDP9bt1FzPmvQ+Nqmj7ZSTFoJyv2/gwsuBAsnGSv1s lTFkMdhcxMqpznnMPA2CklqLXM5oXXtyXzhOs58NzvBEuydjd+exc7CML2gBhcfH J0a89I4h3dWll0N/pOtWrsCCxqNE27Q0klQMj1OiRcXyQ8nEccvCfoQh4eKV9gyX QyDb38qn7mLBPQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddttddguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpefhgeegteeitddvudduveeuhedvhe fhfeehgfehvdfhudegueekhedvhfffhffhgeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <52659@debbugs.gnu.org>; Sun, 19 Dec 2021 13:56:36 -0500 (EST) From: Leo Famulari Date: Sun, 19 Dec 2021 13:56:25 -0500 Message-Id: <9314f5c5a1726db8147dd70d1359baa77a03323c.1639940185.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/backup.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5ce6e10bab..e2a37d182b 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1207,6 +1207,13 @@ (define-public vorta ((guix build qt-build-system) #:prefix qt:)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-borg-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((borg (string-append (assoc-ref inputs "borg") + "/bin/borg"))) + (substitute* "src/vorta/borg/borg_job.py" + (("which\\('borg'\\)") + (string-append "which('" borg "')")))))) ;; XXX This phase tries to write to $HOME (add-before 'sanity-check 'set-HOME (lambda _ @@ -1220,7 +1227,8 @@ (define-public vorta python-pytest-runner python-setuptools-git)) (inputs - (list python-appdirs + (list borg + python-appdirs python-dateutil python-keyring python-paramiko