From patchwork Wed Aug 30 19:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53315 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B01F27BBE2; Wed, 30 Aug 2023 21:01:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0454827BBE9 for ; Wed, 30 Aug 2023 21:01:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN2-0000nF-Jp; Wed, 30 Aug 2023 16:00:56 -0400 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 1qbRN1-0000m5-1V for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN0-0002bl-PG for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRN8-0004Vp-FV for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 1/8] gnu: Add rust-notify-5-pre.13. References: <20230719022804.19613-1-distopico@riseup.net> In-Reply-To: <20230719022804.19613-1-distopico@riseup.net> Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342562017194 (code B ref 64720); Wed, 30 Aug 2023 20:01:02 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:20 +0000 Received: from localhost ([127.0.0.1]:54144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMR-0004TG-Un for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:20 -0400 Received: from mx1.riseup.net ([198.252.153.129]:47632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMQ-0004T1-HN for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:19 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RbZs12hyJzDqJ8 for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425605; bh=4tPnd+Z1oBQI66EaGaDe1/DT+nTC9xfUpq9lm3f93B8=; h=From:To:Cc:Subject:Date:From; b=JESc4SA0bxLC1CmyFm9zKp4P12qmPRhu2ffkvEYnTTIMchMwj04FnZ3Z+zw/jTA+o lW2RCVllxdw+z5ORnwwR6Bdszf2KICgoVCmVOEOANAChokkUgPzcozcB9w5yqnGb/+ zSQqyXu2tc1L1nboKH+XDnuXMBzpYH4miyTimhFU= X-Riseup-User-ID: B2265F4865062C13D524ECDCCCEB71A3DA9056F7FEBFBA32B07846C63C952EEF Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZs04b6NzFqgY; Wed, 30 Aug 2023 20:00:04 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:13 -0500 Message-ID: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-notify-5-pre.13): New variable. This pinned version is required by `rust-analyzer` version `2022-01-10`. --- * gnu/packages/crates-io.scm (rust-notify-5-pre.13): New variable. This pinned version is required by `rust-analyzer` version `2022-01-10`. gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 77a41a5116..b6e2ac4507 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41724,6 +41724,19 @@ (define-public rust-notify-5 notification library.") (license (list license:cc0 license:artistic2.0)))) +(define-public rust-notify-5-pre.13 + (package + (inherit rust-notify-5) + (name "rust-notify") + (version "5.0.0-pre.13") + (source (origin + (method url-fetch) + (uri (crate-uri "notify" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0za8mpacxkr62fii5h7ny4h396y0m8myd3hf08njqdg2h21kap94")))))) + (define-public rust-notify-4 (package (inherit rust-notify-5) From patchwork Wed Aug 30 19:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53318 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9CBC927BBEB; Wed, 30 Aug 2023 21:01:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14F5527BBE2 for ; Wed, 30 Aug 2023 21:01:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN3-0000nt-6T; Wed, 30 Aug 2023 16:00:57 -0400 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 1qbRN1-0000mH-Dj for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN1-0002bu-5T for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRN8-0004Vw-Rk for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 2/8] gnu: rust-analyzer: Fix build of version 2022-01-10. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342562717217 (code B ref 64720); Wed, 30 Aug 2023 20:01:02 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:27 +0000 Received: from localhost ([127.0.0.1]:54147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMZ-0004Tb-7p for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:27 -0400 Received: from mx1.riseup.net ([198.252.153.129]:37096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMX-0004TN-Sa for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:26 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RbZs859GlzDqJ8 for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425612; bh=BMNN+lWztRrJBv8ac05C924jFuVe3BzmJDJa/hbmfms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXLtU41eTxCbCS9qCyRcL87nTaSNLqvapHZX/zgtzd1UHaBiTQQUGrrY5fFbJKZZ0 9nkH0EFqRCFCG+gM0LIIP96SZI+5f37LQ6NKRyOf45g189s/c84HpM1hFSVioxFN/T p1DkUuewzc+QbqoqjQWx9lyf/LVkz4pw00+rzl98= X-Riseup-User-ID: 9A28BAC774ED44E3361D544E4B2041A8D8DFF15C08BFDFD974A9EBB0F1CE34E8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZs803gPzFpch; Wed, 30 Aug 2023 20:00:11 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:14 -0500 Message-ID: <20230830195955.16158-2-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (rust-analyzer): Update dependency rust-notify-5-pre.13. This fixes the build of `rust-analyzer@2022-01-10`, which required a pinned version of `rust-notify` (`rust-notify-5-pre.13`) to compile and rust >= 1.64. --- * gnu/packages/rust-apps.scm (rust-analyzer): Update dependency rust-notify-5-pre.13. This fixes the build of `rust-analyzer@2022-01-10`, which required a pinned version of `rust-notify` (`rust-notify-5-pre.13`) to compile and rust >= 1.64. gnu/packages/rust-apps.scm | 22 +++++++++++++++------- gnu/packages/rust.scm | 6 +++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index a291282325..8c7d8006cc 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1780,9 +1780,10 @@ (define-public rust-analyzer "1ci85bp8xwqrk8nqr8sh6yj8njgd98nhgnhaks2g00c77wwyra41")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f ; virtual manifest + `(#:rust ,rust-1.64 + #:install-source? #f ; virtual manifest #:cargo-test-flags - '("--release" "--" + '("--release" "--lib" "--tests" "--" "--skip=tests::test_version_check" ;it need rustc's version ;; FIXME: Guix's rust does not install source in ;; %out/lib/rustlib/src/rust so "can't load standard library from @@ -1793,12 +1794,19 @@ (define-public rust-analyzer "--skip=tests::sourcegen::sourcegen_assists_docs" ;need rustfmt "--skip=tests::sourcegen_ast::sourcegen_ast" ;same - "--skip=tidy::cargo_files_are_tidy" ;not needed "--skip=tidy::check_licenses" ;it runs cargo metadata "--skip=tidy::check_merge_commits" ;it runs git rev-list "--skip=tidy::check_code_formatting" ;need rustfmt as cargo fmt - "--skip=tidy::generate_grammar" ;same - "--skip=tidy::generate_assists_tests") ;same + + ;; These tests require rust <= 1.60 and too many packages + ;; has as dependency rust-serde-json-1 that use indexmap2 + ;; and it need rust >= 1.64 + "--skip=tests::list_test_macros" + "--skip=tests::test_derive_empty" + "--skip=tests::test_attr_macro" + "--skip=tests::test_fn_like_macro" + "--skip=tests::test_fn_like_macro2" + "--skip=tests::test_derive_error") #:cargo-development-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) @@ -1845,7 +1853,7 @@ (define-public rust-analyzer ("rust-memmap2" ,rust-memmap2-0.5) ("rust-mimalloc" ,rust-mimalloc-0.1) ("rust-miow" ,rust-miow-0.4) - ("rust-notify" ,rust-notify-5) + ("rust-notify" ,rust-notify-5-pre.13) ("rust-object" ,rust-object-0.28) ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.11) @@ -1927,7 +1935,7 @@ (define-public rust-analyzer (chdir "../..") (install-file "LICENSE-MIT" doc) (install-file "LICENSE-APACHE" doc))))))) - (native-inputs (list rust-src)) + (native-inputs (list rust-src-1.64)) (home-page "https://rust-analyzer.github.io/") (synopsis "Experimental Rust compiler front-end for IDEs") (description "Rust-analyzer is a modular compiler frontend for the Rust diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 4ee5ded5de..5cfdeffa81 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -652,7 +652,7 @@ (define rust-1.63 (rust-bootstrapped-package rust-1.62 "1.63.0" "1l4rrbzhxv88pnfq94nbyb9m6lfnjwixma3mwjkmvvs2aqlq158z")) -(define rust-1.64 +(define-public rust-1.64 (let ((base-rust (rust-bootstrapped-package rust-1.63 "1.64.0" "018j720b2n12slp4xk64jc6shkncd46d621qdyzh2a8s3r49zkdk"))) @@ -891,10 +891,10 @@ (define-public rust `("procps" ,procps) (package-native-inputs base-rust)))))) -(define-public rust-src +(define-public rust-src-1.64 (hidden-package (package - (inherit rust) + (inherit rust-1.64) (name "rust-src") (build-system copy-build-system) (native-inputs '()) From patchwork Wed Aug 30 19:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53320 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 169AA27BBEA; Wed, 30 Aug 2023 21:01:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A244A27BBE2 for ; Wed, 30 Aug 2023 21:01:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN5-0000ti-2w; Wed, 30 Aug 2023 16:00:59 -0400 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 1qbRN1-0000mf-RH for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN1-0002c7-Ij for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRN9-0004W4-9a for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 3/8] gnu: Add rust-either-1.6.0. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342563217235 (code B ref 64720); Wed, 30 Aug 2023 20:01:03 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:32 +0000 Received: from localhost ([127.0.0.1]:54151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMd-0004Tu-Os for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:32 -0400 Received: from mx1.riseup.net ([198.252.153.129]:37110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMa-0004TR-PH for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:29 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RbZsC4PgrzDr2f for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425615; bh=p/nauWG0CJfdJz1uE4My6Lpx2b6T0nmgWXEnhINfCjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dkFzVfrs7cGpsZ1QIi1IQrfd0ANJU4Oq7Xaok6XiwFp7BoeZvGPchpjkaC4Cv0Psr yRyMluRcwDsQNEB8Zr+RIB+2CO5LGSQWnp3/BdorStBkxNdd0LavnHva4QRrHqIPkS B8Q3jQ/2ojO3roB8DgKlgJkJFGUjz8EHkM2PQgYE= X-Riseup-User-ID: 162C525B084917346E73015AB27269606AFFD9C7BD03A878E2EF94B816C8DB67 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZsB6QVYzFpch; Wed, 30 Aug 2023 20:00:14 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:15 -0500 Message-ID: <20230830195955.16158-3-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-either-1.6.0): New variable. --- * gnu/packages/crates-io.scm (rust-either-1.6.0): New variable. gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b6e2ac4507..6a0f4e187d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21557,6 +21557,24 @@ (define-public rust-either-1 @code{Right} is a general purpose sum type with two cases.") (license (list license:expat license:asl2.0)))) +(define-public rust-either-1.6.0 + (package + (inherit rust-either-1) + (name "rust-either") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "either" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mwl9vngqf5jvrhmhn9x60kr5hivxyjxbmby2pybncxfqhf4z3g7")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1.0.73)))))) + (define-public rust-elf-0.0.10 (package (name "rust-elf") From patchwork Wed Aug 30 19:58:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53319 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 13BCA27BBE2; Wed, 30 Aug 2023 21:01:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D95827BBEA for ; Wed, 30 Aug 2023 21:01:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN5-0000to-3d; Wed, 30 Aug 2023 16:00:59 -0400 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 1qbRN2-0000mt-77 for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN1-0002cG-V1 for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRN9-0004WB-L7 for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 4/8] gnu: Add rust-proc-macro2-1.0.34. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342563717265 (code B ref 64720); Wed, 30 Aug 2023 20:01:03 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:37 +0000 Received: from localhost ([127.0.0.1]:54155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMj-0004UO-Do for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:37 -0400 Received: from mx0.riseup.net ([198.252.153.6]:34254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMc-0004TT-GZ for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:33 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4RbZsF1HVXz9t8N for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425617; bh=Afe3whWGpquUjM7pNTTbfE1Kp2O6N6WtBENnsJl+brw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCA0uttNfi+Hx/eFbxja5NNdy1PBh2XsX/LoOTcrduYMdMoFN+4Md5cU+W0A7hR5b BL2v7xYrB9egqBCVlCds6kgzApk20uPV06VjKgw+at0+doTbQWSG5nk6oma8wG5dLI XStA//yprQivo7oUCYwomDY919GjnVwH6XzYib30= X-Riseup-User-ID: A3E8D6726590E7DE7F3F203B589A53EEEA07390EAA9382BA3B3D00A720466D5A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZsD37MTzFpch; Wed, 30 Aug 2023 20:00:16 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:16 -0500 Message-ID: <20230830195955.16158-4-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-proc-macro2-1.0.34): New variable. --- * gnu/packages/crates-io.scm (rust-proc-macro2-1.0.34): New variable. gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6a0f4e187d..70918d16d0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49419,6 +49419,27 @@ (define-public rust-proc-macro2-1 in terms of the upstream unstable API.") (license (list license:asl2.0 license:expat)))) +(define-public rust-proc-macro2-1.0.34 + (package + (inherit rust-proc-macro2-1) + (name "rust-proc-macro2") + (version "1.0.34") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c93jhwl8lv3hiqqvdhd2d2xhjryh5bqb9w5icr5i7bw1wnfk11g")))) + (arguments + `(#:cargo-test-flags '("--lib") + #:cargo-inputs + (("rust-unicode-ident" ,rust-unicode-ident-1)) + #:cargo-development-inputs + (("rust-quote" ,rust-quote-1.0.10) + ("rust-rustversion" ,rust-rustversion-1)))))) + (define-public rust-proc-macro2-0.4 (package (inherit rust-proc-macro2-1) From patchwork Wed Aug 30 19:58:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53317 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1C52227BBE9; Wed, 30 Aug 2023 21:01:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8187D27BBEA for ; Wed, 30 Aug 2023 21:01:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN3-0000r9-Ox; Wed, 30 Aug 2023 16:00:57 -0400 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 1qbRN2-0000nI-JJ for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN2-0002cM-B2 for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRNA-0004WI-0v for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 5/8] gnu: Add rust-quote-1.0.10. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342563817273 (code B ref 64720); Wed, 30 Aug 2023 20:01:03 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:38 +0000 Received: from localhost ([127.0.0.1]:54157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMj-0004UV-QW for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:38 -0400 Received: from mx0.riseup.net ([198.252.153.6]:34256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMf-0004Tk-5P for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:34 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4RbZsJ0NGLz9tGG for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425620; bh=+KZO8M2KUq5EH46Q8hOZ7ss2dlgjSQjV2Y3vBACz3j4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PrxWbkrBKF+F+gZFZHK/Av8XLzXXuodDnj0l8Wpwbm5dka3nJVZqm7yD7eHrdj739 zKYnfWkiAinTiTsNBgNA7oPKtah3KuheouGO3ZuHOtXWycarIHBsfxPaG2xuB8TdjD uig9nsugCB+VWG1JWEkzSkfRfpzFa+ozdvTj43sU= X-Riseup-User-ID: C0335285292E1FE6F857DFC72709E182CBF0E059D3DB47AC582C94CE75655305 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZsH2NCWzFpch; Wed, 30 Aug 2023 20:00:19 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:17 -0500 Message-ID: <20230830195955.16158-5-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-quote-1.0.10): New variable. --- * gnu/packages/crates-io.scm (rust-quote-1.0.10): New variable. gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 70918d16d0..d245b32959 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51640,6 +51640,25 @@ (define-public rust-quote-1 (description "Quasi-quoting macro quote!(...)") (license (list license:asl2.0 license:expat)))) +(define-public rust-quote-1.0.10 + (package + (inherit rust-quote-1) + (name "rust-quote") + (version "1.0.10") + (source (origin + (method url-fetch) + (uri (crate-uri "quote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01ff7a76f871ggnby57iagw6499vci4bihcr11g6bqzjlp38rg1q")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0.34)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1.0.19)))))) + (define-public rust-quote-0.6 (package (inherit rust-quote-1) From patchwork Wed Aug 30 19:58:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53314 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 506EC27BBE9; Wed, 30 Aug 2023 21:01:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E5D0B27BBE2 for ; Wed, 30 Aug 2023 21:01:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN4-0000rx-E0; Wed, 30 Aug 2023 16:00:58 -0400 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 1qbRN3-0000nZ-0D for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN2-0002cY-ME for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRNA-0004WQ-CE for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 6/8] gnu: Add rust-serde-json-1.0.73. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342563817286 (code B ref 64720); Wed, 30 Aug 2023 20:01:04 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:38 +0000 Received: from localhost ([127.0.0.1]:54160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMk-0004UY-6W for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:38 -0400 Received: from mx1.riseup.net ([198.252.153.129]:60182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMi-0004Tt-3F for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:36 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RbZsL6jR2zDqJ8 for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425622; bh=C41z91O71dumdLZfv+7dFH7x7q0NX5Ed4oybVk9YT14=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UZl1E2AHY5p6oswJJAajcEcDh+Ruvg3NkZKldG/CEmvIQIOJXp1wPwSSW4ow4TKgm g8wC3okobIbyxo9WTXX9gLUWwgQTglX6WBmFQatVJnB4Ywdo56WWkCV6ej6TddAji+ Vtd8u8cj5Fqj/4or9XOzrmVoqJK8OqGsjHKOjPfo= X-Riseup-User-ID: 2EC5B2A563D9B51A9DEDC822284A8737628CE2D17E694870892BB6B8091891EF Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZsL1YZ9zFpch; Wed, 30 Aug 2023 20:00:22 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:18 -0500 Message-ID: <20230830195955.16158-6-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-serde-json-1.0.73): New variable. --- * gnu/packages/crates-io.scm (rust-serde-json-1.0.73): New variable. gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d245b32959..a89db5ba46 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59866,6 +59866,32 @@ (define-public rust-serde-json-1 "This package provides a JSON serialization file format.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-json-1.0.73 + (package + (inherit rust-serde-json-1) + (name "rust-serde-json") + (version "1.0.73") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-json" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xbwmzc5j6r1nz62a20w6l9bkwbhzd11vwbdqmzbqcv5pi207gdw")))) + (arguments + `(#:cargo-inputs + (("rust-indexmap" ,rust-indexmap-1.7) + ("rust-itoa" ,rust-itoa-1) + ("rust-ryu" ,rust-ryu-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-automod" ,rust-automod-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-stacker" ,rust-serde-stacker-0.1) + ("rust-trybuild" ,rust-trybuild-1)))))) + (define-public rust-serde-json-0.9 (package (inherit rust-serde-json-1) From patchwork Wed Aug 30 19:58:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53313 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1F1F127BBEA; Wed, 30 Aug 2023 21:01:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 540EB27BBE2 for ; Wed, 30 Aug 2023 21:01:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN5-0000um-Bw; Wed, 30 Aug 2023 16:00:59 -0400 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 1qbRN3-0000o8-A9 for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN3-0002cg-1e for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRNA-0004WZ-Nc for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 7/8] gnu: Add rust-trybuild-1.0.19. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342565017310 (code B ref 64720); Wed, 30 Aug 2023 20:01:04 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:50 +0000 Received: from localhost ([127.0.0.1]:54163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMv-0004V6-LX for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:50 -0400 Received: from mx0.riseup.net ([198.252.153.6]:34270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMj-0004U2-Tl for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:38 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4RbZsN5cPQz9tMc for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425624; bh=0IWrXzdLE+nAq4JjVqFV3aDcZdbaRBIrBXGz/vjcy/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJl7XYJX8WRTDPC3jeO7rx4nXSuDnH2OUnqQd54sNf3hM7UVzobBNDxDVqpn0qgqI dMVELJTQTx3W3gO6/UUesi2WZjRCHVVdq01OeRnOzdxtFl+yUHBWHUeysJAVKyft2U bRR9+b3Tc3o67nZJbHSwvvg+ycIH+GTUSQDicqlg= X-Riseup-User-ID: 8E16B033076F53F9EB03C464B0841346175EB63070D0691558FA9A9A7C320E6A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZsN0TS6zFpch; Wed, 30 Aug 2023 20:00:23 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:19 -0500 Message-ID: <20230830195955.16158-7-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-trybuild-1.0.19): New variable. --- * gnu/packages/crates-io.scm (rust-trybuild-1.0.19): New variable. gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a89db5ba46..019afc010a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -73245,6 +73245,29 @@ (define-public rust-trybuild-1 "Test harness for ui tests of compiler diagnostics.") (license (list license:expat license:asl2.0)))) +(define-public rust-trybuild-1.0.19 + (package + (inherit rust-trybuild-1) + (name "rust-trybuild") + (version "1.0.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "trybuild" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ab7ahdx563n6kbm14pm3qnxq4fp06pz42nh5ii4acvlzycnwdh4")))) + (arguments + `(#:cargo-inputs + (("rust-toml" ,rust-toml-0.5) + ("rust-dissimilar" ,rust-dissimilar-1) + ("rust-glob" ,rust-glob-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1.0.73) + ("rust-termcolor" ,rust-termcolor-1)) + #:cargo-development-inputs (("rust-automod" ,rust-automod-1)))))) + (define-public rust-trybuild2-1 (package (name "rust-trybuild2") From patchwork Wed Aug 30 19:58:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 53316 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 268C227BBEC; Wed, 30 Aug 2023 21:01:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0FD1827BBE2 for ; Wed, 30 Aug 2023 21:01:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbRN4-0000t8-SV; Wed, 30 Aug 2023 16:00:58 -0400 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 1qbRN3-0000qB-N4 for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbRN3-0002cm-Dj for guix-patches@gnu.org; Wed, 30 Aug 2023 16:00:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbRNB-0004Wg-3V for guix-patches@gnu.org; Wed, 30 Aug 2023 16:01:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64720] [PATCH v2 8/8] gnu: rust-analyzer: update required dependencies version Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 20:01:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64720@debbugs.gnu.org Cc: Distopico , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 64720-submit@debbugs.gnu.org id=B64720.169342565017316 (code B ref 64720); Wed, 30 Aug 2023 20:01:05 +0000 Received: (at 64720) by debbugs.gnu.org; 30 Aug 2023 20:00:50 +0000 Received: from localhost ([127.0.0.1]:54165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMw-0004V9-47 for submit@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:50 -0400 Received: from mx1.riseup.net ([198.252.153.129]:60190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbRMl-0004UA-PA for 64720@debbugs.gnu.org; Wed, 30 Aug 2023 16:00:40 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RbZsQ4VPzzDr26 for <64720@debbugs.gnu.org>; Wed, 30 Aug 2023 20:00:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693425626; bh=tsXbni9UH30Rdm6aEPfnjhxlR/Bv5WKv4d95auUooCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YpbTOL26PbT3uTu3nMGSmxCI4HcJiiEBkFt7sLET1vap4yU09S4H4kSQ8b4zeQavd 50Xk4Y1ru1pgojVrxz4orjmxVmBAIKspbRQEmWqmJfnY0EPL8hpwImmgx4CslNZqh8 WlW5YxDIm0emfz0KG0c4jtLYKZo03AHhxO7T/eks= X-Riseup-User-ID: EC3958C62505BCCC7B613DB3DEB6F04A69F4EBC973334A8E972FE063E639AFF9 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RbZsP6dm1zFpch; Wed, 30 Aug 2023 20:00:25 +0000 (UTC) From: Distopico Date: Wed, 30 Aug 2023 14:58:20 -0500 Message-ID: <20230830195955.16158-8-distopico@riseup.net> In-Reply-To: <20230830195955.16158-1-distopico@riseup.net> References: <20230830195955.16158-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches use pinned versions of different dependencies required by rust-analyzer@2022-01-10 --- use pinned versions of different dependencies required by rust-analyzer@2022-01-10 gnu/packages/crates-io.scm | 12 ++++++------ gnu/packages/rust-apps.scm | 12 +++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 019afc010a..3c83563c45 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -57560,7 +57560,7 @@ (define-public rust-salsa-0.17 #:cargo-inputs (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-indexmap" ,rust-indexmap-1) + ("rust-indexmap" ,rust-indexmap-1.7) ("rust-lock-api" ,rust-lock-api-0.4) ("rust-log" ,rust-log-0.4) ("rust-oorandom" ,rust-oorandom-11.1) @@ -59960,7 +59960,7 @@ (define-public rust-serde-path-to-error-0.1 (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1) - ("rust-serde-json" ,rust-serde-json-1)))) + ("rust-serde-json" ,rust-serde-json-1.0.73)))) (home-page "https://github.com/dtolnay/path-to-error") (synopsis @@ -60018,14 +60018,14 @@ (define-public rust-serde-repr-0.1 (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) + (("rust-proc-macro2" ,rust-proc-macro2-1.0.34) + ("rust-quote" ,rust-quote-1.0.10) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-trybuild" ,rust-trybuild-1)))) + ("rust-serde-json" ,rust-serde-json-1.0.73) + ("rust-trybuild" ,rust-trybuild-1.0.19)))) (home-page "https://github.com/dtolnay/serde-repr") (synopsis "Serialize and deserialize C-like enum as underlying repr") (description diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 8c7d8006cc..76d48e55f1 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1812,7 +1812,7 @@ (define-public rust-analyzer ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) ("rust-expect-test" ,rust-expect-test-1) ("rust-oorandom" ,rust-oorandom-11.1) - ("rust-quote" ,rust-quote-1) + ("rust-quote" ,rust-quote-1.0.10) ("rust-rayon" ,rust-rayon-1) ("rust-tracing" ,rust-tracing-0.1) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) @@ -1823,7 +1823,6 @@ (define-public rust-analyzer ("rust-anyhow" ,rust-anyhow-1) ("rust-anymap" ,rust-anymap-0.12) ("rust-arrayvec" ,rust-arrayvec-0.7) - ("rust-backtrace" ,rust-backtrace-0.3) ("rust-cargo-metadata" ,rust-cargo-metadata-0.14) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-chalk-ir" ,rust-chalk-ir-0.75) @@ -1832,17 +1831,16 @@ (define-public rust-analyzer ("rust-countme" ,rust-countme-3) ("rust-cov-mark" ,rust-cov-mark-2) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) - ("rust-dashmap" ,rust-dashmap-4) ("rust-dissimilar" ,rust-dissimilar-1) ("rust-dot" ,rust-dot-0.1) ("rust-drop-bomb" ,rust-drop-bomb-0.1) - ("rust-either" ,rust-either-1) + ("rust-either" ,rust-either-1.6.0) ("rust-ena" ,rust-ena-0.14) ("rust-env-logger" ,rust-env-logger-0.8) ("rust-flate2" ,rust-flate2-1) ("rust-fst" ,rust-fst-0.4) ("rust-home" ,rust-home-0.5) - ("rust-indexmap" ,rust-indexmap-1) + ("rust-indexmap" ,rust-indexmap-1.7) ("rust-itertools" ,rust-itertools-0.10) ("rust-jod-thread" ,rust-jod-thread-0.1) ("rust-libc" ,rust-libc-0.2) @@ -1858,7 +1856,7 @@ (define-public rust-analyzer ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-perf-event" ,rust-perf-event-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0.34) ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8) ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-7) ("rust-rowan" ,rust-rowan-0.15) @@ -1867,7 +1865,7 @@ (define-public rust-analyzer ("rust-salsa" ,rust-salsa-0.17) ("rust-scoped-tls" ,rust-scoped-tls-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-json" ,rust-serde-json-1.0.73) ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1) ("rust-typed-arena" ,rust-typed-arena-2) ("rust-smallvec" ,rust-smallvec-1)