From patchwork Sun Dec 19 19:35:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35480 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 9A78827BBEA; Sun, 19 Dec 2021 19:36:21 +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 5B02C27BBE9 for ; Sun, 19 Dec 2021 19:36:21 +0000 (GMT) Received: from localhost ([::1]:35588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz1yl-0004qS-G4 for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 14:36:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz1yU-0004q4-4w for guix-patches@gnu.org; Sun, 19 Dec 2021 14:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz1yT-0006Ar-Rq for guix-patches@gnu.org; Sun, 19 Dec 2021 14:36:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mz1yT-0004P4-Q1 for guix-patches@gnu.org; Sun, 19 Dec 2021 14:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52659] [PATCH v3 1/2] 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 19:36:01 +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.163994255116901 (code B ref 52659); Sun, 19 Dec 2021 19:36:01 +0000 Received: (at 52659) by debbugs.gnu.org; 19 Dec 2021 19:35:51 +0000 Received: from localhost ([127.0.0.1]:48195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1yC-0004OP-8X for submit@debbugs.gnu.org; Sun, 19 Dec 2021 14:35:51 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:34849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1y8-0004O4-VT for 52659@debbugs.gnu.org; Sun, 19 Dec 2021 14:35:43 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 8EDF832009BE; Sun, 19 Dec 2021 14:35:34 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 19 Dec 2021 14:35:34 -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=aJXPBk36HbAOBh3vzQXl/1OM3DVcvEag5ikTttN /7X1jgAK64k/h3yn7vDcz0bGNx2iHM2ySwOCdM6ob7YWVMvMi0WLYXlBLCx+R23V psJyADG4340j/6kQm0lPjbJSAIXUv6uRuDDIg6ax5Zy3+Ccsa0G+pWFTpAumx7OA 6xak= 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=bdGG4adGOLgxXgF5Stxze3 47Wr+OiUxinVJ+tRqZQA4G08O5DNdi7NXRBCLqQ9w2E4S8JUsB2jHEN2wq5j/LbA GRfXbY55axFejy0p+F3MEHr5BujTtGaZ6lARRgJyd9K+/nHDwOBPoitT6H46/ebC Q6/8l+SH0Aimw8Vdqt2AJZGdJdgOD35zvLk2UWioMMnvaRvL+FhG86TjBGHkY+uy 3ubwHyv8NOslkEJiLHJsQRnfmJsXgLz8034JAmI5nQJ5d2ME8btaejmJ+Ghxltkh BfVhw+TGwxjohHozrsSMwRaVpl0FERpQl7hqD0Bi0rh5HqjH4vQjGaNQiWxwE/JA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddttddguddvkecutefuodetggdotefrod 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 14:35:33 -0500 (EST) From: Leo Famulari Date: Sun, 19 Dec 2021 14:35:27 -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 19:35:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35481 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 F0DF927BBEA; Sun, 19 Dec 2021 19:36: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 6A8B627BBE9 for ; Sun, 19 Dec 2021 19:36:23 +0000 (GMT) Received: from localhost ([::1]:35596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz1yo-0004qj-FN for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 14:36:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz1yU-0004qC-HA for guix-patches@gnu.org; Sun, 19 Dec 2021 14:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz1yU-0006Ax-8b for guix-patches@gnu.org; Sun, 19 Dec 2021 14:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mz1yU-0004PB-6d for guix-patches@gnu.org; Sun, 19 Dec 2021 14:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52659] [PATCH v3 2/2] gnu: Add Vorta. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 19:36: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.163994255516911 (code B ref 52659); Sun, 19 Dec 2021 19:36:02 +0000 Received: (at 52659) by debbugs.gnu.org; 19 Dec 2021 19:35:55 +0000 Received: from localhost ([127.0.0.1]:48197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1yJ-0004OY-2R for submit@debbugs.gnu.org; Sun, 19 Dec 2021 14:35:55 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:47315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz1y9-0004O6-L4 for 52659@debbugs.gnu.org; Sun, 19 Dec 2021 14:35:43 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id E25233200BD2; Sun, 19 Dec 2021 14:35:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 19 Dec 2021 14:35: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=mG5/8ZC96g1JhpKFpfDt0tdBUc9PmjE6MnqG9SjgbXA=; b=sjsIMIvux7u3 Ij3l2s/kb0BZvcYPkdyWORMTJ67Hmwxthv+ZkYdE+JhLgjNR1ZscyexVxKw0DqeO oB2CUKTq+NTW+KIIWRBvKjV/RtRJFvfK5JSHFyI0npvOdIqNpzrj5QmK4ijKFmcI 6dYsrd/vZXeSTlaEj74I4FQkKJ31sKE= 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=mG5/8ZC96g1JhpKFpfDt0tdBUc9PmjE6MnqG9Sjgb XA=; b=dDxB59SlTuawdmZMtO5/26Kwz5Q0jihxvi8kgNZKYmnW+F7P0RSK5V/tb 57Nhj0waaC7OaDv1TsnacQkUyJEn7mFccJv4fPm47W2gQ+qU3cUpGhIBkvTFDt2A 8L1V2LG6ceJgzeYaSq6OvOiI1VLJgoHSqFYwVZQEUXmGTJUfWtjljdxHIKdCEUUe 2+/ICp7Fu4pL1FfTKksWuuog4Nd8cs20+SAGxiqe+BYIciaBThhGwgKojuutHt+u ySSyvpvADrewu0r4ASDDr+zAgJyu9xYJsv9SBT9fmW488l75NVsBMvQ52GF50mPu oeEoDPXSlFLI92zRkiXdwJrn8Gtkw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddttddguddvkecutefuodetggdotefrod 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 14:35:35 -0500 (EST) From: Leo Famulari Date: Sun, 19 Dec 2021 14:35:28 -0500 Message-Id: <5b38cd43b84536e5ec9879ce036625700e783d0d.1639942526.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 (vorta): New variable. --- gnu/packages/backup.scm | 67 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index fdb84898bb..2a47b759d7 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 @@ -40,6 +40,7 @@ (define-module (gnu packages backup) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix utils) @@ -47,6 +48,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 +78,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 +1186,63 @@ (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 + (list + #: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 + (add-after 'unpack 'patch-borg-path + (lambda* (#:key inputs #:allow-other-keys) + (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 _ + (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 borg + 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+)))