From patchwork Fri Mar 8 03:21:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 61484 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 B8B2827BBEA; Fri, 8 Mar 2024 03:26:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=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 4C00327BBE2 for ; Fri, 8 Mar 2024 03:26:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riQrX-0000uH-AS; Thu, 07 Mar 2024 22:25:35 -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 1riQrT-0000s7-Qi for guix-patches@gnu.org; Thu, 07 Mar 2024 22:25:31 -0500 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 1riQrT-00055i-55 for guix-patches@gnu.org; Thu, 07 Mar 2024 22:25:31 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riQry-0005Oc-Df; Thu, 07 Mar 2024 22:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69624] [PATCH rust-team] gnu: rust-devise: Added v0.3 and building v0.2 Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 03:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69624 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69624@debbugs.gnu.org Cc: Aaron Covrig , efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: efraim@flashner.co.il Received: via spool by submit@debbugs.gnu.org id=B.170986831720681 (code B ref -1); Fri, 08 Mar 2024 03:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Mar 2024 03:25:17 +0000 Received: from localhost ([127.0.0.1]:55646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riQrF-0005NU-2A for submit@debbugs.gnu.org; Thu, 07 Mar 2024 22:25:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:39400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riQrB-0005NK-Hd for submit@debbugs.gnu.org; Thu, 07 Mar 2024 22:25:14 -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 1riQqf-0000pn-Dy for guix-patches@gnu.org; Thu, 07 Mar 2024 22:24:41 -0500 Received: from mail-yw1-x1133.google.com ([2607:f8b0:4864:20::1133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1riQqc-0004lI-Db for guix-patches@gnu.org; Thu, 07 Mar 2024 22:24:41 -0500 Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-60a0579a914so1090997b3.3 for ; Thu, 07 Mar 2024 19:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1709868276; x=1710473076; darn=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=uU1STLQC2JthHHyFTOruQy8EeGK6cOXaSVXKE4ienAM=; b=G8f7kMzWa6Vtn0utEwkKPJuQQ6RJ+r9s9bjL5Y1NOHUz1G0Mcsmco9UldBwHYvZp9C yOT77v6xtD4HQbU0pv187Knam8GTELaLwVkY8JnzbgsBYs89z5321Jqx/DeacdNihDV6 KpRqcXNx2KulTQPKOsfI+Lnn6Zcbgx8GbrDjk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709868276; x=1710473076; 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=uU1STLQC2JthHHyFTOruQy8EeGK6cOXaSVXKE4ienAM=; b=BFPCxeH/AZu+ehX1iOcDsgBQjKeX5KN1mvqjiJGkweXQM/UOmdm8SIBwdfY4hIHZvb q5cdOmCAZJqHQVDzGQsF859TfVSEGWHMbnQtaaUnadJxSsmiMsrYEdGgFNPTMmglKvOQ 50hNTeG1UBJDIA36khkMYVcZMUSIanRTogWcFRn3yrLHVnu93s8nO8rBl2NXXqaIjj6h JW3wCz5NQd+nz0AItxS5uZtHUbOJj16UQJzYLGnF1uuakibKdPgu+KfGitAWutmCj8bq 39K8/TudoMib+H+1ycEop7J3zm/FwEnNou1der4zWgkHYCqw3m04SNBoYUpW90gePnOH zzug== X-Gm-Message-State: AOJu0Yy6o81LuD1jqv04JHdBuY3OuMpGLXM9N4ydlHxR/A1DUjYRXukt 1IWpCVQqEsMyMmNvLF6UDqbfj2QvATPiiq+TFppQ3au2E2ujmicPbFyOWbLie0WLAftuobHPF6Y PC6p2qcTknJyODuTtu+LgLYhsvRubMlq8kgOiDaeyP3FFjWygZtcAOJUkc+uzP9RsBtKjeffE9A XEUJF3Tr4GvWHcOv4yMqW/UJgSGNq4LFYU0bBQiSrg X-Google-Smtp-Source: AGHT+IFsvDzrimKX311MX8JfL1hAvY6tcvksdQPp3GcZA+0q9BxJDJwJn9dvFDQlUN84w/BnbIuIBw== X-Received: by 2002:a0d:cd05:0:b0:609:e459:4110 with SMTP id p5-20020a0dcd05000000b00609e4594110mr5328392ywd.29.1709868275721; Thu, 07 Mar 2024 19:24:35 -0800 (PST) Received: from mobile-dev.attlocal (99-122-31-181.lightspeed.chtgtn.sbcglobal.net. [99.122.31.181]) by smtp.gmail.com with ESMTPSA id i128-20020a816d86000000b00604198c3cafsm22327ywc.61.2024.03.07.19.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 19:24:35 -0800 (PST) Date: Thu, 7 Mar 2024 22:21:50 -0500 Message-ID: <20240308032427.213955-1-aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1133; envelope-from=aaron.covrig.us@ieee.org; helo=mail-yw1-x1133.google.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.583, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig 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-devise): Added v0.3 * gnu/packages/crates-io.scm (rust-devise-codegen): Added v0.3 * gnu/packages/crates-io.scm (rust-devise-core): Added v0.3 * gnu/packages/crates-io.scm (rust-devise): Enabled building v0.2 * gnu/packages/crates-io.scm (rust-devise-codegen): Enabled building v0.2 * gnu/packages/crates-io.scm (rust-devise-core): Enabled building v0.2 * gnu/packages/crates-io.scm (rust-proc-macro2-diagnostics-0.10): Enabled testing * gnu/packages/crates-io.scm (rust-proc-macro2-diagnostics-0.9): Added for rust-devise --- gnu/packages/crates-io.scm | 129 ++++++++++++++++++++++++++++++------- 1 file changed, 106 insertions(+), 23 deletions(-) base-commit: d29e5a83e887cd2f4f459a12cbbfc40c77e55ce2 diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a08748392..e20adec251 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18934,10 +18934,26 @@ (define-public rust-devise-0.4 procedural macros.") (license (list license:expat license:asl2.0)))) -(define-public rust-devise-0.2 +(define-public rust-devise-0.3 (package (inherit rust-devise-0.4) (name "rust-devise") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "devise" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15dmibnykic2a1ndi66shyvxmpfysnhf05lg2iv8871g0w5miish")))) + (arguments + `(#:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.3) + ("rust-devise-core" ,rust-devise-core-0.3)))))) + +(define-public rust-devise-0.2 + (package + (inherit rust-devise-0.3) + (name "rust-devise") (version "0.2.1") (source (origin @@ -18947,10 +18963,13 @@ (define-public rust-devise-0.2 (sha256 (base32 "09p52f54givb0g9l7clj11z755vldk8758y2lwm5mp3sa156qwfx")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-devise-codegen" ,rust-devise-codegen-0.2) - ("rust-devise-core" ,rust-devise-core-0.2)))))) + `(#:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.2) + ("rust-devise-core" ,rust-devise-core-0.2)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))))) (define-public rust-devise-codegen-0.4 (package @@ -18974,10 +18993,25 @@ (define-public rust-devise-codegen-0.4 procedural macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-devise-codegen-0.3 + (package + (inherit rust-devise-codegen-0.4) + (name "rust-devise-codegen") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "devise_codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cp7nnfwvjp6wfq11n0ffjjrwfa1wbsb58g1bz3ha6z5lvkp6g0j")))) + (arguments + `(#:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.3) + ("rust-quote" ,rust-quote-1)))))) (define-public rust-devise-codegen-0.2 (package - (inherit rust-devise-codegen-0.4) + (inherit rust-devise-codegen-0.3) (name "rust-devise-codegen") (version "0.2.1") (source @@ -18988,10 +19022,13 @@ (define-public rust-devise-codegen-0.2 (sha256 (base32 "0lxbixni2v6snx2mkgi0kyq5dv8v6c5s57b6wc47q4hqs6884yza")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-devise-core" ,rust-devise-core-0.2) - ("rust-quote" ,rust-quote-0.6)))))) + `(#:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.2) + ("rust-quote" ,rust-quote-0.6)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))))) (define-public rust-devise-core-0.4 (package @@ -19019,10 +19056,29 @@ (define-public rust-devise-core-0.4 procedural macros.") (license (list license:expat license:asl2.0)))) -(define-public rust-devise-core-0.2 +(define-public rust-devise-core-0.3 (package (inherit rust-devise-core-0.4) (name "rust-devise-core") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "devise_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l00qiih4z14ai0c3s16nlvw0kv4p07ygi6a0ms0knc78xpz87l4")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.9) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-devise-core-0.2 + (package + (inherit rust-devise-core-0.3) + (name "rust-devise-core") (version "0.2.1") (source (origin @@ -19032,12 +19088,15 @@ (define-public rust-devise-core-0.2 (sha256 (base32 "0wr3jdzzibpafz73hcca83wnzdgjinvm7axmxnyfkbasbnfkw1fi")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6) - ("rust-syn" ,rust-syn-0.15)))))) + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))))) (define-public rust-dhcproto-0.9 (package @@ -49710,17 +49769,41 @@ (define-public rust-proc-macro2-diagnostics-0.10 (base32 "1j48ipc80pykvhx6yhndfa774s58ax1h6sm6mlhf09ls76f6l1mg")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; cannot determine resolution for the macro `diagnostic_item` + `(#:cargo-test-flags '("--" "--skip=main") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-2) - ("rust-version-check" ,rust-version-check-0.9) - ("rust-yansi" ,rust-yansi-1)) - #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)))) + ("rust-yansi" ,rust-yansi-1) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1) + ("rust-version-check" ,rust-version-check-0.9)))) (home-page "https://github.com/SergioBenitez/proc-macro2-diagnostics") (synopsis "Diagnostics for proc-macro2") - (description "Diagnostics for proc-macro2.") - (license (list license:expat license:asl2.0)))) + (description "Diagnostics for stable and nightly proc-macros!") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-proc-macro2-diagnostics-0.9 + (package + (inherit rust-proc-macro2-diagnostics-0.10) + (name "rust-proc-macro2-diagnostics") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2-diagnostics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nmazlb1dkznjds7qwms7yxhi33ajc3isji2lsgx8r3lsqk9gwjb")))) + (arguments + `(#:cargo-test-flags '("--" "--skip=main") + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1) + ("rust-yansi" ,rust-yansi-0.5) + ;; Add missing dependency + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1) + ("rust-version-check" ,rust-version-check-0.9)))))) (define-public rust-proc-mounts-0.3 (package