From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:53:36 2024 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 ) id 1tSJxP-0006aw-Fr for submit@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 ) id 1tSJxG-0006aX-IO for submit@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 ) id 1tSJxG-0003vK-7L for guix-patches@gnu.org; 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 ) id 1tSJxE-0008OF-7N for guix-patches@gnu.org; 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 ; Mon, 30 Dec 2024 17:53:09 +0000 (UTC) From: Herman Rimm To: guix-patches@gnu.org Subject: [PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet. Date: Mon, 30 Dec 2024 18:52:25 +0100 Message-ID: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; 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-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:58:51 2024 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 ) id 1tSK2U-0006qn-3l for submit@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 ) id 1tSK2Q-0006qL-9l for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:33 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 02/10] gnu: rust-structopt-0.3: Build. Date: Mon, 30 Dec 2024 18:57:37 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:58:52 2024 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 ) id 1tSK2V-0006qs-8u for submit@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 ) id 1tSK2S-0006qL-A8 for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:35 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 03/10] gnu: rust-syn-2: Use snippet. Date: Mon, 30 Dec 2024 18:57:38 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:04 2024 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 ) id 1tSK2h-0006s1-It for submit@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 ) id 1tSK2T-0006qL-3J for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:35 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 04/10] gnu: rust-syn-1: Inherit rust-syn-2. Date: Mon, 30 Dec 2024 18:57:39 +0100 Message-ID: <9a56c7eee6b1a14d0ef6a757c79b6b38c4778005.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:07 2024 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 ) id 1tSK2i-0006sJ-FK for submit@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 ) id 1tSK2U-0006qL-04 for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:36 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 05/10] gnu: rust-syn-0.11: Use snippet. Date: Mon, 30 Dec 2024 18:57:40 +0100 Message-ID: <7eab3562b8e588ba9c953a814a76d1a45e3f0bf2.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:08 2024 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 ) id 1tSK2l-0006sT-SO for submit@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 ) id 1tSK2V-0006qL-Fw for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:37 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 06/10] gnu: rust-synom-0.11: Use snippet. Date: Mon, 30 Dec 2024 18:57:41 +0100 Message-ID: <6c89e8aae1013446d78150d03ca8c6a08128491f.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:08 2024 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 ) id 1tSK2m-0006sb-8F for submit@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 ) id 1tSK2V-0006qU-IJ for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:37 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 07/10] gnu: rust-synom-0.11: Fix build. Date: Mon, 30 Dec 2024 18:57:42 +0100 Message-ID: <8bea20d56fee6f34ef63f49512eb36d20310f74e.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:09 2024 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 ) id 1tSK2m-0006sj-TP for submit@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 ) id 1tSK2X-0006qL-3N for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:38 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 08/10] gnu: rust-uint-0.9: Use snippet. Date: Mon, 30 Dec 2024 18:57:43 +0100 Message-ID: <82e1489bacda8a48798cf1f277b857e4367bc870.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:09 2024 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 ) id 1tSK2n-0006sr-ET for submit@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 ) id 1tSK2X-0006qU-US for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:38 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 09/10] gnu: rust-rustls-ffi-0.8: Use snippet. Date: Mon, 30 Dec 2024 18:57:44 +0100 Message-ID: <63707dcb8f8bfac8305a24ac4933b351101509ab.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 30 12:59:10 2024 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 ) id 1tSK2n-0006sz-SE for submit@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 ) id 1tSK2Y-0006qL-3K for 75206@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@debbugs.gnu.org>; Mon, 30 Dec 2024 17:58:39 +0000 (UTC) From: Herman Rimm To: 75206@debbugs.gnu.org Subject: [PATCH rust-team 10/10] gnu: rust-user32-sys-0.2: Use snippet. Date: Mon, 30 Dec 2024 18:57:45 +0100 Message-ID: <5b929503c39015aae1423f31f4410d56e209e470.1735580850.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:49:47 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:49:47 +0000 Received: from localhost ([127.0.0.1]:48461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhrG-0000tD-Mb for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:49:47 -0500 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:50547) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrB-0000st-A7 for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:49:44 -0500 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-7be6fdeee35so230174385a.1 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:49:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341375; x=1737946175; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mx2WWbLsJfM04g1A5YFJG9fAflwK0Jbj9GY36Agm6LA=; b=O2gvmd3Dkl/0GoyTyB1GGSbHennDwMVCXmBsI+CSdfhj2AdomN0jRekW2JChMDicnv YGfy07Ud3+QZ7pSLaNJztRAUMyzz3VaSNu9x+eIgZ+GDI2gxrDUZ/g80cuSwR+QowqSK 08E0bS1zXGGPbiAR2XT3y2wwQ3q4gh0IGodOU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341375; x=1737946175; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mx2WWbLsJfM04g1A5YFJG9fAflwK0Jbj9GY36Agm6LA=; b=kG/F1zqZ++JBs8VnrLHjZ13S9GmtyM8NWEYElw5tb7O4FkC3NdWQ4Y4KEshb+SxyGq N+dNhakdqeb1Kbn5tqw2dPdunc56HCDmN0ny2aFKt4RFF4wZc74/ceCMa/TqUer4aK/U PojEJ2eeSMYbK0u60w50MOmPaaM9RxHpkUHwyUYRgJfmNXbGHOnvwQAwuga+Clx892Zg TkfIarxW7U3UKEZRhCVZ3Kjr+n1xBlF2E3hFQ9FP4t9Z2Li+S6NqF1kNlQoMw82q0py6 JFYdj61+UksUrgJfpLau7JsewXZHbnXJ4fKV8n2aoiyZO+a9vOsUUrawotu04j1X2js+ EA5g== X-Gm-Message-State: AOJu0Yyv3tqTk7QNAHk4uaTg5BwStpwttiw3/5q/Re5fhGmlNhs42+8U HOqKkkCLk014lMLAx/9DD7nDkCkddOYo7j9puv7clxstEuwyJ7w/eQBDiU9a8/+Rvcy8caN0wd/ E1Yza/ff0Y+UoHce6KJEcMIXftiFix37LXjONJTDrNZYQnAFOuuwyd17s858YgJSOK/6ZSVVrOZ PJ9nG0cOqxO6JnwnhLGJk0epYYVxIbaDXMfvmsV6E= X-Gm-Gg: ASbGncvWvfzrR7pf52o3V0gHYZ+rEYZcSTjaZT+wXnHwBprA/i0GkdWZRqbM3BKov9v Ljzq1XYh3f171Zr2e5ho++nL+tmsT64rbg9bI8armArZ4Do90cxeCmIBKM06A1QKQ0ud2b9cvYd ELC3IUZlyL1CeC0z7aazj8r9ep3nDEsqbSdLhXOYs192jIJqIWxvXD6nIPRUFNOWg67E6Ejnevc xO/8XFcixp0PuUMxyzmXSylpV4GImBZtRyOvHmXEd2CR2SzM32ShPQCZrbXDJRFI2YTFz9IXaA8 n/sYPOz743Mfo+ADKjZnPkRk9OxH8YKXKfH6Y9ZYszNYN1wbr/RP82RLZH2i X-Google-Smtp-Source: AGHT+IGVu2rO7jMV9Rj95PHwVTnK73L3D1r2JC9SOwxQNbdiixOJVPHkVhU8OXtB+wi+tGceG4CY2g== X-Received: by 2002:a05:620a:6884:b0:7b6:d76d:3bf8 with SMTP id af79cd13be357-7be631e7249mr1818933185a.11.1737341374710; Sun, 19 Jan 2025 18:49:34 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:49:33 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 0/9] Slight updates Date: Sun, 19 Jan 2025 21:48:56 -0500 Message-ID: <20250120024919.3384691-1-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Aaron Covrig X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thank you for your contribution Herman, I went ahead and re-based these patches against the latest branch commit and dropped patch #8 for rust-rustls-ffi-0.8 as it was removed from the rust-team branch. Herman Rimm (9): gnu: rust-structopt-0.3: Use snippet. gnu: rust-structopt-0.3: Build. gnu: rust-syn-2: Use snippet. gnu: rust-syn-1: Inherit rust-syn-2. gnu: rust-syn-0.11: Use snippet. gnu: rust-synom-0.11: Use snippet. gnu: rust-synom-0.11: Fix build. gnu: rust-uint-0.9: Use snippet. gnu: rust-user32-sys-0.2: Use snippet. gnu/packages/crates-io.scm | 160 +++++++++++++------------------- gnu/packages/crates-windows.scm | 14 ++- 2 files changed, 71 insertions(+), 103 deletions(-) -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:49:53 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:49:53 +0000 Received: from localhost ([127.0.0.1]:48464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhrN-0000tX-4N for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:49:53 -0500 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:53556) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrI-0000t4-6a for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:49:48 -0500 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-7b6e9db19c8so371297285a.3 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:49:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341382; x=1737946182; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gk/1eAHbEa62A5nq/Ia3khajSCsR8LaVP7JpM02G1YU=; b=Ifm/Vt+IAM0pxHfT2uY1px8iuhkOM8xY7LEH/35OCxOLCeaq+9gGg4MKzjYldcz0pv 13Iket/qUsLlQbnsvhVsvUnmsGRXT1rbvpcCnZEAJjDl6bCJanlTPOGozM1d2em1ZS9a AoOZtDyUi/ff2lTfI+yT+J81w9UnLYzaO23sc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341382; x=1737946182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gk/1eAHbEa62A5nq/Ia3khajSCsR8LaVP7JpM02G1YU=; b=wnr9A0fnPlJG+oK8tuwEqNdSgbmkLagfcLyKv/yHmKV/171ulUpU3RPOjyS9nXsgx8 o4x8RaiZLMuB/UVfdRoozOdBy5ih5P06ZO+b4O/gS82BMQc+RYwW4Td+CJjtsjCUnbnW zsmP/SPuReo3/IWC1bDx0I1PaB8NU/2hkix0+gVJzavGS/jumdd54lW6pGoxnnrMppSS rFNYICCTxvkJG6JOg2vxQN5nuWwuqs+O2nZx4CdGxWsLsf7zDhbelXvS8EnuV+pqnwsg 1S5IOFabfr8BpriMA5BVkwC41hcIsZooDK30V3JDCLIiKEc2bXpJTfCavTsesOmzRg8v gZjA== X-Gm-Message-State: AOJu0Yy0awzEkANfmZ4hu3cEgg+DFG5d2PN0jJ1yydfbX1flgwtUrLXc LykwtdaYWNS3inWQd+yMZE4P5WuL5AL4ffPMPzOpp6crPCNKe25hp7adbbs4Fn9/axPuQHHuNdI p31bH9aoocYfnvBgLQ4pj+/vNAY/JSzdMOb75knofvv65K11FBDO3MpVExMN67napMVkU6K11AG SwI/4PDRlmgw0rS2ohzk6L+G87r7X/ra010YM+QqM= X-Gm-Gg: ASbGnctWJQF2/WoH75kk+tC4bTNIbQ4/sXRKQHg3361Ave+rkwfN/Rz0epa8HXhnh7O /EGFfibg/1Cp+rciw7TgUcltFu6JSNkwXQLXO/vGdkhOKFfEZXaCKEoMM9Lhy4ojrEHUFpmaADs Cw5XLG0zKg+MusI6/LQoY/xIeHtOrvLXZoWn5FzR/0Keazlj3zhXZ1VZP1+Y8SVyYJh7WdgJZin dhd7ZlUG1aSyXvnESCS8hg8CZl0CfWIMzydv1rQeKDUFOl2LOi6TJwbiNppEhOyGvIGzdRin63w P96I1CEYpllS/TJ9SHgvdjyV2y0xWGenIT7K5EkjKISvLICUaZ9XerfwDfbd X-Google-Smtp-Source: AGHT+IEDb5kXT87/HWpRDsS2I/gGCLIex8TQhhxJrUKSLVdjGI/gioDU2TTyMu3INRxhWRqAWrmIRQ== X-Received: by 2002:a05:620a:2985:b0:7b6:d4ea:fe8a with SMTP id af79cd13be357-7be632198cfmr1900829985a.12.1737341381789; Sun, 19 Jan 2025 18:49:41 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:49:40 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 1/9] gnu: rust-structopt-0.3: Use snippet. Date: Sun, 19 Jan 2025 21:48:57 -0500 Message-ID: <20250120024919.3384691-2-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 e769de7723..49b1a9b420 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76106,11 +76106,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 @@ -76122,15 +76126,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 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:49:58 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:49:58 +0000 Received: from localhost ([127.0.0.1]:48467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhrR-0000tp-JG for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:49:58 -0500 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:59578) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrN-0000tM-Mt for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:49:54 -0500 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7b98a2e3b3eso206426985a.2 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:49:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341387; x=1737946187; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5foT0MdZanjT+O3YzBW0NtuuLDZ5C6Xry11FMw9KKks=; b=UKV//uyZeNnc34ugGtSx7mu3+FumOvTbqe8nQiOybmiTulbeSD32ukwz9vZjPKwamz 5zOEOZA4xQ2jBLwCGSU39e+DybR5gemelxzIE6fK+YiFOugv5QzINOtVLWtAl+uJDWp3 FYqUKOGSIuxvmv8UBBhWYDoozH6+u8ug3jtPY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341387; x=1737946187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5foT0MdZanjT+O3YzBW0NtuuLDZ5C6Xry11FMw9KKks=; b=Or4kJJXeO9g0LlZhuSsE9ZkJm6WFwBXUVkHcKesH4Ti5No8vYmPLxA3WmKul31x8AC B2Kl2NDpVTousquG9YOnpb4J6os5GYF82oPsAoPAsvmODZr+iMP7Tz/yLCsla1Gzig0l ua6y/NKtY4aewqmTdXKVTI+T10kRjqHHEdcFasRP0woW79bFTCYp47XMpFy4AlWaPzxL 9/Y3Ms4q5wAyhKHl/yPb6HZ6mD7gtpwBD7Tm93I8wPsz4MM1h9IJ0anbgWBXh0b/BHku DhhvAvyUmAj3UyJ0RmKZTsRanBcaHKBgD4aaS3BAQbzVigvjXJ8hVHjvEAGbzgTVFSJA LS/g== X-Gm-Message-State: AOJu0YzFA0lceu7OQuCaPIjB77c0mvoILXbr3E7wkoU7X3bQOUt23N7d 2ZV7E+WEQlsLsFIpqW3xaS7FFoVQ+ZFBNZTWmKmzv8CsKzUuHKURZ0IJgWKt7/MEU+Q9hNdCIl0 JvtMl2qte9JVI0xy2vTcv3WTzw+jXU+xnsNrwglBfpdawouDvWLgs38lYJFY0uw3MTibtKcYfQi erZhBzXe+IiWo9Tu/lHmsKtmHDJseZGmOfmPlSABM= X-Gm-Gg: ASbGnctESkR/mIHUM/DsJC88wXv1YCKIcl677wkTOG0c2JH4FCT1nQ24a6WZ88zWtnW xsUW4FYhfShRclikJYGl83Yhwsi3i7wjx5nZcR6E/95Wa9zBYR0hVDvRlhrPwAvR5WNOquLdGdA S3+0pEbje8uOi0hOiIUjX5oILcDSQzs40VCseD7dXnK37LDMGLUBnTlcxQjeNze2odVytbtEx5I yAou9mQKC7PFf/nYUN/HcEu8hW4OuYk6vz9lVcKs4SXnXrAHGNLIPWrWOvoXUnodANK3wJCdIPl 8itF15m7HMxYVmgObD/tpH/JVNRx4qLDvioo4PuXM95nSzoLt/bLcBdtdSYW X-Google-Smtp-Source: AGHT+IHUitYiJox8URcidJ1aamblNFnmu0Cky00X+epuSRxe0hunWeJD++ycVFVyv03LrrmQuxA18w== X-Received: by 2002:a05:620a:4051:b0:7b6:d5b2:e6d with SMTP id af79cd13be357-7be6324698cmr1854427585a.35.1737341387306; Sun, 19 Jan 2025 18:49:47 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:49:46 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 2/9] gnu: rust-structopt-0.3: Build. Date: Sun, 19 Jan 2025 21:48:58 -0500 Message-ID: <20250120024919.3384691-3-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 | 39 +++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 49b1a9b420..5705720f63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76110,23 +76110,28 @@ (define-public rust-structopt-0.3 (sha256 (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 - #:cargo-inputs - (("rust-structopt-derive" ,rust-structopt-derive-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-paw" ,rust-paw-1) - ("rust-clap" ,rust-clap-2)) - #:cargo-development-inputs - (("rust-strum" ,rust-strum-0.21) - ("rust-trybuild" ,rust-trybuild-1) - ("rust-rustversion" ,rust-rustversion-1)))) + (snippet #~(begin + (substitute* "Cargo.toml" + ;; feature does not exist + (("lints.*") + "") + (("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 + `(#:cargo-inputs (("rust-structopt-derive" ,rust-structopt-derive-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-paw" ,rust-paw-1) + ("rust-clap" ,rust-clap-2)) + #:cargo-development-inputs (("rust-strum" ,rust-strum-0.21) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-rustversion" ,rust-rustversion-1)))) (home-page "https://github.com/TeXitoi/structopt") (synopsis "Parse command line argument by defining a struct") (description -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:02 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:02 +0000 Received: from localhost ([127.0.0.1]:48471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhrW-0000uQ-3v for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:02 -0500 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:50553) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrU-0000tk-EI for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:01 -0500 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7be6fdeee35so230197085a.1 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341394; x=1737946194; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WoXnJ1RyAb4nXqZCk/zCOQk1csi9xWWE4VPJ+RhjC4E=; b=e17TRbFs+iI1GnXxXP6tZvhQ1jk3MM8WDDR2JFe5ZcC1JnAs8UNzDogzilnNwUhCME zD74JNLrMPRhPTF96/BWC7MvEi4XntpdFj0aLaPXPG8DtAq0PSvTEDqpmP8MeJIqseIk ocdEG2/mTo+dTtpHDudoT1uLGn1SjFGg/SsmY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341394; x=1737946194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WoXnJ1RyAb4nXqZCk/zCOQk1csi9xWWE4VPJ+RhjC4E=; b=sNEPbJhgmkcOYRtLLRl4qQV0brEASHM+JWwFxzGFpKmm/T7eyU9fWE60Sdh5cUUIPj SZ6R8BI5fOon9/Ul1O+tightPsaqmVZhofboDG7ce9zKklZ8EuIYS8LBi9AopdaIC1OX 7yeFpvArtmVjOshK0wSj81DuM0CCft6qbDLBjljXtkVDJ9oj15gDVITVlYxRV0RThkEY 6yeRKLGwx/Tzkpgd8uHTut4W2/0+ZYDKuxoZH587WgDv3YuGhUW56fsgMuKPzl6uH8i4 NR2yc2XFBHq2WEx4b8qiwUPbu4Rnys/oma9xixMsfO2eDmg0q+rP0UteEkYr5TKdemiX S7Lw== X-Gm-Message-State: AOJu0YxrgkYRGoL3kHXGCyx5wRwEMvJLDXku2A8MSXLwp1aK8i1o2WRf HIEtk9vav/GtlKdfEi6XukCTrvLUB08sR1Cd9U2CYzjMoylIS8dGguS1PPAD5TU2Q0r8YaeF4v8 djlEL56JAcyS+lhWmrkB9aZTeq67LEDHsB2zsw3VQr9InwQeug2r/zo62NMy83QKQCnp23fnQfq I4vUItG9RjBKSshf1uNC9CJ1gyQdqKWuVyD5okngU= X-Gm-Gg: ASbGncsDvdZ6zZSPadIqG020xfJn/91jPW+QlKecRPISwdvIpI0Nf23QGOQcF4LBHGT /+G37JUjtn7Tkh/SSNGBA6MvMWnZ9vuzDLRTH0WezZM35QMJobDsysHj2NU32Teekq1JK5BpC64 Pe0r56+Ei+ito/dCa9x9+z4eiMnTILqD8RvfFt1yins9qM4NYmO2YLD/aS4Uv4kOBezLWL1CVrQ Dv1/StBaKUcHlRcBJSbShR0ZrljELJKQAAi3HsmyPRqZdrkNFOi21bUpzZObD3NemfH//sRqnsG oKSN16ohHzA4HDCS6tKtfIt9AHY9IUWmjix/d4jOAn79lc9b33kzoQ1SRojp X-Google-Smtp-Source: AGHT+IEAkZKEuMksy4tRKF/lNDV39/UHNkYTZZHxLkrFH8BF+vFmHlzM+hoP0jPecPreSvAUwbcbCA== X-Received: by 2002:a05:620a:2b94:b0:7b6:6d4e:40c5 with SMTP id af79cd13be357-7be63202652mr1931731785a.21.1737341394531; Sun, 19 Jan 2025 18:49:54 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:49:53 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 3/9] gnu: rust-syn-2: Use snippet. Date: Sun, 19 Jan 2025 21:48:59 -0500 Message-ID: <20250120024919.3384691-4-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 5705720f63..c4953f7e6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77442,26 +77442,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:10 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:10 +0000 Received: from localhost ([127.0.0.1]:48480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhrd-0000zJ-Sy for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:10 -0500 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:58616) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrX-0000tt-CI for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:04 -0500 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-7b6eb531e13so214063085a.0 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341397; x=1737946197; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L77wXUIDNVuQdkBNz/mrWut2phnHxYxJkiZUGt425EM=; b=E+sO6CNamVxPoxeFcqdBYnnIDtJv4TqY61ETwvP1IIrm86INQL9omq6A8QwqKdCS9X sVmOV8W9gI2snHy1K6nzoYIgp+gqG3kLrtZ9DkWZieSizqWaanKBfjCzDCz574oLP6UN Xvv52tfmSm/RtAfIzQsz3VEXdMNpXJsJorEsQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341397; x=1737946197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L77wXUIDNVuQdkBNz/mrWut2phnHxYxJkiZUGt425EM=; b=THi4v54DeQvK8W906wQLfsx3IO69eAS3S8AKoGTDqD7Fj7tUzmSWDkXWAJ7ZxpI9tq Pv5albQFxvsPg/NLY74i6RbKOuqzv3LqkKJN9dlZThq/shBIh6U/d/Zu16E0MO3cykri AqQAoiGEmYa7Qr+7arWAVLgb8VWNfCr7G17fw1Y7CvgjeQoZpBDf57Csnw0ku8dRaLbZ r0MjjCvQVVtUQ65zIGbh9amFR5jzDbOAFtlnnLSNeUZnx1BxmNDX3GfB5U0HgR2ngPRx 2Lkr7LuXZIczv4wJZbiWrSB4aHZw7NWzCyQqMZvSR0UuaK+XwEHvLwJlu/X7mY/gDFp7 so3A== X-Gm-Message-State: AOJu0YzcUBvgItiC0DXagSUPVAPaUJOPHPgRnkhZ4cyApr1C6BjeE+0w Djeu5BfZnHesAffVuCWeys7Go04a2S4Ec1ZCApbKN4WQmvu2fu/QnUYnKZSxg7QJ2c56C7XM/6n 29MX2PZGsXvwt1LZK5OXPCCvTL3HByFexXgknHW+VuEaPJv2Ef/QCocpAYo80saTJTJSr3RsT31 raAXheLVR/09iqXg2NTI93l+6PiWfmHnW+P7IAiEQ= X-Gm-Gg: ASbGncueiwxL4TCgLtp2TQAOS+98OMUO/X+46hNIScoCbt2KZhd8cRteBTr1n6xT2jd Dud3csENlKX2TnNvZAXxZk4iFLeNL0TrXcNUU+3zR9OapVedDptl2aycE9cGEyxtQhIPXaPhes7 UxL+ylVBEhl81RbXlTR+HOEfHkqGrCoyVrvUOxtaYtZlGMw+YHYzDoyIODiQ0zkwy9EnJ43fJAS Jqix4VoLF1L7W0uq8ob5z/wcVQ7UQBr2VANFHYxRz4NR0k1zPSgpSIl7m7V4mxlICKXvIlPvsjC RQ7ByqCkyIMUzc7ChfloWVywrkYgrIn9MqPqxp07niyivZIJ2vygfTVldQcV X-Google-Smtp-Source: AGHT+IEf44Vx49nTZG2flOLlZy0NonPJhhLoyr/oIqVhmOkTQJ2oZnsD7tXfqAH07IVqTXb6fJeyuA== X-Received: by 2002:a05:620a:4713:b0:7b1:549b:b992 with SMTP id af79cd13be357-7be632024dcmr2029306185a.23.1737341397315; Sun, 19 Jan 2025 18:49:57 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:49:56 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 4/9] gnu: rust-syn-1: Inherit rust-syn-2. Date: Sun, 19 Jan 2025 21:49:00 -0500 Message-ID: <20250120024919.3384691-5-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 c4953f7e6c..666f28b3cb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77489,28 +77489,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 @@ -77528,15 +77519,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:12 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:12 +0000 Received: from localhost ([127.0.0.1]:48482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhre-0000ze-Jn for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:12 -0500 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:45385) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrb-0000uS-Il for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:07 -0500 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-7b8618be68bso321894185a.3 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341401; x=1737946201; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zzpVGbOBu4Tv9GQPW1/u5R4BgLBrcsfdyoryDWlsA8w=; b=Nok7uoR4fvik5gQLK9v38rzkVeUIFaLgf4ENRo72ApW+4cr00wBeJv+QUPt12gFtGw AAeZc93Zuny5LVwMvpsFNIhw4ZrWSL6UVoN/ICQzAHYxXK2+GAQHhsN7LsaOtWU7YT3m dTWGz7ARnTV1gTJIfItDZt9lHThQV1gsX+pes= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341401; x=1737946201; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zzpVGbOBu4Tv9GQPW1/u5R4BgLBrcsfdyoryDWlsA8w=; b=VCGAUmNzYK4O479Ta/G4g25WJdywOBzcaEv+PPVqcMwlO4/huDa8nDlAY0Xsr7GX1B 1Z68aqVbh0ozwDA7UzL8IqyVkDCLCIa4ggtWdKO6K8mongmVfqNgLBx+4hG1acMgVVa+ XzqKHeSkc8ws7HzqTgRcaYYYs79QmTs7QAf03GkFcvzXmfRnqV4MfdJnERZE7mKwH+5g 0jMalLkRp6panYx6LdFUmXmfHmSE51m/5cQhpQo5i9lQ83/wBf0JeQyWqvBFBCAtGMB6 A2e6HaUavsJhOhckuOpSLtR9TIyN6dM5T4lafpXl3Ks0/RDpq9Q45H7gCQrZMdwlDR4i El8A== X-Gm-Message-State: AOJu0YzsPmnqMRjp1oza0NodXvD2ioT0sdL/LSx+smSW2aKxVnRq/Nmj IP2DZMUPCdSZ+jdnZkYZusDuST1fVBeXPYb9R0ZOLqWGw9hFAPlWrHwG1X0DMLKY/V59zJKCEzP TF/C23noLa+J75RrUHl28dB7OuBKkFfgoMKezn/2RbjDYQIBaQv9DJ72akjJ8ndC47YVeHbzUy3 3EF/rqOkF6uBOjlMG+GUvbPQVWTqD/yiJbbtDUDQ0= X-Gm-Gg: ASbGnct7okRVym0NeO89xV7kgpaeF75+tJA8q1Pl+Y+z6A/BNB5Gr6RUrk5DsFXVYaK eLD3st1dUESMGd5m+yqufU/Z050mis5hb2fc2/xMj8M8q3Ub7QefG5tE1lFnEPwbgh7M+NaP4mD 3FyTZWEnEUCZcRJ5Gm+MIU2An5F2miynYFZRb2WPl/cyW6MXl2m383cgdUkLb80bDUdLG3+1QhN kR4OGbFx41Vz2K71uttqNBke3t0XUzeK4MPI6fktzavgmZDG77x74oAQmP7G1BW28SrUSwvQlHx e7Mibm7J5b+wrDVy9T61D7r+k5psUqWO7fzTQ72RvVbMAnQCyfxnMkIJlOQh X-Google-Smtp-Source: AGHT+IGkps3pZ9vSVtjm1DWDyW7snCD7UGv/nfRuzjUa4wUCAMs3uIgi+ICcRyxkBOMTF3YmkfrwyA== X-Received: by 2002:a05:620a:28c9:b0:7ac:c348:6a52 with SMTP id af79cd13be357-7be6323ea75mr1701505385a.34.1737341401252; Sun, 19 Jan 2025 18:50:01 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:50:00 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 5/9] gnu: rust-syn-0.11: Use snippet. Date: Sun, 19 Jan 2025 21:49:01 -0500 Message-ID: <20250120024919.3384691-6-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 666f28b3cb..3185f06044 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77583,19 +77583,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:16 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:16 +0000 Received: from localhost ([127.0.0.1]:48486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhrj-00011S-L9 for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:15 -0500 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:59571) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrg-0000xN-QS for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:13 -0500 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-7b98a2e3b3eso206433885a.2 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341407; x=1737946207; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eWXv7x2eV4PqosGlPGpzs2oM0NXFDDsUMRgcXs/f6Sc=; b=Xw9uXByh7cbyBXNX90oqrNU6wRoYFNFu1QJNXKrn0OcVU3z21h7cDXKokjMWAcYxG3 2UudN4tJpZiQF7/bi/vn57ruZRX7PtQqVppBgbmZUPs43P6hNN/Gj1etu9TB9vJAJthu wWsADMbnb0VGwZ62jy7NKqYIDRq/fgZLMQxR8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341407; x=1737946207; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eWXv7x2eV4PqosGlPGpzs2oM0NXFDDsUMRgcXs/f6Sc=; b=kgVtjckqpOCRmu2JRJbeQ5rjUHcd0knmZXvyTZzYxvXg/Dn1jI2nBCKZC3uccxc0Jn HgS2LEF+Bj7mnomRFWLpRZvGyexVPA1FcOgxmG8kHGMF97JiJa/hOQSMnfzhrEaWtZRw wPAvu0U+HuWZkaLUiWv7RQsc679fTNH3etzKWXbDZiTANJ9NASIYJ21qZXuiGvh/CWkp k9zZF4ZnfBeDiaZWozi9TswPPqsQwCNQVcVQsbAW6ZIE75AmkmZxEzarStg0fYUQ4nWl KS148rmW0rPn6ePikVeJnJWVzPk0h4J7qTgCFl0CVCbud2b83vnjJ8OxxX/gOGR3AjT9 NOrw== X-Gm-Message-State: AOJu0Yzjt2ilRM6pDqtUI4JY7JJAlU8udLXOrnosMUsSuXCsnbVbshJZ snEScnbMS5tRnzCB9dzoZNcszggugBjsWRQDuiQdYVy2Yh+iDJPxRUc/mc1Rj3Ox1jD+Tej34eB shSkSe/M87hNqwypR3xBEu0EaHgoEdQblO3EUpvakVVGZ1ShZHICB7aC+Khb/S4/huo1LJ3rAJR bmAKsGMnWuPlIsvgXgQtrRMkU5FMGVxSyVrZHgazQ= X-Gm-Gg: ASbGnct8t5MKzyYaAFSW4zhcXNpYOsX8q8ESEXCjc91sNnN2cKB0DEd7h8u/f8Fgk5c pnLZ0ZhGdzKM7dMqCIuxaAVION5GbAe/C1ELgfgEyxoPJXOyVkrRZYVMdRysDX0GjAjKhjBBsv8 1TeBFaITs97W54wSCiYdKjLnpyTyS5is/6odU+3bIvolEbM5K44vVg6lR8nfvT1Nm3/rC46JCgz s/3EUAfGnCqzfgeQi/lFAzHdHjDZ5D+YjJeG7oJtUQar0otYGXWxWpw/DjFJ4QYXndOUUj0gkfT 2y7sMyLhrtrXYxq6loaQY1FxyyuC7nlFzV0yAuzi46Jul3zaVvcN4qQCyz8J X-Google-Smtp-Source: AGHT+IE0BcUtnKkrfHbqYT2DraAuyf6pg7pV3BplHxyl5RMZnVbIN+D8hgwhzWJXSPsV29OTAIYnew== X-Received: by 2002:a05:620a:40c2:b0:7b6:d8da:9095 with SMTP id af79cd13be357-7be631f5d22mr1983634685a.13.1737341406837; Sun, 19 Jan 2025 18:50:06 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:50:05 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 6/9] gnu: rust-synom-0.11: Use snippet. Date: Sun, 19 Jan 2025 21:49:02 -0500 Message-ID: <20250120024919.3384691-7-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 3185f06044..1b2adbd875 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77714,21 +77714,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:27 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:27 +0000 Received: from localhost ([127.0.0.1]:48491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhru-000122-PK for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:27 -0500 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:49547) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrl-00010h-MJ for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:18 -0500 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-7be3f230436so376182985a.3 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341411; x=1737946211; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dgqQ9lDEX8P0uf7LypPaeKrN084h4N6CczQqUzy4K64=; b=CS8iPJgBGW+gb+74i/HE/BOFMarwVGzewyL5g/pAD8VlZijaa4F9xCaaVtx0acOfih xQsXWd//tH9CIc5kfmDgR7QejdGrt6d9c52p+8PRa14DUbDpJAg5yr2bsBTCsJf0Od2X fWhewt+YAcuuMhNuE2EWp82IG2ZKArj3CerZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341411; x=1737946211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dgqQ9lDEX8P0uf7LypPaeKrN084h4N6CczQqUzy4K64=; b=hNj+iykfqi7MT3wcuZmP27UdbdcSFx/5ktkwtIEpaqTukCAMrFGpe0HMUPjlgKFZIz Nk4onv4eOJpkiO4XSQASYJA0EDLpxRBVDL7VKlWoVo51XOnb41kzWbOG5o0RSaK9PiIR 8FmsCBmGWMSE03aOhZnOXZADTKcEqAbXMtV0/z0dfaOtb6sjzGddTdr5mFgpWZMEtvl6 Mvn0pRW85dIOliLL1OSBWmC9pICEMHkP6QcHMQNyWyKhOA6Y1PbIStwiV7jOj4Ie4mKP ud2BZBggH/m5bqtKmlGnaxWSWLxZWZPvOznhqGz6gJctk+QwmMEl+FLqA3A9YmP20IvX EoPg== X-Gm-Message-State: AOJu0YxU366IJ1dyuZ2ohumoxGG5sD9PS+UVF8ntA7hqvXMutwKqzWX8 6R31tEYodJf/WBKXaIdHZQLCoLlpRfOfnzsuX5oToR1mg+aKNMFj4hdHhbg+oWlr/eecAY9lbF5 FM5LmO3ZjuoMgz57gEdiKC/wPsri/mTL8wX7kHtGhN3aIVcQqsGf0TCpeGlgtFv6bsIGZrwFB7z 7TPrhgxCMfALZ6AYuncNlP06YTlhD406ZBgFAsydo= X-Gm-Gg: ASbGncvPmCnkeaJfuhUZefY70mqUJGGccVz32LbiGDxg/y635f1jAYOusAus5Cgyf3c 8rV6DZ/gDR8woaO89rq47TEqf6DsdEdriXQFvRqYzB6AN29dYj2DAYM0hGuLljmF40QnGGr2veM D8VPPGtjVaVKBMuV1dt7V4xDKPdkxAOKTru2g7WIZoG1RZTEO0zOwP5RG8h7rjJEdDxMRET2TTt RDk+f/K3KlxmVfaCXsxV6HNjIOwg0I8ssneHMOBEIflTNZc7JsXrk6n2FCfm4yH1QchAYiHnIYA 2/y0T2pKgS74ToHq1siLblzjypGoFNQ1zNlQvCPxdy9HlV+n5D47ppmW4ySA X-Google-Smtp-Source: AGHT+IEHhslkeWc1AVQmMy/fEg68FtuMemaRxLvPXkkcIcJS1zdycn2x5neSsC4yKDjnktYYRCD6yw== X-Received: by 2002:a05:620a:45a2:b0:7b6:cb1c:aa22 with SMTP id af79cd13be357-7be632103d8mr1992514585a.1.1737341411235; Sun, 19 Jan 2025 18:50:11 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:50:10 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 7/9] gnu: rust-synom-0.11: Fix build. Date: Sun, 19 Jan 2025 21:49:03 -0500 Message-ID: <20250120024919.3384691-8-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 1b2adbd875..6c274d31e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77719,6 +77719,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:33 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:33 +0000 Received: from localhost ([127.0.0.1]:48493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhs0-00012F-NE for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:33 -0500 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:52691) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhro-00011T-Rr for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:21 -0500 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7b6ff72ba5aso389264985a.1 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341414; x=1737946214; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rFh5lfVsclyc23XIo7zb+HQhq2hhrgO6V/qWCOhjYsA=; b=LZlwAVD7ggJdK2mIhQLXxvwiyTFIKAmUDqwrAfdOKkuZfq1K9iLxoc06EGaVipVJqq ap7C8Q7t3qFKglvrCv4zAo+rJgJaaKeJQz9baInAi0bykCfDRq2tA5o6unkyeRoWzj1C fHVkyVK79/mYmu8cXC1bQfdtSIMEsOro8xs98= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341414; x=1737946214; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rFh5lfVsclyc23XIo7zb+HQhq2hhrgO6V/qWCOhjYsA=; b=oajsi2qxkQ/Flyj8t965ugdH3kPcM6OiU2Kd1TJU5D6hw61/Kx4GBr8VJnu73Uib2L /H3b94m/TGpddrDEGaCXpajxV7tbZO66jA/Yo8gD5YZYqIQIlwQN/PGlOw/yWTmdKQhM IYN6MJrFiFUW5n0eUF2qaBjIfQXRk/9HeJ+UO8nxpMxbSLbugqw/jW+ZujXvRE3HeAK0 8mupK6eT4w9CNxff5S9nSA+HnZSaTBpmGMgsgVRBoPcVqt4Y/DESq0BtDQJ8gRtrNlIb ASryYmT9Ujf1Fz8P+ng2g7X7fXahoBHrNV9NPLkyIzQhoSwtp/VYQXeerlDOFFYnOm92 gJEw== X-Gm-Message-State: AOJu0Yzjh7ao1ifXCwlhrNu8u2sjvtYQ4Hg5uxYvIiRm2xSZrWQQkSFJ 9K0WpjPRpRgi0eb6MRubl7Scpf/14lbOH+8LqCvpBt7QrNPQEo/BNn9paF/X3e9P7L4ikpWgLI0 Sgs4LNZrQGUFLLDXCPOYrGsRt0eXT5MEUCbLxywHSSPjyh8TEaYOIxC0QD3oOexGFfAJsUfwBPi e9OixvSTE4+3biL5bshaZQ6yeTb6H3QzHzVLEvrFs= X-Gm-Gg: ASbGnctUGyHfUwPDzXUf3acFZVUcgRs+lhYI47XYi3Ol2b6VAhKnj+wdHjqOcgy3xRn 7yOVKrAFBE7ZlwE0B1JKYzBC68ZZfiTe4mNdTMQSQQwaCfSAV3a3COUCrR/UJczHtB3k7M8n6O8 b6K7kP3Ds8Vpb8teGMazdov7b0MjthHXXCu0YfXrFBmptMttuZU6faRTq10PJukRNCEww5UMPn6 O9cW61DvT1WqNJv2CcgDNJurABQMvbJZS9D6qf3rh8IC382IO1eSBHgwUMbBjdTRWEtAJ/NZbxP CTZ9jvzgyG3da5ub3vGeh9Y86lJgUf2VN6Bt8ONbSQrfiOpuHj4GtTbEc+au X-Google-Smtp-Source: AGHT+IGNSvebfnyQtoQcAPjcEg4vNpHosH9ynmjTfus7WCWQ5gnn+9l7T3go3NubzJLtBwbBPPwQmw== X-Received: by 2002:a05:620a:d86:b0:7b6:cf71:2788 with SMTP id af79cd13be357-7be63219877mr1718405585a.11.1737341414617; Sun, 19 Jan 2025 18:50:14 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:50:13 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 8/9] gnu: rust-uint-0.9: Use snippet. Date: Sun, 19 Jan 2025 21:49:04 -0500 Message-ID: <20250120024919.3384691-9-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 6c274d31e2..273002151a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -87267,12 +87267,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 @@ -87285,13 +87288,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 19 21:50:34 2025 Received: (at 75206) by debbugs.gnu.org; 20 Jan 2025 02:50:34 +0000 Received: from localhost ([127.0.0.1]:48495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZhs1-00012I-PI for submit@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:34 -0500 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:47255) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZhrr-00011c-EM for 75206@debbugs.gnu.org; Sun, 19 Jan 2025 21:50:23 -0500 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-7b6fc3e9e4aso386767985a.2 for <75206@debbugs.gnu.org>; Sun, 19 Jan 2025 18:50:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1737341417; x=1737946217; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0OBRprM8aaThP9JGAdl598/1Hj2+6QOM54gjWJe+eB8=; b=Uh1UWWxo//5hFW3RqpTwEwvpdvhaTWoQIp0mi02xTTo8i0FHyMD5Vy/OPiVDruaLn/ 4x+3NaRpR1XIaZtB/o1xOF9d0jK9fQJ4xpXsHADyP94EZDyXg5HI83/20L+9E0c0tk9h 7LAqZOYUIvNFfDT0JzjjzHw/8iuVqEaoBpzqA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737341417; x=1737946217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0OBRprM8aaThP9JGAdl598/1Hj2+6QOM54gjWJe+eB8=; b=bEywmbPOnOcQ/pd+x/suNbBVrziPw/Smagr8M5dg4EhtB6LHUyk6GaNtY4hv/+5hvT ENT130XIeTaE72e2dAD9T1x3HFQGDoRoPFyPb9dqTVHxAkqZFtbqrp3Zy4ecer2FYtC+ ChWg0TeT6OiCt7ICXKOts/FTP1yelY29lLTNdIWbkTokTPiAccux/5K18otoKwfC2fKl FHQ0DA0CFEE2Ze+LLX+I41l7IJA7FxSX2eoxHZdDKjdvcmdzUTq23boIeevwTOAsHp8p bLUKYnBOzIWN4QMH38N/CpzgdwqGfE8NbT1Y/k9SAVrVisU1dDovUOs5dP6QMyY6XFgY naDw== X-Gm-Message-State: AOJu0Yx/7/mBiIlGtZ0UWOo7bH28SOCiDNe7a+iQV4wOQR3suwdJjasn VYx5DQ5YCnTQPqt0BNCzDNr/H4H7COXCS5yaKhY2N2w2L2Epvvxm2bzr7ZybmTmw3TeFP0ZDZjC eGKrSkVZEOgi52KZ8WR9KA0BmbYwM05Gvwoqqg3Hfvou/8YR2F/M53e3v3rhkqqdHz4ijGZZq44 ov2gYtspV6Xud/adGq15spW3j+5GZfy68OVQE3Tr4= X-Gm-Gg: ASbGncuA034n1p5xs3mtYZipUhBHBYTlJO7kwfU6TOMV2ctYzOqDvmGx8qsTk3e9Foe gdEkcY8Qiy7J0JAaTsC2+tr6i72YeWSfMMhvkemxBcWAEB/sR5sffCLI+csocGci9aebKWYgR/W pQzxHqS3l6Fd1OI1WiiUycCD2qxNAHnkAFuiWUAjdHgg5ZKUCOy37JSc6v2/28XOCbDwMp++zGQ TnyadXbgk8TkGvogzdxd3tUYhp7Bb8REHB5g+//rr96X6+PDGrOuauShv/Kmimv+yIQrhptL39w WGsF+HPMqMePHgtqN+xYKHTaKL3C5cjfMIPDZa2Zkz5agrudmmB/kAT+mjbv X-Google-Smtp-Source: AGHT+IFkT7NBoCyeT9ORUWDGvB4Ge845NyQe4r9MHfZeZ7kI+iraM5L8D232i7bEfU3GQfgItrcv4g== X-Received: by 2002:a05:620a:2485:b0:7b6:d435:ccf7 with SMTP id af79cd13be357-7be6328903amr2057309485a.50.1737341417543; Sun, 19 Jan 2025 18:50:17 -0800 (PST) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be6147f2e7sm393849085a.32.2025.01.19.18.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2025 18:50:16 -0800 (PST) From: Aaron Covrig X-Google-Original-From: Aaron Covrig To: 75206@debbugs.gnu.org Subject: [PATCH rust-team v2 9/9] gnu: rust-user32-sys-0.2: Use snippet. Date: Sun, 19 Jan 2025 21:49:05 -0500 Message-ID: <20250120024919.3384691-10-aarcov@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> References: <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75206 Cc: Herman Rimm X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Herman Rimm * 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 2f212190dd..701b8bd9f2 100644 --- a/gnu/packages/crates-windows.scm +++ b/gnu/packages/crates-windows.scm @@ -911,17 +911,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.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 07 12:12:05 2025 Received: (at 75206-done) by debbugs.gnu.org; 7 Apr 2025 16:12:05 +0000 Received: from localhost ([127.0.0.1]:56503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1p4u-0002VM-On for submit@debbugs.gnu.org; Mon, 07 Apr 2025 12:12:05 -0400 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:41764) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u1p4r-0002UE-Cs for 75206-done@debbugs.gnu.org; Mon, 07 Apr 2025 12:12:02 -0400 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1u1p4g-00CPtE-Ak for 75206-done@debbugs.gnu.org; Mon, 07 Apr 2025 18:11:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date; bh=Gu7Qj/G6aBmK84o40BtjOIuuNgI2PF+Mx4RilhrM3SY=; b=alopeqN2d1fpzoGSiQhVAPcIQd OMpaMwVKZwVo0Ohgb4h8RCu9no+Zxbuv+ooQkby/YxSw45FyqWkEWEBXlMwMaZJwO5WJROYfb4QYm ncwcoSoKjt8DBFuqdgMb5ZDoDYaLjQcQDetb2JC5PM3r4iyulAbVrwPNS1K9yRwUbaeAtMif+Q2JR smrwFt2+ww2E0Ry/nNb+HfXdlR+y7BVr5Qj9AuSCd0UNMuCzHKKjR9rZZHbGRp6PXYsuWg/9WbNrY rY0drz+aDuq5Mha9Ax7Vo0o5MxLkKEUPy3V87bcpQ71SOtJmer4Dzt8sTnMArF8o1h9pvbCKUbvNP HjV3y1Eg==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1u1p4f-0002y2-Rw; Mon, 07 Apr 2025 18:11:50 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1u1p4Q-0081up-6B; Mon, 07 Apr 2025 18:11:34 +0200 Date: Mon, 7 Apr 2025 17:11:33 +0100 From: Steve George To: 75206-done@debbugs.gnu.org Subject: Re: [bug#75206] [PATCH rust-team v2 0/9] Slight updates Message-ID: <174404179304.1450750.7160221019323424189.b4-ty@futurile.net> References: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee> <20250120024919.3384691-1-aarcov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250120024919.3384691-1-aarcov@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 75206-done Cc: Aaron Covrig X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Applied this series that Herman sent in. Herman - as I understand it the current requirement in the manual is that a patch should contain changes that "Verify that your patch contains only one set of related changes" (https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html). Some of them were very atomised, so changing a snippet and a build option split into two patches. I don't think you *have* to do it this way, unless you wish to! Aaron - if you review a patch meaning you download it, apply it, build it and if possible install it then feel free to add a 'Reviewed-by' trailer when you reroll it. Doing reviews is a great contribution! Details below: On Sun, 19 Jan 2025 21:48:56 -0500, Aaron Covrig via Guix-patches via wrote: > Thank you for your contribution Herman, I went ahead and re-based > these patches against the latest branch commit and dropped patch #8 for > rust-rustls-ffi-0.8 as it was removed from the rust-team branch. > > Herman Rimm (9): > gnu: rust-structopt-0.3: Use snippet. > gnu: rust-structopt-0.3: Build. > gnu: rust-syn-2: Use snippet. > gnu: rust-syn-1: Inherit rust-syn-2. > gnu: rust-syn-0.11: Use snippet. > gnu: rust-synom-0.11: Use snippet. > gnu: rust-synom-0.11: Fix build. > gnu: rust-uint-0.9: Use snippet. > gnu: rust-user32-sys-0.2: Use snippet. > > [...] Applied, thanks! [1/9] gnu: rust-structopt-0.3: Use snippet. commit: 8b40c7fd60e513d8d0355fd729b9aa9ca688e838 [2/9] gnu: rust-structopt-0.3: Build. commit: de1f41669bc2c80838d7e558971d465d6f6d1a55 [3/9] gnu: rust-syn-2: Use snippet. commit: 484885be6dc62d51abf79ef24b2b8e0227b87e42 [4/9] gnu: rust-syn-1: Inherit rust-syn-2. commit: 018151f7ac641b529c40ac1742486ace25673db6 [5/9] gnu: rust-syn-0.11: Use snippet. commit: 47904214639e75cff6f26b2d92b8aa488ab4918d [6/9] gnu: rust-synom-0.11: Use snippet. commit: 2014c1bbeb91701be0c94384315e119e2a45afdf [7/9] gnu: rust-synom-0.11: Fix build. commit: 4c436da549905238c2161f80ad7ed3e1a651535e [8/9] gnu: rust-uint-0.9: Use snippet. commit: 076e3f3b237aa307bfa40147859f8deb4bec7f9b [9/9] gnu: rust-user32-sys-0.2: Use snippet. commit: 7be2b8f57f6986654f198b43b4e96833e18b1a77 Best regards, -- Steve George From unknown Sat Aug 09 21:22:34 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 06 May 2025 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator