From patchwork Fri Jan 31 21:10:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 38098 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 F314A27BBE2; Fri, 31 Jan 2025 21:24:19 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 33B9F27BBEA for ; Fri, 31 Jan 2025 21:24:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdyUb-0000xp-6b; Fri, 31 Jan 2025 16:24:01 -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 1tdyU6-0000Fn-K1 for guix-patches@gnu.org; Fri, 31 Jan 2025 16:23:32 -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 1tdyTx-0002qG-W9 for guix-patches@gnu.org; Fri, 31 Jan 2025 16:23:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=2366iNMvBoL32x7kF4hseKMY6X2iMlX2r6tZZUjekWQ=; b=SeEkUNo6EJCrYGlA9drA7DQLuEXhPuKjCHm8KrzWN+3Yv6EPfU0qXLtOpOkI600NDwVknlL7JpcVXjeqCw00oeotimIzF7tFdVHVLM1fM3W1/BCNv7M8ML8pw1KBCMvLrPKuliAmXN9oeQnz7a5opUZB+mVw2ZDsuyoC7S2dANQUzX6JWbe3fhFrF9Hepf3Tr+F7pQVwAVOoEOOL4PyrUhMAZ5WUbUlceOifDC4IIPH6DW4kyZP876KPYvvCouH37PwWoQm9NlQJ+jMuOJnFwfR8A5na+wPAwL0Ae6VB2MF1afcEKmD4MSvbpYwQ8U23sax290w0nC/T56ud38H7/g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tdyTx-00068M-19; Fri, 31 Jan 2025 16:23:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75980] [PATCH rust-team 068/106] gnu: rust-rspec-1: Add cargo-inputs. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 31 Jan 2025 21:23:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75980@debbugs.gnu.org Cc: Divya Ranjan Pattanaik , Efraim Flashner X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner Received: via spool by 75980-submit@debbugs.gnu.org id=B75980.173835854323123 (code B ref 75980); Fri, 31 Jan 2025 21:23:20 +0000 Received: (at 75980) by debbugs.gnu.org; 31 Jan 2025 21:22:23 +0000 Received: from localhost ([127.0.0.1]:55014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tdyT0-00060k-Hg for submit@debbugs.gnu.org; Fri, 31 Jan 2025 16:22:23 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:56767 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tdyJd-00058S-Fp for 75980@debbugs.gnu.org; Fri, 31 Jan 2025 16:12:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1738357952; 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=2366iNMvBoL32x7kF4hseKMY6X2iMlX2r6tZZUjekWQ=; b=YO6k/RaDKiBjmIqFreKHNNXarP89CM0u+9WkfPmu2sSky7VAuHG/AfPfCGwcE3iGWLjCY4 zZHzNFZ3qB3FHYj+uvef9g3r9m1l78dY5KOUzxkzlxFngzyYZkilhR6cFaUFudNSQOt3zX iPdgZE2V20w5hVUhRKGtqH8AM7s5KTgkDthfgLaQxxQmreDdIatK4larl58Q6R0a1m3mIQ qde8vneGSAp87h1mmTTAdCgzHUrf7xAvqRul2ia+9JiVNgUWSmpBPOj3tpcG2ZQUFvHLEB qUrI6iOnHOTagZ0Iqn0wDfhaDr9cCmlxY6HnLHmtEUQ2+cM7mYwOJNUO3FQsJQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 21df3444 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75980@debbugs.gnu.org>; Fri, 31 Jan 2025 21:12:32 +0000 (UTC) Date: Fri, 31 Jan 2025 22:10:29 +0100 Message-ID: <16b60768aa9a0fa2cb6b468a7f4db320ea641087.1738357374.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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-rspec-1)[source]: Relax clippy version requirement. [arguments]: Add rust-clippy-0.0.302. [description]: Change whitespace. * gnu/local.mk (dist_patch_DATA): Unregister file. * gnu/packages/patches/rust-rspec-1-remove-clippy.patch: Remove file. Change-Id: I5f1e869aeedbf197f19f3a0c7ba4ffdc6752209c --- gnu/local.mk | 1 - gnu/packages/crates-io.scm | 9 ++++++--- .../patches/rust-rspec-1-remove-clippy.patch | 16 ---------------- 3 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 gnu/packages/patches/rust-rspec-1-remove-clippy.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1d15be886da..852d140dddf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2197,7 +2197,6 @@ dist_patch_DATA = \ %D%/packages/patches/rust-onenote-parser-for-clamav-parse-in-memory-buffer.patch \ %D%/packages/patches/rust-onenote-parser-for-clamav-property-type.patch \ %D%/packages/patches/rust-poem-1-fewer-deps.patch \ - %D%/packages/patches/rust-rspec-1-remove-clippy.patch \ %D%/packages/patches/rust-trash-2-update-windows.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6969a88d7e4..b5fbf3d73cb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64477,7 +64477,9 @@ (define-public rust-rspec-1 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "02hfwxqjdc39ygnjysvn5qz343fahmwm16rxvxayh403d5y9wf49")) - (patches (search-patches "rust-rspec-1-remove-clippy.patch")))) + (modules '((guix build utils))) + (snippet #~(substitute* "Cargo.toml" + (("\"0.0.153\"") "\"0.0\""))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -64486,11 +64488,12 @@ (define-public rust-rspec-1 ("rust-derive-builder" ,rust-derive-builder-0.9) ("rust-expectest" ,rust-expectest-0.12) ("rust-rayon" ,rust-rayon-1) + ("rust-clippy" ,rust-clippy-0.0.302) ("rust-time" ,rust-time-0.2)))) (home-page "https://github.com/rust-rspec/rspec") (synopsis "Write Rspec-like tests with stable rust") - (description "This package helps writing Rspec-like tests with stable -rust.") + (description + "This package helps writing Rspec-like tests with stable rust.") (license license:mpl2.0))) (define-public rust-rspec-1.0.0-beta.3 diff --git a/gnu/packages/patches/rust-rspec-1-remove-clippy.patch b/gnu/packages/patches/rust-rspec-1-remove-clippy.patch deleted file mode 100644 index 46c994f7eec..00000000000 --- a/gnu/packages/patches/rust-rspec-1-remove-clippy.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove the dependency on clippy - -diff --git a/Cargo.toml b/Cargo.toml -index 177cb80..7260c34 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -39,9 +39,6 @@ version = "1.5" - - [dependencies.time] - version = "0.2" --[build-dependencies.clippy] --version = "0.0.153" --optional = true - - [features] - default = []