From patchwork Sun Aug 7 10:10:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41325 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 CF40127BBEA; Sun, 7 Aug 2022 11:11:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,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 8D63E27BBE9 for ; Sun, 7 Aug 2022 11:11:51 +0100 (BST) Received: from localhost ([::1]:52576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKdGA-00034S-Nf for patchwork@mira.cbaines.net; Sun, 07 Aug 2022 06:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKdFO-000332-Cs for guix-patches@gnu.org; Sun, 07 Aug 2022 06:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKdFO-0000bB-2a for guix-patches@gnu.org; Sun, 07 Aug 2022 06:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKdFN-0006u6-N4 for guix-patches@gnu.org; Sun, 07 Aug 2022 06:11:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57030] [PATCH] gnu: rust-tracing-futures-0.2: Fix build phase. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Aug 2022 10:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57030@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165986702426481 (code B ref -1); Sun, 07 Aug 2022 10:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Aug 2022 10:10:24 +0000 Received: from localhost ([127.0.0.1]:36000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKdEm-0006t2-7N for submit@debbugs.gnu.org; Sun, 07 Aug 2022 06:10:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:39880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKdEg-0006sl-Jw for submit@debbugs.gnu.org; Sun, 07 Aug 2022 06:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKdEg-00032C-Cu for guix-patches@gnu.org; Sun, 07 Aug 2022 06:10:18 -0400 Received: from 8.mo583.mail-out.ovh.net ([178.32.116.78]:57069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKdEd-0000Rd-Um for guix-patches@gnu.org; Sun, 07 Aug 2022 06:10:18 -0400 Received: from player773.ha.ovh.net (unknown [10.109.138.143]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id A7B4B228CD for ; Sun, 7 Aug 2022 10:10:11 +0000 (UTC) Received: from ngraves.fr (unknown [176.166.159.77]) (Authenticated sender: ngraves@ngraves.fr) by player773.ha.ovh.net (Postfix) with ESMTPSA id 39BB82D6A543C for ; Sun, 7 Aug 2022 10:10:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003e1d7cc02-0928-4f1a-883f-d9923412e25b, AC1F97F36DD8A5CAA60687340F4EEE9223FA2898) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.166.159.77 Date: Sun, 07 Aug 2022 12:10:09 +0200 Message-ID: <87v8r4tldq.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10340827697462043386 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdefiedgvdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepueejleeileejfffhleetjedtleejheevudffleevgfdufeekhefgvddvveegveefnecukfhppedtrddtrddtrddtpddujeeirdduieeirdduheelrdejjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrjeejfedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfe Received-SPF: pass client-ip=178.32.116.78; envelope-from=ngraves@ngraves.fr; helo=8.mo583.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-tracing-futures-0.2): Fix build phase. --- gnu/packages/crates-io.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfafce9aa3..a7a90df7ea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -66323,7 +66323,17 @@ (define-public rust-tracing-futures-0.2 "0k4vd3jyqz9cx8rbwbp0p93qfp1w6rfk7sc6c1jh1ai18zqvcyxb")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:phases + (modify-phases %standard-phases + (add-after 'patch-cargo-checksums 'patch-tests + (lambda _ + (substitute* '("tests/support.rs" "src/lib.rs") + (("../../tracing/tests/support/mod.rs") + (string-append + "../guix-vendor/rust-tracing-" + "0.1.23" ;; TODO replace by rust-tracing version + ".tar.gz/tests/support/mod.rs")))))) + #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-task" ,rust-futures-task-0.3) ("rust-pin-project" ,rust-pin-project-0.4) From patchwork Sun Aug 7 19:38:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41345 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 EFFDA27BBEA; Sun, 7 Aug 2022 20:39:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 B0AD827BBE9 for ; Sun, 7 Aug 2022 20:39:12 +0100 (BST) Received: from localhost ([::1]:47320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKm7D-0003Lf-SY for patchwork@mira.cbaines.net; Sun, 07 Aug 2022 15:39:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKm74-0003KD-Ru for guix-patches@gnu.org; Sun, 07 Aug 2022 15:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKm74-0001xY-JM for guix-patches@gnu.org; Sun, 07 Aug 2022 15:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKm74-0005Mg-Cm for guix-patches@gnu.org; Sun, 07 Aug 2022 15:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57030] [PATCH 7/9 v2] gnu: rust-syn-1: Update to 1.0.96. References: <87v8r4tldq.fsf@ngraves.fr> In-Reply-To: <87v8r4tldq.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Aug 2022 19:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57030@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 57030-submit@debbugs.gnu.org id=B57030.165990109020563 (code B ref 57030); Sun, 07 Aug 2022 19:39:02 +0000 Received: (at 57030) by debbugs.gnu.org; 7 Aug 2022 19:38:10 +0000 Received: from localhost ([127.0.0.1]:38329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKm6D-0005Lb-W4 for submit@debbugs.gnu.org; Sun, 07 Aug 2022 15:38:10 -0400 Received: from 9.mo575.mail-out.ovh.net ([46.105.78.111]:42953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKm6B-0005LR-AW for 57030@debbugs.gnu.org; Sun, 07 Aug 2022 15:38:08 -0400 Received: from player698.ha.ovh.net (unknown [10.109.138.52]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 1616923A38 for <57030@debbugs.gnu.org>; Sun, 7 Aug 2022 19:38:04 +0000 (UTC) Received: from ngraves.fr (unknown [176.166.159.77]) (Authenticated sender: ngraves@ngraves.fr) by player698.ha.ovh.net (Postfix) with ESMTPSA id 0DAD82D51614D; Sun, 7 Aug 2022 19:38:01 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003235ba1db-0e93-4443-bcd0-8ef549c98475, AC1F97F36DD8A5CAA60687340F4EEE9223FA2898) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.166.159.77 Date: Sun, 07 Aug 2022 21:38:00 +0200 Message-ID: <87bksvu9nr.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1484780502239273698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdefiedgudegvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudethfeugeehffetudeltedthefhheegkefgtddtueetudelkeeliedttddvfeehnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkpheptddrtddrtddrtddpudejiedrudeiiedrudehledrjeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrheileekrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeftdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhe 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" Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-syn-1): Update to 1.0.96. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-) -- 2.37.1 <#secure method=pgpmime mode=sign> -- Best regards, Nicolas Graves diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 99c70d3ca0..11a317ab71 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60699,21 +60699,51 @@ (define-public rust-swc-1 (define-public rust-syn-1 (package (name "rust-syn") - (version "1.0.82") + (version "1.0.96") (source (origin - (method url-fetch) - (uri (crate-uri "syn" version)) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dtolnay/syn") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ncx7gg5mvd16q5xf77hgk09nwmfq0ppsn0vgc9x9jv0pg85vbwd")))) + (base32 + "1b2my32bcw01w556hc4xckafx1x85lz81shrcmmjqlml07hakwi9")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "dev") + (delete-file-recursively "examples") + (delete-file-recursively "json") + (delete-file-recursively "codegen") + (delete-file-recursively "tests/crates") + (substitute* "Cargo.toml" + ((".*examples.*") "") + (("\"json\",") "") + (("\"dev\",") "") + (("\"tests/crates\",") "")))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '( "--release""--all-features") + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-automod" ,rust-automod-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-insta" ,rust-insta-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-ref-cast" ,rust-ref-cast-1) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-tar" ,rust-tar-0.4) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-walkdir" ,rust-walkdir-2)) #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-unicode-xid" ,rust-unicode-xid-0.2)))) + ("rust-unicode-ident" ,rust-unicode-ident-1)))) + (native-inputs (list pkg-config openssl)) (home-page "https://github.com/dtolnay/syn") (synopsis "Parser for Rust source code") (description