From patchwork Sun Dec 19 18:56:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35476 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 58CBF27BBE9; 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 CB9C427BBEA for ; Sun, 19 Dec 2021 18:57:13 +0000 (GMT) Received: from localhost ([::1]:56358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz1Mv-0005fH-1D for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 13:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz1Ml-0005ee-0b for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz1Mk-0001xN-OE for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mz1Mk-0003Pl-Ij for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52659] [WIP v2 1/4] gnu: Add python-pytest-faulthandler. References: In-Reply-To: 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.163994021013085 (code B ref 52659); Sun, 19 Dec 2021 18:57:02 +0000 Received: (at 52659) by debbugs.gnu.org; 19 Dec 2021 18:56:50 +0000 Received: from localhost ([127.0.0.1]:48140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MR-0003Ol-Vi for submit@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:50 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:51867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MP-0003OJ-4S for 52659@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:42 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id D3E123200993; Sun, 19 Dec 2021 13:56:34 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 19 Dec 2021 13:56:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=AxU5uQ+X7BYEGD9lXUxgyFm rJClKQW/JaeI1+d3ZCcE=; b=osWB7+tzjx27WPJvodhtxPHsEHhAnfb1Wg6ORUj H73hB/tGZJPrjWSC1TeUvqW6pk/W9/VFlkPNHVk7C8ICLXpl/sPS4iCS8a1nBS9s TFd+voNKlgKTxR9aftwHqWkKaYaCt1yhRMbasc+RcaUx0byu5ohJY3NiU8vwKrX0 TLo0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=AxU5uQ +X7BYEGD9lXUxgyFmrJClKQW/JaeI1+d3ZCcE=; b=I/5wO1bF0z0LuWfNvH9gN+ TE5Qd1wtbXoMDuFUrzd1yJSgHyXRpSZuBhuuWrHvKkmXV9T8Ce6IKWuypvsvXF5f zmze1SLB25DV3vi8aqarTzYZjvIapAmFQTLm3WXxAuNdfiE0WJoZ/plE60rzVjrI eqfJXBcsGVdWFXH0FTXuHgIc2HQ3WNZ0gJOFQ6UxDLag/ZqEF7rKhZ10jP3Af608 MM6ICj0G9DdyVvMFt7r+ti0K9shlE6LJmqJy4iW+bP3iDanPXNoZUq3WeuLIEDAm UaDr03pKJNTjpySL8HwQeB0J7XTSlncwMrIPmwWvzIdmtDGBiuAz+LlVssnlNnig == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddttddguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepfeelfefhudetheetteeuueetheffgf fhieeihfdvgfeiudeujeegvedukefgffehnecuffhomhgrihhnpehgihhthhhusgdrtgho mhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <52659@debbugs.gnu.org>; Sun, 19 Dec 2021 13:56:34 -0500 (EST) From: Leo Famulari Date: Sun, 19 Dec 2021 13:56:23 -0500 Message-Id: X-Mailer: git-send-email 2.34.0 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/check.scm (python-pytest-faulthandler): New variable. --- gnu/packages/check.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0a90a3b167..e3bb53dae0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2016, 2017 Leo Famulari +;;; Copyright © 2016, 2017, 2021 Leo Famulari ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016 Roel Janssen @@ -1481,6 +1481,26 @@ (define-public python-pytest-forked side-effects (such as setting environment variables).") (license license:expat))) +;; This package is included in Pytest >=5.0. +(define-public python-pytest-faulthandler + (package + (name "python-pytest-faulthandler") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-faulthandler" version)) + (sha256 + (base32 + "1r8ssxfdib2d2mblmnm34q84lza5d8cq5n5p3sl4sd5chz7bnwpd")))) + (build-system python-build-system) + (native-inputs + (list python-pytest python-setuptools-scm)) + (home-page "https://github.com/pytest-dev/pytest-faulthandler") + (synopsis "Pytest plugin that activates the faulthandler module for tests") + (description "This package provides a pytest plugin that automatically +enables the @code{faulthandler} module during tests.") + (license license:expat))) + (define-public python-scripttest (package (name "python-scripttest") From patchwork Sun Dec 19 18:56:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35478 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 4E33B27BBEA; Sun, 19 Dec 2021 18:57:23 +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 BE95F27BBE9 for ; Sun, 19 Dec 2021 18:57:22 +0000 (GMT) Received: from localhost ([::1]:57010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz1N3-00066k-Vl for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 13:57:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz1Ml-0005f7-Mc for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz1Ml-0001xZ-EF 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 1mz1Ml-0003Q0-Cv for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52659] [WIP v2 2/4] gnu: Add Vorta. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 18:57:03 +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.163994021613104 (code B ref 52659); Sun, 19 Dec 2021 18:57:03 +0000 Received: (at 52659) by debbugs.gnu.org; 19 Dec 2021 18:56:56 +0000 Received: from localhost ([127.0.0.1]:48146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MZ-0003P8-3v for submit@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:56 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:60867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MP-0003OL-Sx for 52659@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:43 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 312BF3200A6A; Sun, 19 Dec 2021 13:56:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 19 Dec 2021 13:56:36 -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-type:content-transfer-encoding; s=mesmtp; bh=a7+zLKOK9lf9CFapsRWkbz/mIDphCHArIxgieg/dMwM=; b=Vtqpf6qCwz00 P0TTwbb5D0ACCczxeZ2p51Ks9RJ23j1Us8hsoQpoek/cw7T0lu8BIZoHpJCtdW42 iRPIfdfkpls/JTktDIIuHoc69J2EisVO17A6CvYEucBgCL5nOIyzLUqEJL+iv9// YB8jhYnsk4AB3rdkAtbYAPk93F1cs7E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :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=a7+zLKOK9lf9CFapsRWkbz/mIDphCHArIxgieg/dM wM=; b=Bp345jydJuMA/DdcGzLAM+ptvKToT3ueOD0ZB4qryBAFxGVDMNv30W99k RPnvnWIIwNQRabLtC16uaLdtQKwok/7Ft2gXizjEK3hncWrFnSb95LemwpYghVhz hjAA7rbCA0eBx0wajULMxr+klkfZJKbMSRSvF+4l33eqbRbwH50NNqgBQJpsOZNc qdaUNn16Df69alrMaCGYvTNXIgw4kI/p2K/CyKI76yrDKRFEHaYN4pz/gkHWdaAY 9UTqK8wws4q6r2zq5ApGX8xCKzLkG7Y491DfRaGVeW0FmxI1oPWhAOUnvHUwoCur oMvrE/gr0pEMKcRLa5wpAfzAfV/vQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddttddguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhu lhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephffgfedutdefudeuhfdtleegie etfeeuueehudfhgefgfffgveehueefvdegjedvnecuffhomhgrihhnpehgihhthhhusgdr tghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <52659@debbugs.gnu.org>; Sun, 19 Dec 2021 13:56:35 -0500 (EST) From: Leo Famulari Date: Sun, 19 Dec 2021 13:56:24 -0500 Message-Id: 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 (vorta): New variable. --- gnu/packages/backup.scm | 58 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index fdb84898bb..5ce6e10bab 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2020 Eric Bavier ;;; Copyright © 2014 Ian Denhardt -;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2021 Leo Famulari ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2021 Arun Isaac @@ -47,6 +47,7 @@ (define-module (gnu packages backup) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages autotools) @@ -76,12 +77,15 @@ (define-module (gnu packages backup) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages rsync) #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages xml)) @@ -1181,3 +1185,55 @@ (define-public borgmatic your databases too. Monitor it all with integrated third-party services. borgmatic is powered by borg.") (license license:gpl3+))) + +(define-public vorta + (package + (name "vorta") + (version "0.8.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "vorta" version)) + (sha256 + (base32 + "1cl7kyh14h38xavbq23b8ifvk8abkiqdkpgaxfxvd223fm02zz26")))) + (build-system python-build-system) + (arguments + `(#:imported-modules ((guix build qt-utils) + (guix build cmake-build-system) + (guix build qt-build-system) + ,@%python-build-system-modules) + #:modules ((guix build utils) + (guix build python-build-system) + ((guix build qt-build-system) #:prefix qt:)) + #:phases + (modify-phases %standard-phases + ;; XXX This phase tries to write to $HOME + (add-before 'sanity-check 'set-HOME + (lambda _ + (setenv "HOME" "/tmp"))) + ;; Otherwise, the user interface's icons will be missing. + (add-after 'wrap 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (native-inputs + (list python-pytest-mock + python-pytest-qt + python-pytest-runner + python-setuptools-git)) + (inputs + (list python-appdirs + python-dateutil + python-keyring + python-paramiko + python-peewee + python-psutil + python-pyqt + python-secretstorage + ;; XXX This is included so that the qt-wrap phase picks it up. + qtsvg)) + (home-page "https://github.com/borgbase/vorta") + (synopsis "Graphical backup client based on BorgBackup") + (description "Vorta is a graphical backup client based on the Borg backup +tool. It supports the use of remote backup repositories. It can perform +scheduled backups, and has a graphical tool for browsing and extracting the Borg +archives.") + (license license:gpl3+))) 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 From patchwork Sun Dec 19 18:56:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35477 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 AC74627BBEA; 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 7CE5327BBE9 for ; Sun, 19 Dec 2021 18:57:14 +0000 (GMT) Received: from localhost ([::1]:56404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz1Mv-0005i0-LI for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 13:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz1Mm-0005fF-5T for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz1Ml-0001xf-T8 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 1mz1Ml-0003Q7-Ra for guix-patches@gnu.org; Sun, 19 Dec 2021 13:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52659] [WIP v2 4/4] WIP: Vorta: Use gexps instead of (assoc-ref ...) Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 18:57:03 +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.163994021613112 (code B ref 52659); Sun, 19 Dec 2021 18:57:03 +0000 Received: (at 52659) by debbugs.gnu.org; 19 Dec 2021 18:56:56 +0000 Received: from localhost ([127.0.0.1]:48148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1Me-0003PJ-DK for submit@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:56 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:48295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1MS-0003OR-HQ for 52659@debbugs.gnu.org; Sun, 19 Dec 2021 13:56:44 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id CCD753200AF0; Sun, 19 Dec 2021 13:56:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 19 Dec 2021 13:56:39 -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=+yZufvHJgU BdrJGGfXg0fgo9q1viOgVuHvB94uMrDMY=; b=JV/usUXpdrk0YuN05mOh0KoSY3 TO+M19b24L41VY4wQL4WlWqabKVfGnBxmFjv4r3ahHvby60J1yz66tJsa+rPQfun dJHNsveBuaPwI7KlDYi523pfzbZFRQy77eBRiG3BzDiaTM+MG+KPmS9n9fQBuOt+ 00lggofJYk4KQDHbw= 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=+yZufvHJgUBdrJGGfXg0fgo9q1viOgVuHvB94uMrDMY=; b=PUB6fA6K oayTV5lQasiC6U3IjstPYfinNIeMbpKkT6zD9BHdXxwq87SsajyAfKQXKNuJq6xF 2tifC36+sfaLbTuhr/2rmqdCyJcSy3kDYbjV47qhN+J1NAMpjtRQqbQ880K1L0oA o1SxClDaeDkzIgOFgSWEg+vV26Rm/LXzkeNfGaSVK1PtaCfASuZq6+5pUVVV/CGC ATEDw0hhl+e/A6yL5zVd1Bjj8aSWcbph2oDFyPXWQt67/MZ1iQ6sqnerIZfhzW0X v2UCJKp2fPMG+Fc8sjwflxnqWKfMlOr5Xklh2lZ6Oes9+tXACH10MXVPUabexa9e Yl+XvCZbKX1RbQ== 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:38 -0500 (EST) From: Leo Famulari Date: Sun, 19 Dec 2021 13:56:26 -0500 Message-Id: <62457430763f08a6e6355c1a3fa134682cd2069b.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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index e2a37d182b..16353682dd 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1209,11 +1209,10 @@ (define-public vorta (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 "')")))))) + (substitute* "src/vorta/borg/borg_job.py" + (("which\\('borg'\\)") + (string-append "which('" ,#$(this-package-input borg) + "/bin/borg')"))))) ;; XXX This phase tries to write to $HOME (add-before 'sanity-check 'set-HOME (lambda _