From patchwork Wed Jan 26 19:36:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 36827 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 BA20927BBEA; Wed, 26 Jan 2022 19:41:33 +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 817E127BBE9 for ; Wed, 26 Jan 2022 19:41:33 +0000 (GMT) Received: from localhost ([::1]:42352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCoAe-000410-My for patchwork@mira.cbaines.net; Wed, 26 Jan 2022 14:41:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCo6L-0008UH-8l for guix-patches@gnu.org; Wed, 26 Jan 2022 14:37:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCo6I-000827-FE for guix-patches@gnu.org; Wed, 26 Jan 2022 14:37:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCo6I-00023f-Dc for guix-patches@gnu.org; Wed, 26 Jan 2022 14:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53558] [PATCH 1/3] gnu: Add python-msgpack-1.0.2. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jan 2022 19:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53558 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53558@debbugs.gnu.org Received: via spool by 53558-submit@debbugs.gnu.org id=B53558.16432258207896 (code B ref 53558); Wed, 26 Jan 2022 19:37:02 +0000 Received: (at 53558) by debbugs.gnu.org; 26 Jan 2022 19:37:00 +0000 Received: from localhost ([127.0.0.1]:53597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCo6F-00023C-Bs for submit@debbugs.gnu.org; Wed, 26 Jan 2022 14:36:59 -0500 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:34589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCo67-00022c-3Y for 53558@debbugs.gnu.org; Wed, 26 Jan 2022 14:36:54 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 31A8B2B00158; Wed, 26 Jan 2022 14:36:44 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 26 Jan 2022 14:36:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; bh=stevday8z89r1h5IXlDYzFtZFjji8VwcmUvAbef643Q=; b=K9 L3OTHuOMvB9ckUnwnfx3gKcjZbKE3Jz71WBTqm6M62G0vgzD9p8LXB33pDbSvpur ESbEa5phQ38luLHes0fVG2eKpK39qdyX7kG/V2NSZKeXeiVgoVQEkxXwoCRs/89E 7gDVqwt6zSZPxcYObyta2K0woyVREU803PW2GnHYk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=stevday8z89r1h5IXlDYzFtZFjji8 VwcmUvAbef643Q=; b=Z3d+E6cQN5gXneXvG7xuuGQPEiBNgBVfXYyCf49AUSGxU F+gkUCpvl1pxmwkurtfEyWGwqmxOw6IGMfoukb5KjDN3LyEFoSiRs3ywvM6zCdOF ZsuW5asziCJDXJF5brLiDXbdGs6xM8mlUSpagwLJtzJQGhcXyJY2ZuelmklYbzl0 M+sWfUo4qdQvG/op3ZOnm1JWutzfFHAGv/x7i0gCje3pBqoKE9Jan0Rtx6whGe9f Lh/kfKivhElLknUGxccWmJk48S0nA4pwrRXYrYbIkf6nb6TJ0mVmP8NaW7l4TIkf DkueiQPDW2WJM/L3v/FxC/rhqDfSHqXEnhGvxBSig== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfedugdduvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgovfgvgihtqfhnlhihqddqufhprghmsghothdqkg egvdduqdehudculdeftddtmdenucfjughrpefhvffufffkofgggfestdekredtredttden ucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrg hmvgeqnecuggftrfgrthhtvghrnhepieehffeliedtgedvkefffeeiuefhteeiueeuvdeh ueekteeiudehgeekledukeeknecuffhomhgrihhnpehphihpihdrohhrghdpghhnuhdroh hrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehl vghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <53558@debbugs.gnu.org>; Wed, 26 Jan 2022 14:36:43 -0500 (EST) From: Leo Famulari Date: Wed, 26 Jan 2022 14:36:37 -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/python-xyz.scm (python-msgpack-1.0.2): New variable. --- gnu/packages/python-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c8ba314d38..15c889ca9b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11141,6 +11141,17 @@ (define-public python-msgpack (home-page "https://pypi.org/project/msgpack/") (license license:asl2.0))) +(define-public python-msgpack-1.0.2 + (package + (inherit python-msgpack) + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "msgpack" version)) + (sha256 + (base32 + "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s")))))) + ;; This msgpack library's name changed from "python-msgpack" to "msgpack" with ;; release 0.5. Some packages like borg still call it by the old name for now. ;; From patchwork Wed Jan 26 19:36:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 36825 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 B48BC27BBEA; Wed, 26 Jan 2022 19:37:36 +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 4C8CD27BBE9 for ; Wed, 26 Jan 2022 19:37:36 +0000 (GMT) Received: from localhost ([::1]:37262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCo6p-00005U-GC for patchwork@mira.cbaines.net; Wed, 26 Jan 2022 14:37:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCo6L-0008UI-8v for guix-patches@gnu.org; Wed, 26 Jan 2022 14:37:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCo6I-000825-OC for guix-patches@gnu.org; Wed, 26 Jan 2022 14:37:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCo6I-00023Y-13 for guix-patches@gnu.org; Wed, 26 Jan 2022 14:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53558] [PATCH 2/3] gnu: Add python-pyfuse3. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jan 2022 19:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53558 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53558@debbugs.gnu.org Received: via spool by 53558-submit@debbugs.gnu.org id=B53558.16432258197889 (code B ref 53558); Wed, 26 Jan 2022 19:37:01 +0000 Received: (at 53558) by debbugs.gnu.org; 26 Jan 2022 19:36:59 +0000 Received: from localhost ([127.0.0.1]:53595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCo68-00022s-NL for submit@debbugs.gnu.org; Wed, 26 Jan 2022 14:36:59 -0500 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:44775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCo67-00022e-0Z for 53558@debbugs.gnu.org; Wed, 26 Jan 2022 14:36:52 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 5E93C2B00165; Wed, 26 Jan 2022 14:36:45 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Jan 2022 14:36:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; bh=zqVBsFNalnC gTWhUrX9FAhG8K5Tu5E7qW2YO6LV6WWg=; b=BdmPS/CRiLCBpXHYq9UiJer9Crx X+SLxW1gBILd6B7EGk/COmsjxQEi8VWFYF3VtjM+DyAztmGMvD2CsVTZ6vmvnpYf YNX+SYsgq5/uUvzLxECRqC8zuigjpb199kx4YAvo/8hrWQx7xHwzuK7jaeP1nbqh 6FwoJ3L1lY/QjvKY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=zqVBsFNalnCgTWhUrX9FAhG8K5Tu5E7qW2YO6LV6WWg=; b=f9uCQK1D whIOnWYnEyqKW7OBxaMt02y12JpH9R1/mXZgUPZnDIOrnzSnqq+4PdmcaKiixMET GzeHj+wRm48aCDo+sG9ngDGAMOCydKfmlNH3m4NVs5+7YmWljkrW3JdWhESN6S2g d5zbQUFUse6wqxWJMNFR/zc+PidNb01dNiUzYlPfdzP/pIm5RBrBU/hwvHQcA0+X HC+Agq1nFNXJT7N0xDSgcbCfmUW4NDKs3CJ9dNNFazmgwJpE3BujOmoOBTF0X5WZ m4oTYK0zax2yNSCW6raOQDRXDl/bGsb/nMw0CZbs68LeUoi9uKOL6pAFvrsfLhfC Lzg//9pI2TtKfQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfedugdduvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgovfgvgihtqfhnlhihqddqufhprghmsghothdqkg egvdduqdehudculdeftddtmdenucfjughrpefhvffufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrih drnhgrmhgvqeenucggtffrrghtthgvrhhnpefhgfefuddtfeduuefhtdelgeeiteefueeu heduhfeggfffgfevheeufedvgeejvdenucffohhmrghinhepghhithhhuhgsrdgtohhmne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohes fhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <53558@debbugs.gnu.org>; Wed, 26 Jan 2022 14:36:44 -0500 (EST) From: Leo Famulari Date: Wed, 26 Jan 2022 14:36:38 -0500 Message-Id: <93d83a724eeac66d8b6f3efd6f6fd57a821484b1.1643225798.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/python-xyz.scm (python-pyfuse3): New variable. --- gnu/packages/python-xyz.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 15c889ca9b..84217758c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016, 2020 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson -;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2019, 2022 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner @@ -28797,3 +28797,23 @@ (define-public python-esprima "This package provides ECMAScript parsing infrastructure for multipurpose analysis in Python.") (license license:bsd-3))) + +(define-public python-pyfuse3 + (package + (name "python-pyfuse3") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyfuse3" version)) + (sha256 + (base32 "0cvybynv9igssfa4l13q09gb6m7afmwk34wsbq8jk14sqpd4dl92")))) + (build-system python-build-system) + (native-inputs (list pkg-config)) + (inputs (list fuse-3)) + (propagated-inputs (list python-pytest-trio)) + (home-page "https://github.com/libfuse/pyfuse3") + (synopsis "Python bindings FUSE 3") + (description "This package provides Python 3 bindings for libfuse 3 with +async I/O support.") + (license license:gpl2+))) From patchwork Wed Jan 26 19:36:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 36826 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 CEFAA27BBEA; Wed, 26 Jan 2022 19:39:34 +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 1977427BBE9 for ; Wed, 26 Jan 2022 19:39:34 +0000 (GMT) Received: from localhost ([::1]:40682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCo8j-0002ps-47 for patchwork@mira.cbaines.net; Wed, 26 Jan 2022 14:39:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCo7G-00013J-IW for guix-patches@gnu.org; Wed, 26 Jan 2022 14:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCo7G-000883-82 for guix-patches@gnu.org; Wed, 26 Jan 2022 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCo7G-00025R-6s for guix-patches@gnu.org; Wed, 26 Jan 2022 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53558] [PATCH 3/3] WIP: Borg: Update to 1.2.0b4. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jan 2022 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53558 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53558@debbugs.gnu.org Received: via spool by 53558-submit@debbugs.gnu.org id=B53558.16432258267951 (code B ref 53558); Wed, 26 Jan 2022 19:38:02 +0000 Received: (at 53558) by debbugs.gnu.org; 26 Jan 2022 19:37:06 +0000 Received: from localhost ([127.0.0.1]:53599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCo6F-00023J-Sv for submit@debbugs.gnu.org; Wed, 26 Jan 2022 14:37:06 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:33233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCo68-00022g-EH for 53558@debbugs.gnu.org; Wed, 26 Jan 2022 14:36:55 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 8C37A3200C20; Wed, 26 Jan 2022 14:36:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 26 Jan 2022 14:36:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; bh=3bv/G7aev1e CU+m6AfwZfR18+tg573xthAqn81/ibTM=; b=Fks/DhotrDQfAIWBKihsHdjqYf7 3frpEpsouN/i5X/ia0WGjI0+UQOqucrKeBrIhJJiDSAfH5E3q/JLnf0FhWv0dER+ GLTJKnemUMCSqUc5VWDNxPt7KHiT/VK14GKnpk9LmlGWpjIM1+9UVGeaCizSsIP0 OJKWIrxtMDRTrzP8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=3bv/G7aev1eCU+m6AfwZfR18+tg573xthAqn81/ibTM=; b=P5+DCWy/ KWbeyjcr4KAB8UJ+63Yx4dF1xLpzpEGn5ulEFRsbyI0qv2VuDjiKpEAnKf+U5SfS qp6XrO9Ye5NTU5lF1ssdF5rGokgFjDFVukI6RMYp/kpx3d2nvKcpLLSc7xDI9wSR 8zAsCdagJaIHKOs763a+RkXXDMmQOQpuGx9wuevvD4zY3TSZ2i24Cdv2lO5M5LlM hfez6Q7JIHWyDejyMf3RsJzxdmyoK5+JyWCM9S0hH9gLUouGNI7RfsmY59/JW/MI IgcQcXOVpGrXiExvydpiQqsaqs5YV6NLr2nga/cCETAM/7cHrSzfkVzU63D4wqnE wdRtpsev0wJe5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfedugdduvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhggtgfgsehtke ertdertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpefghfekvdektdfhhfefheekhfdtve egfeeiudeuffduieeffeehvddufefhgfdtkeenucffohhmrghinhepghhithhhuhgsrdgt ohhmpdhgnhhurdhorhhgpdgsohhrghgsrggtkhhuphdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdr nhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <53558@debbugs.gnu.org>; Wed, 26 Jan 2022 14:36:45 -0500 (EST) From: Leo Famulari Date: Wed, 26 Jan 2022 14:36:39 -0500 Message-Id: <419fa02e34d62d17b1c06063896baad9b3506274.1643225798.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 XXX borgbackup 1.2.0b4 beta release - do not use this on production backup repositories. XXX Upstream discussions: https://github.com/borgbackup/borg/discussions/6166 https://github.com/borgbackup/borg/issues/4360 * gnu/packages/backup.scm (borg): Update to 1.2.0b4. [source]: Adjust the list of Cython files to rebuild. Remove an obsolete substitution. Delete the bundled xxhash. Blake2 is no longer bundled. [native-inputs]: Add python-dateutil. [inputs]: Add xxhash. Add python-msgpack-1.2. Remove libb2. [arguments]: Export BORG_LIBXXHASH_PREFIX to ensure the build script can find xxhash. Adjust the list of skipped tests and make the custom 'check' phase honor tests?. Install some more documentation. --- gnu/packages/backup.scm | 100 ++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d847287d13..c55dbc12ba 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, 2021 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2021 Arun Isaac @@ -62,6 +62,7 @@ (define-module (gnu packages backup) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) + #:use-module (gnu packages digest) #:use-module (gnu packages dbm) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) @@ -629,13 +630,13 @@ (define-public libchop (define-public borg (package (name "borg") - (version "1.1.17") + (version "1.2.0b4") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs")) + (base32 "1h4gni8p2kyg1qry2nmzscj6zai7lygyqwdzxgd6y531780lx6pk")) (modules '((guix build utils))) (snippet '(begin @@ -645,8 +646,6 @@ (define-public borg ;; generate the wrong list. (for-each delete-file '("src/borg/algorithms/checksums.c" - "src/borg/algorithms/msgpack/_packer.cpp" - "src/borg/algorithms/msgpack/_unpacker.cpp" "src/borg/chunker.c" "src/borg/compress.c" "src/borg/crypto/low_level.c" @@ -656,15 +655,17 @@ (define-public borg "src/borg/platform/freebsd.c" "src/borg/platform/linux.c" "src/borg/platform/posix.c" - "src/borg/platform/syncfilerange.c")) + "src/borg/platform/syncfilerange.c" + "src/borg/platform/windows.c")) ;; Remove bundled shared libraries. (with-directory-excursion "src/borg/algorithms" (for-each delete-file-recursively - (list "blake2" "lz4" "zstd"))) + (list "lz4" "xxh64" "zstd"))) #t)))) (build-system python-build-system) (arguments - `(#:modules ((srfi srfi-26) ; for cut + `(#:tests? #f ; The tests pass. Skip them all while debugging FUSE 3 + #:modules ((srfi srfi-26) ; for cut (guix build utils) (guix build python-build-system)) #:phases @@ -672,12 +673,12 @@ (define-public borg (add-after 'unpack 'set-env (lambda* (#:key inputs #:allow-other-keys) (let ((openssl (assoc-ref inputs "openssl")) - (libb2 (assoc-ref inputs "libb2")) (lz4 (assoc-ref inputs "lz4")) + (xxhash (assoc-ref inputs "xxhash")) (zstd (assoc-ref inputs "zstd"))) (setenv "BORG_OPENSSL_PREFIX" openssl) - (setenv "BORG_LIBB2_PREFIX" libb2) (setenv "BORG_LIBLZ4_PREFIX" lz4) + (setenv "BORG_LIBXXHASH_PREFIX" xxhash) (setenv "BORG_LIBZSTD_PREFIX" zstd) (setenv "PYTHON_EGG_CACHE" "/tmp") ;; The test 'test_return_codes[python]' fails when @@ -687,32 +688,37 @@ (define-public borg ;; The tests need to be run after Borg is installed. (delete 'check) (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make the installed package available for the test suite. - (add-installed-pythonpath inputs outputs) - ;; The tests should be run in an empty directory. - (mkdir-p "tests") - (with-directory-excursion "tests" - (invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k" - (string-append - ;; These tests need to write to '/var'. - "not test_get_cache_dir " - "and not test_get_config_dir " - "and not test_get_keys_dir " - "and not test_get_security_dir " - ;; These tests assume there is a root user in - ;; '/etc/passwd'. - "and not test_access_acl " - "and not test_default_acl " - "and not test_non_ascii_acl " - "and not test_create_stdin " - ;; This test needs the unpackaged pytest-benchmark. - "and not benchmark " - ;; These tests assume the kernel supports FUSE. - "and not test_fuse " - "and not test_fuse_allow_damaged_files " - "and not test_mount_hardlinks " - "and not test_readonly_mount "))))) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + ;; Make the installed package available for the test suite. + (add-installed-pythonpath inputs outputs) + ;; The tests should be run in an empty directory. + (mkdir-p "tests") + (with-directory-excursion "tests" + (invoke "py.test" "-v" "--pyargs" "borg.testsuite" "-k" + (string-append + ;; These tests need to write to '/var'. + "not test_get_cache_dir " + "and not test_get_config_dir " + "and not test_get_keys_dir " + "and not test_get_security_dir " + ;; These tests assume there is a root user in '/etc/passwd'. + "and not test_access_acl " + "and not test_default_acl " + "and not test_get_item_uid_gid " + "and not test_non_ascii_acl " + "and not test_create_content_from_command " + "and not test_create_content_from_command_with_failed_command " + "and not test_create_stdin " + ;; We don't need to run benchmarks + "and not benchmark " + ;; These tests assume the kernel supports FUSE. + "and not test_fuse " + "and not test_fuse_allow_damaged_files " + "and not test_mount_hardlinks " + "and not test_readonly_mount " + "and not test_fuse_versions_view " + "and not test_migrate_lock_alive")))))) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -720,10 +726,10 @@ (define-public borg (misc (string-append out "/share/borg/misc"))) (for-each (cut install-file <> misc) '("docs/misc/create_chunker-params.txt" + "docs/misc/borg-data-flow.png" "docs/misc/internals-picture.txt" "docs/misc/prune-example.txt")) - (copy-recursively "docs/man" man) - #t))) + (copy-recursively "docs/man" man)))) (add-after 'install-docs 'install-shell-completions (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -735,24 +741,28 @@ (define-public borg (install-file "zsh/_borg" (string-append share "/zsh/site-functions")) (install-file "fish/borg.fish" - (string-append share "/fish/vendor_completions.d"))) - #t)))))) + (string-append share "/fish/vendor_completions.d"))))))))) (native-inputs - (list python-cython python-setuptools-scm python-pytest)) + (list python-cython python-dateutil python-setuptools-scm python-pytest)) (inputs (list acl - libb2 lz4 openssl + ;; This is the latest version of msgpack accepted by 'setup.py'. + python-msgpack-1.0.2 + ;; FUSE 3 isn't working well, so we stick with FUSE 2 for now: + ;; python-llfuse - `(,zstd "lib"))) +; python-pyfuse3 + `(,zstd "lib") + xxhash)) (synopsis "Deduplicated, encrypted, authenticated and compressed backups") (description "Borg is a deduplicating backup program. Optionally, it supports compression and authenticated encryption. The main goal of Borg is to provide an efficient and secure way to backup data. The data deduplication technique used makes Borg suitable for daily backups since only changes are -stored. The authenticated encryption technique makes it suitable for -storing backups on untrusted computers.") +stored. The authenticated encryption technique makes it suitable for storing +backups on untrusted computers.") (home-page "https://www.borgbackup.org/") (license license:bsd-3)))