From patchwork Fri Jun 17 11:59:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Arazas X-Patchwork-Id: 40072 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 B7A3C27BBEB; Fri, 17 Jun 2022 13:02:47 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 E43B127BBE9 for ; Fri, 17 Jun 2022 13:02:46 +0100 (BST) Received: from localhost ([::1]:47096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2AgY-0005Q0-09 for patchwork@mira.cbaines.net; Fri, 17 Jun 2022 08:02:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2Aev-0005I0-FL for guix-patches@gnu.org; Fri, 17 Jun 2022 08:01:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2Aev-0002Y1-6z for guix-patches@gnu.org; Fri, 17 Jun 2022 08:01:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2Aev-0000Bh-5o for guix-patches@gnu.org; Fri, 17 Jun 2022 08:01:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56037] [PATCH 13/14] gnu: rust-clap-3: Update to 3.1.18. Resent-From: Gabriel Arazas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jun 2022 12:01:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56037@debbugs.gnu.org Cc: Gabriel Arazas Received: via spool by 56037-submit@debbugs.gnu.org id=B56037.1655467240609 (code B ref 56037); Fri, 17 Jun 2022 12:01:05 +0000 Received: (at 56037) by debbugs.gnu.org; 17 Jun 2022 12:00:40 +0000 Received: from localhost ([127.0.0.1]:43989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2AeM-00009O-V2 for submit@debbugs.gnu.org; Fri, 17 Jun 2022 08:00:40 -0400 Received: from mail-pg1-f176.google.com ([209.85.215.176]:44640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2AeL-00008t-1o for 56037@debbugs.gnu.org; Fri, 17 Jun 2022 08:00:29 -0400 Received: by mail-pg1-f176.google.com with SMTP id 31so3867215pgv.11 for <56037@debbugs.gnu.org>; Fri, 17 Jun 2022 05:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4ZSJfENQ5J3iTrL/yYqRUJ09dzj87UBZ+5WyYAVfgTs=; b=apFCC7pYUgT2ubTtrRWShP0X565ZLFZHrOCfdwUOdXYZ5s5QyYNeKMEwMQH3tOM7HZ xTufyqU4uYqtvDL5cdgAK6MBLbvYCGMZCP+KmrQyVw3X81TALE/H/EAzR3M1drkfgf2j RGTPa8Dw+uHtbf+juuxAMErjfGCzk6FBOgsf7J/VawH8zJg1ODQCUzaRFQ2v1KWcBN2o W2R8brN/rU9SQQN9FwF5AsMZ5xSBMYqZJlahybdbPK4yajp09FrsRi86V5kMJ8EtCO97 FzBwvUoRpDN4J1Ng2zjmnP6Xo8rlHQWEN0ueZGAnMnCYm1FpFBDos/vmCreugeJF0n1X r02A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4ZSJfENQ5J3iTrL/yYqRUJ09dzj87UBZ+5WyYAVfgTs=; b=CxOM1hBffpXKArwJOaZlGeG8SJOApiVOwSzgCeEHFL4gb/tD+PcbAu1g5mjWYgrXlZ LKD7+7WoP9Qj3k0KLij2P1WmrxK1V330D40kXAf5qPhd00F9Y/rJcdlHd/DBuZ0axGYH KC6Aq+Trz7HVnZzRYYMHjJh6YtAjXlTq0bmDxFAZO4MrsTmiK2vHndDTw0lm9E+aopNj TpsKCSmZasT868Hm0QA1PUejW2JwevhC8GLSON+o7ILiSQ/p37ZSOgQbCPd3shRIaNbT dbNX1Ttjbh2gKLZWmWrt+CK2VDgyMO2yFhWfkPTfKfp8JOsSNuZeDaiTHqX93gmzaPti 9GxA== X-Gm-Message-State: AJIora8l2Q3ZHlrv4GPB70qziPol+0BmoRXOiNPvSZD+EqDfFA2VUocX JGtoMQ7rKNgR/1zXYHzxmzOYU0cM9yk= X-Google-Smtp-Source: AGRyM1vqKat+KFFk5f+07vNKTdeuJYYEfkhV3bG/U/nCpqcQbMLbhQdQ1fIHPT6Zl7u0Uvin3q90AA== X-Received: by 2002:a63:1209:0:b0:3fc:818e:861d with SMTP id h9-20020a631209000000b003fc818e861dmr9143145pgl.62.1655467223049; Fri, 17 Jun 2022 05:00:23 -0700 (PDT) Received: from ni.localhost ([180.190.75.56]) by smtp.gmail.com with ESMTPSA id jh22-20020a170903329600b0015e8d4eb1d3sm1152779plb.29.2022.06.17.05.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 05:00:21 -0700 (PDT) From: Gabriel Arazas Date: Fri, 17 Jun 2022 19:59:14 +0800 Message-Id: <2e764f0e4d225f3a5836f2d01405a2403abec9d0.1655465109.git.foo.dogsquared@gmail.com> X-Mailer: git-send-email 2.36.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-clap-3): Update to 3.1.18. (rust-clap-3-beta): New variable and inherit above. (zoxide): Replace rust-clap-3 with rust-clap-3-beta. --- gnu/packages/crates-io.scm | 55 ++++++++++++++++++++++++++++++++------ gnu/packages/rust-apps.scm | 2 +- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3d18a478dd..74f9bc8f81 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11242,6 +11242,51 @@ (define-public rust-clap-derive-3-beta (define-public rust-clap-3 (package + (name "rust-clap") + (version "3.1.18") + (source (origin + (method url-fetch) + (uri (crate-uri "clap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02s4hk9hrmm2s1j7dkbwpyd75mfzx3p8ks2chmp4ccybv95xznyj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-clap-derive" ,rust-clap-derive-3) + ("rust-clap-lex" ,rust-clap-lex-0.2) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-textwrap" ,rust-textwrap-0.15) + ("rust-unicase" ,rust-unicase-2) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) ("rust-humantime" ,rust-humantime-2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-shlex" ,rust-shlex-1) + ("rust-snapbox" ,rust-snapbox-0.2) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-trycmd" ,rust-trycmd-0.13)))) + (home-page "https://github.com/clap-rs/clap") + (synopsis + "A simple to use, efficient, and full-featured Command Line Argument +Parser") + (description + "This package provides a simple to use, efficient, and full-featured +Command Line Argument Parser.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-clap-3-beta + (package + (inherit rust-clap-3) (name "rust-clap") (version "3.0.0-beta.2") (source @@ -11258,7 +11303,7 @@ (define-public rust-clap-3 `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-bitflags" ,rust-bitflags-1) - ("rust-clap-derive" ,rust-clap-derive-3) + ("rust-clap-derive" ,rust-clap-derive-3-beta) ("rust-indexmap" ,rust-indexmap-1) ("rust-os-str-bytes" ,rust-os-str-bytes-2) ("rust-strsim" ,rust-strsim-0.10) @@ -11272,13 +11317,7 @@ (define-public rust-clap-3 (("rust-criterion" ,rust-criterion-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-regex" ,rust-regex-1) - ("rust-version-sync" ,rust-version-sync-0.8)))) - (home-page "https://clap.rs/") - (synopsis "Command Line Argument Parser") - (description - "This package provides a simple to use, efficient, and full-featured -Command Line Argument Parser.") - (license (list license:expat license:asl2.0)))) + ("rust-version-sync" ,rust-version-sync-0.8)))))) (define-public rust-clap-2 (package diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 6d97e289c2..d60fd1996e 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1771,7 +1771,7 @@ (define-public zoxide (("rust-anyhow" ,rust-anyhow-1) ("rust-askama" ,rust-askama-0.10) ("rust-bincode" ,rust-bincode-1) - ("rust-clap" ,rust-clap-3) + ("rust-clap" ,rust-clap-3-beta) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dunce" ,rust-dunce-1) ("rust-glob" ,rust-glob-0.3)