X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 17:54:02 +0000 Resent-Message-ID: <handler.75206.B.173558121625358 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by submit <at> debbugs.gnu.org id=B.173558121625358 (code B ref -1); Mon, 30 Dec 2024 17:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2024 17:53:36 +0000 Received: from localhost ([127.0.0.1]:59820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSJxP-0006aw-Fr for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:53:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:45166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSJxG-0006aX-IO for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:53:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tSJxG-0003vK-7L for guix-patches@HIDDEN; Mon, 30 Dec 2024 12:53:26 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tSJxE-0008OF-7N for guix-patches@HIDDEN; Mon, 30 Dec 2024 12:53:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=3oS7JgGzjNjn1KEQz4aMt7rREH8UK51d9g9pgqFiftc=; b=fgwC+PZPFspbTIPhE4ZXCtuKB4LmFY/kHikxf66IefxcpxsD0TD4P7QEHazzBc327iPaEw S3HOHSBeW+68gd68nqvxx1BnSP5mFkM/XJluxk+rjD22MWsXICslPNtDToPrvgOtlnHAR7 5gmnLTS94r/5zMkXGztND/a8PxaC7KTU41/0fHTEt1i0XS974GXriMaxFHHy/sQxlKs5T6 m6iP1w10MygyLWWQmY4pLHI3RirAuaYz6pvAeph4TQgq+poOgoMCJuXHI2MYwNO6beZK20 hcjVkK9yof657fWOeNMMN3FWVrXD8d3nrsnLH13pvPZ75DTjg3gJvztVJVEOqw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1406cc56 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <guix-patches@HIDDEN>; Mon, 30 Dec 2024 17:53:09 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:52:25 +0100 Message-ID: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN; helo=email.rimm.ee X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.4 (--) * gnu/packages/crates-io.scm (rust-structopt-0.3): Add snippet. [arguments]: Remove fixup-cargo-toml phase. Change-Id: I468ab9e5813bea6d4cbee74c22ae8ad4c4803a0c --- gnu/packages/crates-io.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0b38709201d..4034345fcf5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -79155,11 +79155,15 @@ (define-public rust-structopt-0.3 (origin (method url-fetch) (uri (crate-uri "structopt" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc")))) + (base32 "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc")) + (modules '((guix build utils))) + (snippet + #~(begin (substitute* "Cargo.toml" + ;; feature does not exist + (("lints.*") "") + (("2.33") #$(package-version rust-clap-2))))))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -79171,15 +79175,7 @@ (define-public rust-structopt-0.3 #:cargo-development-inputs (("rust-strum" ,rust-strum-0.21) ("rust-trybuild" ,rust-trybuild-1) - ("rust-rustversion" ,rust-rustversion-1)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'fixup-cargo-toml - (lambda _ - (substitute* "Cargo.toml" - ;; feature does not exist - (("lints.*") "") - (("2.33") ,(package-version rust-clap-2)))))))) + ("rust-rustversion" ,rust-rustversion-1)))) (home-page "https://github.com/TeXitoi/structopt") (synopsis "Parse command line argument by defining a struct") (description base-commit: 4d478f0b404a86a0849722536f11fde0b1857bb8 -- 2.45.2
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Herman Rimm <herman@HIDDEN> Subject: bug#75206: Acknowledgement ([PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet.) Message-ID: <handler.75206.B.173558121625358.ack <at> debbugs.gnu.org> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> X-Gnu-PR-Message: ack 75206 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75206 <at> debbugs.gnu.org Date: Mon, 30 Dec 2024 17:54:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Efraim Flashner <efraim@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 75206 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 75206: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75206 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 02/10] gnu: rust-structopt-0.3: Build. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 17:59:02 +0000 Resent-Message-ID: <handler.75206.B75206.173558153126350 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558153126350 (code B ref 75206); Mon, 30 Dec 2024 17:59:02 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:58:51 +0000 Received: from localhost ([127.0.0.1]:59841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2U-0006qn-3l for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:50 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2Q-0006qL-9l for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=onNGrEBov9Jtlnn8uWhCaz3is/ZOXIYendVyAn9CES4=; b=pFGqRgDkz8zXFslNFmiHTWiq1wdgZSQ87Y56o5Fcw9M4k8b/mgAUVRhK2zgXkY9e7vUMqI WylaA1TIxmsfyyxC3+YGerBmY3dQnp13foH+0/2vZmBidpX8vZJJgtNfdqbhtuhvG9NXXT EldlVzZAzXc7hoDra2OYw5Blp8eLZEu8Y2GbiDPbeQjs2PppKqjBP9kHuQBkdrxgkyAQ68 KfHVTyfW1q526sFgesHybCeyCgV+xAvIToDi2M3LK3ERqaPFaQIaDeT6BJroaUhfq0yPuE 6f7yPfogeZzRR7lNrFuD6vq7GFFdyJ9HdolGyyTRROSwKbe1dKcNcSOIsBvNUg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f67bba65 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:33 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:37 +0100 Message-ID: <fd0ff1282a13337f020ae8c728bd5e3381e7dc10.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-structopt-0.3): Do not skip build. [source]: Remove failing test files. Change-Id: I468ab9e5813bea6d4cbee74c22ae8ad4c4803a0c --- gnu/packages/crates-io.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4034345fcf5..efc782d2b79 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -79163,11 +79163,17 @@ (define-public rust-structopt-0.3 #~(begin (substitute* "Cargo.toml" ;; feature does not exist (("lints.*") "") - (("2.33") #$(package-version rust-clap-2))))))) + (("2.33") #$(package-version rust-clap-2))) + ;; Cargo build stderr does not exactly match. + (with-directory-excursion "tests/ui" + (for-each delete-file + '("external_subcommand_wrong_type.rs" + "positional_bool.rs" + "raw.rs" + "skip_without_default.rs"))))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-structopt-derive" ,rust-structopt-derive-0.4) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-paw" ,rust-paw-1) -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 03/10] gnu: rust-syn-2: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 17:59:03 +0000 Resent-Message-ID: <handler.75206.B75206.173558153226357 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558153226357 (code B ref 75206); Mon, 30 Dec 2024 17:59:03 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:58:52 +0000 Received: from localhost ([127.0.0.1]:59844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2V-0006qs-8u for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:51 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2S-0006qL-A8 for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ZjWg6tjgqQMuFcTkF6zKr4I9DiUHFMb5dwZEJnRp9Y=; b=RQ0TMOsV+s+hK4IdSL2Gx1EaEyU6pdpRdlZs2DN0eSqAGRT8/UJt9Tqn8y7CWyYrPA4GKu 8k2gYd/d7eAvxRlEwkMjQxMs4R/MhW5dyLhMDUhoel2HS4PtdMgKbxjWF2UO2xbZq/8Udj Z9SbJ8MsAsSfbtmlWyDO2SIsRBnZQBi+dW6bHZv8VkEelc3oTed5Cxnjx9DIAAryYW1gpf 5i37Xkq8yyE6bWXPx7hWJDyCUeqKYD39cd9XaObBow8xHrw2sCU3LOHO48C+3vOujFpxxF t1kgk4Y25FoIupGixv3WdpY37ft/ujth7PZzjKaD5kp9C+B7VODzrYGQn5sfIw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4df9085d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:35 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:38 +0100 Message-ID: <fcde60f8887ecda53793ac6e5ad98f32e27b7aad.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-syn-2): Add snippet. [arguments]: Remove patch-test-suite phase. Change-Id: I1f53f9259fc9b11ac420aed3238671b3c20b236d --- gnu/packages/crates-io.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index efc782d2b79..e66d2fa7626 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80650,26 +80650,25 @@ (define-public rust-syn-2 (package (name "rust-syn") (version "2.0.90") - (source (origin - (method url-fetch) - (uri (crate-uri "syn" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci")))) + (source + (origin + (method url-fetch) + (uri (crate-uri "syn" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cfg5dsr1x0hl6b9hz08jp1197mx0rq3xydqmqaws36xlms3p7ci")) + (modules '((guix build utils))) + ;; The syn-test-suite crate is empty. + (snippet + #~(substitute* "Cargo.toml" + (("^\\[dev-dependencies.syn-test-suite\\]") "") + (("^version = \"0\"") "") + (("^test = \\[\"syn-test-suite/all-features\"\\]") ""))))) (build-system cargo-build-system) (arguments ;; Tests fail to compile ;; error[E0463]: can't find crate for `rustc_ast` (among other errors). `(#:tests? #f - #:phases - (modify-phases %standard-phases - ;; The syn-test-suite crate is empty. - (add-after 'unpack 'patch-test-suite - (lambda _ - (substitute* "Cargo.toml" - (("^\\[dev-dependencies.syn-test-suite\\]") "") - (("^version = \"0\"") "") - (("^test = \\[\"syn-test-suite/all-features\"\\]") ""))))) #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 04/10] gnu: rust-syn-1: Inherit rust-syn-2. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:02 +0000 Resent-Message-ID: <handler.75206.B75206.173558154426434 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558154426434 (code B ref 75206); Mon, 30 Dec 2024 18:00:02 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:04 +0000 Received: from localhost ([127.0.0.1]:59851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2h-0006s1-It for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:04 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2T-0006qL-3J for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z9qpa0j5uwGzqezerdZ92u/lTKqQlM4JUveAra7Az8k=; b=Ds39hQf22xqm8Q6rpBSEATLNRlDdwXLlAhfvFdIKu625T1vbbZgY/W8zSyY1ba+V00oRRo E/jYlgHuQ3k1BRtLGARWG5OqnyIue3IO7j/7lI2NTm7jTc7nFt+n5t2zabJwIPr+ygRUoL wv4m0kaogtrUKFQ3Z14OGs4cqr5If46vM+uN4TUPUh33IQe89uSIPnALXt7C2ZDIN9Vf2H myRuC4FyqNzInjPo77+P+kqyK8CYgFjryDwwlZnSMe0aEYGxlA/aT+lghYqhphyPLVkP6q fvrDLOV37sa/tWhoqmPWuTEzer7iV0JG+fEbjHVZTIM4iYC1kPf/j0maexbpNw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id bec2ff6b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:35 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:39 +0100 Message-ID: <9a56c7eee6b1a14d0ef6a757c79b6b38c4778005.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-syn-1): Inherit rust-syn-2. [arguments]: Remove patch-test-suite phase. Change-Id: I37bcd0cbb07d03fecdd17b96dd0ce7023a6adc06 --- gnu/packages/crates-io.scm | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e66d2fa7626..62c3ec1fc58 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80697,28 +80697,19 @@ (define-public rust-syn-2 (define-public rust-syn-1 (package + (inherit rust-syn-2) (name "rust-syn") (version "1.0.109") (source (origin - (method url-fetch) + (inherit (package-source rust-syn-2)) (uri (crate-uri "syn" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ds2if4600bd59wsv7jjgfkayfzy3hnazs394kz6zdkmna8l3dkj")))) - (build-system cargo-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; The syn-test-suite crate is empty. - (add-after 'unpack 'patch-test-suite - (lambda _ - (substitute* "Cargo.toml" - (("^\\[dev-dependencies.syn-test-suite\\]") "") - (("^version = \"0\"") "") - (("^test = \\[\"syn-test-suite/all-features\"\\]") ""))))) - ;; Tests fail to compile + `(;; Tests fail to compile ;; error[E0432]: unresolved imports `syn::Item`, `syn::Pat` #:tests? #false #:cargo-inputs @@ -80736,15 +80727,7 @@ (define-public rust-syn-1 ("rust-reqwest" ,rust-reqwest-0.11) ("rust-tar" ,rust-tar-0.4) ("rust-termcolor" ,rust-termcolor-1) - ("rust-walkdir" ,rust-walkdir-2)))) - (inputs (list openssl)) - (native-inputs (list pkg-config)) - (home-page "https://github.com/dtolnay/syn") - (synopsis "Parser for Rust source code") - (description - "Syn is a parsing library for parsing a stream of Rust tokens into -a syntax tree of Rust source code.") - (license (list license:expat license:asl2.0)))) + ("rust-walkdir" ,rust-walkdir-2)))))) (define-public rust-syn-0.15 (package -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 05/10] gnu: rust-syn-0.11: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:03 +0000 Resent-Message-ID: <handler.75206.B75206.173558154726444 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558154726444 (code B ref 75206); Mon, 30 Dec 2024 18:00:03 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:07 +0000 Received: from localhost ([127.0.0.1]:59857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2i-0006sJ-FK for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:07 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2U-0006qL-04 for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lS4cgPj9UGy/gmpFecUOpyFyv4TpNd+tVzwWcLe6qwo=; b=onE2DyiAgOBVptv2qQxzrR7PImsmCo+q2t/n6F04Sfidygp3RYJ0ZQ0vutB5Gf2RJuKmoe 77i338ydFHOqctXgjLHb6hnc3e99nCm78IOrYA7A9ZmzGyHiQm9VzPgFYses8QxjMK6M9X miiABeqHKfwVWz7q8oYgj4+qiFxSPMXtI74Ujh9H1lrJbg2YAG9iMowbyCpjI/tFJuGVUF yX0FcXXOpNC1kXodbE39AXhHzOCieMtiEjz5/pChjZf/gw6B90lXCmZ6qfHxFlkDE1/ld+ Jge7drnK+4I4A52YKZWo99ITUQTQrtb/tjNAmYwMk93KRpBMcGNX7lTpsrDrpw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7ee30786 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:36 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:40 +0100 Message-ID: <7eab3562b8e588ba9c953a814a76d1a45e3f0bf2.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-syn-0.11): Add snippet. [arguments]: Remove fixup-cargo-toml phase. Change-Id: Ied5346ef86d4d1404d12b757c3213a18607a1a44 --- gnu/packages/crates-io.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 62c3ec1fc58..259ae00034e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80815,19 +80815,14 @@ (define-public rust-syn-0.11 (origin (method url-fetch) (uri (crate-uri "syn" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k")))) + (base32 "1b8x8jdsmj6r9ck7n1pg371526n1q90kx6rv6ivcb22w06wr3f6k")) + (modules '((guix build utils))) + (snippet #~(substitute* "Cargo.toml" + ((", path =.*,") ","))))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'fixup-cargo-toml - (lambda _ - (substitute* "Cargo.toml" - ((", path =.*,") ","))))) - #:tests? #f ; Tests don't compile correctly. + `(#:tests? #f ; Tests don't compile correctly. #:cargo-inputs (("rust-quote" ,rust-quote-0.3) ("rust-synom" ,rust-synom-0.11) -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 06/10] gnu: rust-synom-0.11: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:04 +0000 Resent-Message-ID: <handler.75206.B75206.173558154826452 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558154826452 (code B ref 75206); Mon, 30 Dec 2024 18:00:04 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:08 +0000 Received: from localhost ([127.0.0.1]:59859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2l-0006sT-SO for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:08 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2V-0006qL-Fw for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5rjS+RVIKXxAA3ns6KRBKneRWc4x1m4gUnC5sngeCzM=; b=j8jf6MpkD4OICrBTtX/iNbkZPYtPC2yhLiqYyGQpXOoeAuA+2kf+Zqlsgx0ZepjO7HaBf1 HYNgTyi1Srh4rL9jEJTr0eoeFIg22V81xvrbqRTbWEO5eBVkO0i2z7NXVg0JP0xpVABcxp 27IPkzVWUMBTJmz8seOQveW1c43LpNXMYECD8GIj+frN9ywOCy9TIqfMJY6lhClyAnSFP7 UcFMzK8JN1uOQtV0EU1jR2icukrvNy74yOhqAAEojsoUvX7ZYgAX9/eQPriguDcL8nssDt yzy86AmmHN3s1Yv8n265uL9AC0g0dV0YJQ+1jCwGr2r/x4EhwuUILetNvZ5QSg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9f63cff5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:37 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:41 +0100 Message-ID: <6c89e8aae1013446d78150d03ca8c6a08128491f.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-synom-0.11): Add snippet. [arguments]: Remove fixup-cargo-toml phase. Change-Id: I2920d16a2daad7ccae15320bf1257e5e8d2482fe --- gnu/packages/crates-io.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 259ae00034e..5a573642353 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80946,21 +80946,15 @@ (define-public rust-synom-0.11 (origin (method url-fetch) (uri (crate-uri "synom" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3")))) + (base32 "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3")) + (modules '((guix build utils))) + (snippet #~(substitute* "Cargo.toml" + (("^path =.*") ""))))) (build-system cargo-build-system) (arguments `(#:tests? #f ; doc tests fail - #:phases - (modify-phases %standard-phases - (add-before 'build 'fixup-cargo-toml - (lambda _ - (substitute* "Cargo.toml" - (("^path =.*") "")) - #t))) #:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid-0.0.4)) #:cargo-development-inputs -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 07/10] gnu: rust-synom-0.11: Fix build. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:05 +0000 Resent-Message-ID: <handler.75206.B75206.173558154926459 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558154926459 (code B ref 75206); Mon, 30 Dec 2024 18:00:05 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:09 +0000 Received: from localhost ([127.0.0.1]:59861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2m-0006sb-8F for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:08 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:41043 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2V-0006qU-IJ for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kM8EwJmhRPaCrVKdwuH/VQTDhWLwuy3kSp0/WL2yGTM=; b=FIf0kZshBGNaRx8NdiGCmPeWYRuV5q8AI9rCuAkoSddK3QJI2Idr33iJ19j6goS3DLpYho DsFRY+Vti2BR0Dvmegj5VgA2BLbksCYp4u1dWHKlQCH9SUJKj1SUSuM4qufS1TUnKuYuHl IJ1W8nOwy1u4G3SbbiC0vg5lInyiQ4LXcOGKit/vbBove92mCLhJa1iooulY2B0BHCOqKA wUmfdE28A//5rsat2oixCRxNL6eLgnC9GPDFagmhfRqGZ3gv6LBEmFnDXwEd9/U1/ByhbP in5GaCBzNqclSw43WjQjk6Hgugu6GY9FHPwakZnsaNjnmjZ9FzhhST0DCnBhbA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0a883728 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:37 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:42 +0100 Message-ID: <8bea20d56fee6f34ef63f49512eb36d20310f74e.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-synom-0.11): Fix readme path. Change-Id: I2920d16a2daad7ccae15320bf1257e5e8d2482fe --- gnu/packages/crates-io.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5a573642353..aa5ce6f5087 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80951,6 +80951,7 @@ (define-public rust-synom-0.11 (base32 "1dj536sh5xxhan2h0znxhv0sl6sb7lvzmsmrc3nvl3h1v5p0d4x3")) (modules '((guix build utils))) (snippet #~(substitute* "Cargo.toml" + (("\\.\\./README.md") "README.md") (("^path =.*") ""))))) (build-system cargo-build-system) (arguments -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 08/10] gnu: rust-uint-0.9: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:06 +0000 Resent-Message-ID: <handler.75206.B75206.173558154926468 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558154926468 (code B ref 75206); Mon, 30 Dec 2024 18:00:06 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:09 +0000 Received: from localhost ([127.0.0.1]:59863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2m-0006sj-TP for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:09 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2X-0006qL-3N for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Al7rEZVFhBHtRygMZg9pkz8I/ylDv3Q/MRxk/8cZ3LE=; b=Ux2gZje3ySnlDHc2ZeU1/6lGDd1i80CKqt4xKaiSZMrID/ScjF4mywvSs6DEPKXPhSfhcR FdQBn9XTrScFKvGxT+sdDiBI8TMzpErxSfOlkcLCjqikif52UrJeV1S97WLcpy7AY7O5OE nK05tGltBYIV4KFarkMOwuRPdi3GYKVSGpjqu4ioHixr2Au6QAjZdMGrhwv2i64RBZggno Y9gqJaKnSBEE8o5RnobCozwGkMOqzdgE7DszriV1/ANQGH68ltmyVD3EGooK28J0XPEsFa 8bw9ENc7BEWHniO4s4ZUj5Yl0KfolE4AhrAvWVIVnfhXbkv3CjincP46vxV8wA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7a60d035 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:38 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:43 +0100 Message-ID: <82e1489bacda8a48798cf1f277b857e4367bc870.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-io.scm (rust-uint-0.9): Add snippet. [arguments]: Remove adjust-cargo-toml phase. Change-Id: I9ff08abe419e860e4cb77b94b401466e2e113cc3 --- gnu/packages/crates-io.scm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa5ce6f5087..bb89ad6e2c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -90529,12 +90529,15 @@ (define-public rust-uint-0.9 (name "rust-uint") (version "0.9.5") (source - (origin - (method url-fetch) - (uri (crate-uri "uint" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0ljb2q0waadsr56w6j5wwchwibby8bbsf09wnv54zc2k5jx4pxkn")))) + (origin + (method url-fetch) + (uri (crate-uri "uint" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ljb2q0waadsr56w6j5wwchwibby8bbsf09wnv54zc2k5jx4pxkn")) + (modules '((guix build utils))) + (snippet #~(substitute* "Cargo.toml" + (("integer") "default"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -90547,13 +90550,7 @@ (define-public rust-uint-0.9 #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-rug" ,rust-rug-1)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'adjust-cargo-toml - (lambda _ - (substitute* "Cargo.toml" - (("integer") "default"))))))) + ("rust-rug" ,rust-rug-1)))) (inputs (list gmp mpc mpfr)) (home-page "https://parity.io") -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 09/10] gnu: rust-rustls-ffi-0.8: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:06 +0000 Resent-Message-ID: <handler.75206.B75206.173558155026475 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558155026475 (code B ref 75206); Mon, 30 Dec 2024 18:00:06 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:10 +0000 Received: from localhost ([127.0.0.1]:59865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2n-0006sr-ET for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:09 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:41043 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2X-0006qU-US for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=frOBqdoen8uxctOUOVLoI0nJgXVqWIEa9l2m+i75Su8=; b=UOdx+ArP1Euf3jS+z3xaKGck34dRDnmBrxBoB2yABB2krYzAr8/Nee8q5LNa7HlvPgn1Wi Eju2ZJcNdInXZ7iicHD1THUmZNc7SXtNTT0fNcU9TLopPGVGq+BMtNnkK+aOCVafQ7X99N WvDvzxUEEF2frPAFlrTI4a559nqotwLrQH3evaQ9pUi4qFd7L1HsvR1rBCGHFsB3RPYohj 49WMwqH3r5+l/UPJLH85w+BqHHKfJ0myUu0TrJH7QHCXHMWgfVA98mckWUJbOH+cy/in4G OTvXpFoeaSBl6WHQnYpdgerKSJFqFAbB8qr4BzDBCSzun9LKKBTrjMh/MvULuQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id dfbc3b47 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:38 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:44 +0100 Message-ID: <63707dcb8f8bfac8305a24ac4933b351101509ab.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-tls.scm (rust-rustls-ffi-0.8): Add snippet. [arguments]: Remove adjust-cbindgen-requirement phase. Change-Id: Ia7434a8a6e46425e331c19a510846c78074fd46a --- gnu/packages/crates-tls.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index 36737998a9c..f66445487f8 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -1675,12 +1675,18 @@ (define-public rust-rustls-ffi-0.8 (inherit rust-rustls-ffi-0.14) (name "rust-rustls-ffi") (version "0.8.2") - (source (origin - (method url-fetch) - (uri (crate-uri "rustls-ffi" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx")))) + (source + (origin + (method url-fetch) + (uri (crate-uri "rustls-ffi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx")) + (modules '((guix build utils))) + ;; The Cargo.toml in the git repository doesn't specify a version + ;; requirement for cbindgen. + (snippet #~(substitute* "Cargo.toml" + (("0\\.19\\.0") "*"))))) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) @@ -1691,15 +1697,7 @@ (define-public rust-rustls-ffi-0.8 ("rust-sct" ,rust-sct-0.7) ("rust-webpki" ,rust-webpki-0.22)) #:cargo-development-inputs - (("rust-cbindgen" ,rust-cbindgen-0.26)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'adjust-cbindgen-requirement - ;; The Cargo.toml in the git repository doesn't specify - ;; a version requirement for cbindgen. - (lambda _ - (substitute* "Cargo.toml" - (("0\\.19\\.0") "*"))))))))) + (("rust-cbindgen" ,rust-cbindgen-0.26)))))) (define-public rust-rustls-native-certs-0.8 (package -- 2.45.2
X-Loop: help-debbugs@HIDDEN Subject: [bug#75206] [PATCH rust-team 10/10] gnu: rust-user32-sys-0.2: Use snippet. Resent-From: Herman Rimm <herman@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN Resent-Date: Mon, 30 Dec 2024 18:00:07 +0000 Resent-Message-ID: <handler.75206.B75206.173558155026481 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 75206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75206 <at> debbugs.gnu.org Cc: Efraim Flashner <efraim@HIDDEN> X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN> Received: via spool by 75206-submit <at> debbugs.gnu.org id=B75206.173558155026481 (code B ref 75206); Mon, 30 Dec 2024 18:00:07 +0000 Received: (at 75206) by debbugs.gnu.org; 30 Dec 2024 17:59:10 +0000 Received: from localhost ([127.0.0.1]:59867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSK2n-0006sz-SE for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:59:10 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52271 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tSK2Y-0006qL-3K for 75206 <at> debbugs.gnu.org; Mon, 30 Dec 2024 12:58:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1735581519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X8y+UwKUkhD38o/owWCcop8nTfx1jxdo7W5xTcZMds4=; b=QRFO6EBmQrcPXxgNbOwcsWAxyu6GEcISIymyhxJq9MGKKupoBt3dlEK5L7sD14Py+7JL6E uchEKyJm07vK2NV1OS6CJtoRZ/T0dHuAkc/fhuDjXd7HmzvGsc+ljXh/FolWEuO6q7BH8V zkB2fT/lRpB1sXJw59cS6kSWsTfLD+xI7l8PAK4Fqg47P0HAU2hRSQlnWchnenYJzzGvQN XAxWCBr6iWCnPrWl/iv7MND/CkwLQxhvqe8/0GmDvAJL0a644uE0dCyXGiRYh5Op0uIJr+ rG2sLsHBFFSIe8jjTqshSmAmnpO/pWAPd5U69/PbjcP5IRDo5SB4zO6W6Nfjsw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 580ab02b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75206 <at> debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:39 +0000 (UTC) From: Herman Rimm <herman@HIDDEN> Date: Mon, 30 Dec 2024 18:57:45 +0100 Message-ID: <5b929503c39015aae1423f31f4410d56e209e470.1735580850.git.herman@HIDDEN> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/crates-windows.scm (rust-user32-sys-0.2): Add snippet. [arguments]: Remove fix-cargo-toml phase. Change-Id: I4316d89719ba1837c87729aae4b38be9d2bad3d9 --- gnu/packages/crates-windows.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm index 90eb31544d8..2d1818c7d9b 100644 --- a/gnu/packages/crates-windows.scm +++ b/gnu/packages/crates-windows.scm @@ -928,17 +928,15 @@ (define-public rust-user32-sys-0.2 (uri (crate-uri "user32-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f")))) + (base32 "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f")) + (modules '((guix build utils))) + (snippet #~(substitute* "Cargo.toml" + ((", path =.*}") "}"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.2)) - #:cargo-development-inputs (("rust-winapi-build" ,rust-winapi-build-0.1)) - #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-cargo-toml - (lambda _ - (substitute* "Cargo.toml" - ((", path =.*}") - "}")) #t))))) + #:cargo-development-inputs + (("rust-winapi-build" ,rust-winapi-build-0.1)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library user32") (description -- 2.45.2
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.