From patchwork Sat Feb 12 19:24:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 37217 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 B889227BBEA; Sat, 12 Feb 2022 19:25: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,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 89C5027BBE9 for ; Sat, 12 Feb 2022 19:25:36 +0000 (GMT) Received: from localhost ([::1]:58132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIy1X-0008Te-MV for patchwork@mira.cbaines.net; Sat, 12 Feb 2022 14:25:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIy11-0008St-JW for guix-patches@gnu.org; Sat, 12 Feb 2022 14:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIy11-0000qQ-9Q for guix-patches@gnu.org; Sat, 12 Feb 2022 14:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nIy10-0001hn-Di for guix-patches@gnu.org; Sat, 12 Feb 2022 14:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53962] [PATCH] gnu: rust-chacha20poly1305: Fix build. Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Feb 2022 19:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53962@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16446938886529 (code B ref -1); Sat, 12 Feb 2022 19:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Feb 2022 19:24:48 +0000 Received: from localhost ([127.0.0.1]:35679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIy0m-0001hE-Iy for submit@debbugs.gnu.org; Sat, 12 Feb 2022 14:24:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:37064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIy0l-0001h7-8D for submit@debbugs.gnu.org; Sat, 12 Feb 2022 14:24:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIy0k-0008Ob-B5 for guix-patches@gnu.org; Sat, 12 Feb 2022 14:24:47 -0500 Received: from mout02.posteo.de ([185.67.36.66]:51181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIy0h-0000mB-9i for guix-patches@gnu.org; Sat, 12 Feb 2022 14:24:45 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0420A240105 for ; Sat, 12 Feb 2022 20:24:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1644693879; bh=TBPJgwdlZ7Ln13iCB7Lf1zqJ4Tgnso5mnd+hhIOi/As=; h=From:To:Subject:Date:From; b=Z41f9m4FiZeEG+inPpFyaU7Q0BGtLk3AkxXs5/Bzur09tkYdhQXDQkbQqB4i7144t icAERF8vlAvqaRdstFqDIB9kvmb6ZXXnwDjkIL8nPK2PsIJO7uXc3lTS9huIZSotIw qXj5zfJRCad4N5RhRP4R6IaYAC/8rUngycKGrdC1dz0zPr+gtx2QR76H6TItGnZGy3 zD+xeXbzqP3L6R0+K+D37fi1Sij+jmNkRMKJwE07e1whDenVmWin7n12B6lIbB3hzS CojAKnHjayOXG741e4G8VMNBkW4L1kHwloAGEQTVEWOT+4cx+dLSRK+I8uaXb/Mw6u Ltw70s7xhDDkQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Jx0mQ0yM7z9rwn for ; Sat, 12 Feb 2022 20:24:37 +0100 (CET) From: Aleksandr Vityazev In-Reply-To: References: Message-Id: <8c4338456508b00ee5c05e5d85345443862a2131.1644693838.git.avityazev@posteo.org> Date: Sat, 12 Feb 2022 19:24:36 +0000 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=avityazev@posteo.org; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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-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/crates-io: (rust-chacha20poly1305): [arguments]<#:phases>: Add a new 'relax-requirements' phase. --- gnu/packages/crates-io.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fa9a7d9ab5..d21fb240a8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10284,7 +10284,20 @@ (define-public rust-chacha20poly1305-0.9 (base32 "0alawaaakczsll1b98qf4m6r6kfaw28506ljvsysjyjz3mnyv11v")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'relax-requirements + (lambda _ + (substitute* + "guix-vendor/rust-chacha20-0.8.1.tar.gz/Cargo.toml" + (("version = \">=1, <1.5\"") "version = \"^1\"")) + (substitute* + "guix-vendor/rust-chacha20poly1305-0.9.0.tar.gz/Cargo.toml" + (("version = \">=1, <1.5\"") "version = \"^1\"")) + (substitute* + "Cargo.toml" + (("version = \">=1, <1.5\"") "version = \"^1\""))))) + #:cargo-inputs (("rust-aead" ,rust-aead-0.4) ("rust-chacha20" ,rust-chacha20-0.8) ("rust-cipher" ,rust-cipher-0.3)