From patchwork Sat Apr 27 12:35:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 63491 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 2727927BBEB; Sat, 27 Apr 2024 14:17:38 +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 45DC027BBE2 for ; Sat, 27 Apr 2024 14:17:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0hvp-0006Vr-Of; Sat, 27 Apr 2024 09:17:33 -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 1s0hvX-0006MB-N2 for guix-patches@gnu.org; Sat, 27 Apr 2024 09:17:16 -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 1s0hvU-0007Dt-Vc for guix-patches@gnu.org; Sat, 27 Apr 2024 09:17:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0hvn-0002Vj-GJ; Sat, 27 Apr 2024 09:17:31 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70606] [PATCH rust-team 058/101] gnu: Place rust-k9-0.11 in alphabetical order. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2024 13:17:31 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70606@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 70606-submit@debbugs.gnu.org id=B70606.17142238219182 (code B ref 70606); Sat, 27 Apr 2024 13:17:31 +0000 Received: (at 70606) by debbugs.gnu.org; 27 Apr 2024 13:17:01 +0000 Received: from localhost ([127.0.0.1]:54888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0hvG-0002Nc-Gj for submit@debbugs.gnu.org; Sat, 27 Apr 2024 09:17:01 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47391 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0hJv-0004Bh-D4 for 70606@debbugs.gnu.org; Sat, 27 Apr 2024 08:38:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1714221416; 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=dkhv296k/iaFFnX1D7iPIL5NeU00LIIYlQKdJC47EWM=; b=qvlN+DcTVW/ywcTo22cr8PQZbg2cUxIVodJWvIdPwZIPYNJab89kE1Y5VLKdA6iqVN89dD 6Dy3/n9WmyGeU+jVVwKem7jslJZL3nTlzOt0GQoJd38ylKiGKNz4OVEzlyTECMMFvWUccF ShPROrIfLjR6Dx2ek3bH0Xf7gRUJMFX4fwIxssaeikCZlmlOZGDzktsJGhaXErVSNFT4DU eJG/vpoPOFGxt2lXP1k2x0A+VXNCctQEs2fwQwa4xh6/dIeeXXdobjUEezQAi1TSob9fzh ipC3kiqaJZ/pZrRijKtJSLhFgAh42ooazx5SwAkCYxMjUc7X7LLMkFgNUx0ZMg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 8ad60938 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70606@debbugs.gnu.org>; Sat, 27 Apr 2024 12:36:56 +0000 (UTC) Date: Sat, 27 Apr 2024 14:35:20 +0200 Message-ID: <550fc15af76792b5449bea77919b9aebf3f8c773.1714220245.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 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-k9-0.11, rust-k9-0.12): Move variables. Change-Id: Iad2834c72bccb92010fce117800abf4dbde3f31c --- gnu/packages/crates-io.scm | 124 ++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00ae3036da..37aad64c01 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36205,6 +36205,68 @@ (define-public rust-juniper-0.14 debugging.") (license license:bsd-2))) +(define-public rust-k9-0.12 + (package + (name "rust-k9") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (crate-uri "k9" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "056ngrvyla95qj737h7xjw5ja697h07mpw6pci5v3cb8bfxwx2q8")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + ;; k9@0.11.7 was yanked by upstream, provide 0.11.6. + (("0\\.11\\.7") "0.11.6")))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-colored" ,rust-colored-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-regex" ,rust-regex-1) + ("rust-syn" ,rust-syn-2) + ("rust-terminal-size" ,rust-terminal-size-0.2)) + #:cargo-development-inputs + (("rust-derive-builder" ,rust-derive-builder-0.9) + ("rust-k9" ,rust-k9-0.11) + ("rust-rand" ,rust-rand-0.7) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1)))) + (home-page "https://github.com/aaronabramov/k9") + (synopsis "Testing library") + (description "This package contains helper macros for writing unit tests.") + (license license:expat))) + +(define-public rust-k9-0.11 + (package + (inherit rust-k9-0.12) + (name "rust-k9") + (version "0.11.6") + (source (origin + (method url-fetch) + (uri (crate-uri "k9" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a8pxz6fygqzknxdlb4l835kqxgjk7snm4bjhhhn783r025vbp9j")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-colored" ,rust-colored-1) + ("rust-diff" ,rust-diff-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-regex" ,rust-regex-1) + ("rust-syn" ,rust-syn-1) + ("rust-term-size" ,rust-term-size-0.3)))))) + (define-public rust-keccak-0.1 (package (name "rust-keccak") @@ -36373,68 +36435,6 @@ (define-public rust-kv-log-macro-1 "This package provides a Log macro for log's kv-unstable backend.") (license (list license:expat license:asl2.0)))) -(define-public rust-k9-0.12 - (package - (name "rust-k9") - (version "0.12.0") - (source (origin - (method url-fetch) - (uri (crate-uri "k9" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "056ngrvyla95qj737h7xjw5ja697h07mpw6pci5v3cb8bfxwx2q8")) - (snippet - #~(begin (use-modules (guix build utils)) - (substitute* "Cargo.toml" - ;; k9@0.11.7 was yanked by upstream, provide 0.11.6. - (("0\\.11\\.7") "0.11.6")))))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-colored" ,rust-colored-2) - ("rust-diff" ,rust-diff-0.1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-regex" ,rust-regex-1) - ("rust-syn" ,rust-syn-2) - ("rust-terminal-size" ,rust-terminal-size-0.2)) - #:cargo-development-inputs - (("rust-derive-builder" ,rust-derive-builder-0.9) - ("rust-k9" ,rust-k9-0.11) - ("rust-rand" ,rust-rand-0.7) - ("rust-sha2" ,rust-sha2-0.9) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1)))) - (home-page "https://github.com/aaronabramov/k9") - (synopsis "Testing library") - (description "This package contains helper macros for writing unit tests.") - (license license:expat))) - -(define-public rust-k9-0.11 - (package - (inherit rust-k9-0.12) - (name "rust-k9") - (version "0.11.6") - (source (origin - (method url-fetch) - (uri (crate-uri "k9" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1a8pxz6fygqzknxdlb4l835kqxgjk7snm4bjhhhn783r025vbp9j")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-colored" ,rust-colored-1) - ("rust-diff" ,rust-diff-0.1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-regex" ,rust-regex-1) - ("rust-syn" ,rust-syn-1) - ("rust-term-size" ,rust-term-size-0.3)))))) - (define-public rust-lab-0.11 (package (name "rust-lab")