From patchwork Tue Nov 29 07:00:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44934 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 D5B4427BBEB; Tue, 29 Nov 2022 07:07:12 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 645EE27BBE9 for ; Tue, 29 Nov 2022 07:07:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozueE-0003Zu-0L; Tue, 29 Nov 2022 02:03:18 -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 1ozudz-0003UC-Jc for guix-patches@gnu.org; Tue, 29 Nov 2022 02:03:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozudz-00047O-93 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozudz-0004tu-5E for guix-patches@gnu.org; Tue, 29 Nov 2022 02:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59670] [PATCH 41/50] gnu: Add rust-textwrap-0.16. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 07:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59670@debbugs.gnu.org Cc: "\(" Received: via spool by 59670-submit@debbugs.gnu.org id=B59670.166970534518755 (code B ref 59670); Tue, 29 Nov 2022 07:03:03 +0000 Received: (at 59670) by debbugs.gnu.org; 29 Nov 2022 07:02:25 +0000 Received: from localhost ([127.0.0.1]:53784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozudN-0004sQ-7v for submit@debbugs.gnu.org; Tue, 29 Nov 2022 02:02:25 -0500 Received: from knopi.disroot.org ([178.21.23.139]:52774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozucP-0004f3-J1 for 59670@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:26 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7028941452; Tue, 29 Nov 2022 08:01:25 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yMp7BhdbU7r4; Tue, 29 Nov 2022 08:01:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1669705280; bh=VRzpp0sM9Ot7DoOjUGO+hDF/enbPjOoJk7Z9FcyUiSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=adHwwdQGc6yKh0uTzQapZCwcy3fOHhAwSXnupuHisyIDX4zgKH1ZDu/sRPj5TS45G xRFmNQZfGCQC0hMh2dZTujLVUMEY8L4SZfa3L6OGtkA048k6qu+91jvX6nsQDBq1cF YOrOHmmn+ZVV5H0OHIhGze95rOPoZFXalhLX7+bec6PkUjiKLtnW+olbi8mxWepI9k bL5cs5f7fWBHcgZDn1W5PKTCRMAy36Eqv2Vu+oQpS06wCnxx9Kfxa+oINB7WMTOg4l QDPGaNM17E92p59txN/Nc8x5x8jkmT7JcO6XxLywLpviteRAN4iCA/Hf3zTKeO4AHe nCtQ3T55TN8aw== Date: Tue, 29 Nov 2022 07:00:55 +0000 Message-Id: <20221129070104.8007-41-paren@disroot.org> In-Reply-To: <20221129070104.8007-1-paren@disroot.org> References: <20221129070104.8007-1-paren@disroot.org> 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: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" 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-textwrap-0.16): New variable. (rust-textwrap-0.15): Inherit from RUST-TEXTWRAP-0.16. (rust-textwrap-0.12): Inherit from RUST-TEXTWRAP-0.15. --- gnu/packages/crates-io.scm | 85 ++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fb6e10f502..0660c01180 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58423,28 +58423,30 @@ (define-public rust-text-size-1 (description "This package provides a newtypes for text offsets") (license (list license:expat license:asl2.0)))) -(define-public rust-textwrap-0.15 +(define-public rust-textwrap-0.16 (package (name "rust-textwrap") - (version "0.15.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "textwrap" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i")))) + (version "0.16.0") + (source (origin + (method url-fetch) + (uri (crate-uri "textwrap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gbwkjf15l6p3x2rkr75fa4cpcs1ly4c8pmlfx5bl6zybcm24ai2")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-hyphenation" ,rust-hyphenation-0.8) - ("rust-smawk" ,rust-smawk-0.3) - ("rust-terminal-size" ,rust-terminal-size-0.1) - ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) - (home-page - "https://github.com/mgeisler/textwrap") + (list #:skip-build? #t + #:cargo-inputs + `(("rust-hyphenation" ,rust-hyphenation-0.8) + ("rust-smawk" ,rust-smawk-0.3) + ("rust-terminal-size" ,rust-terminal-size-0.2) + ("rust-termion" ,rust-termion-2) + ("rust-unic-emoji-char" ,rust-unic-emoji-char-0.9) + ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-version-sync" ,rust-version-sync-0.9)))) + (home-page "https://github.com/mgeisler/textwrap") (synopsis "Library for word wrapping, indenting, and dedenting strings") (description "Textwrap is a small library for word wrapping, indenting, and dedenting @@ -58453,26 +58455,45 @@ (define-public rust-textwrap-0.15 handle Unicode characters correctly.") (license license:expat))) +(define-public rust-textwrap-0.15 + (package + (inherit rust-textwrap-0.16) + (name "rust-textwrap") + (version "0.15.0") + (source (origin + (method url-fetch) + (uri (crate-uri "textwrap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i")))) + (arguments + (list #:skip-build? #t + #:cargo-inputs + `(("rust-hyphenation" ,rust-hyphenation-0.8) + ("rust-smawk" ,rust-smawk-0.3) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))))) + (define-public rust-textwrap-0.12 (package (inherit rust-textwrap-0.15) (name "rust-textwrap") (version "0.12.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "textwrap" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12978qmkl5gcp94lxndpvp9qxq8mxp7hm9xbrw3422dgikchhc10")))) + (source (origin + (method url-fetch) + (uri (crate-uri "textwrap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12978qmkl5gcp94lxndpvp9qxq8mxp7hm9xbrw3422dgikchhc10")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-hyphenation" ,rust-hyphenation-0.8) - ("rust-terminal-size" ,rust-terminal-size-0.1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))))) + (list #:skip-build? #t + #:cargo-inputs + `(("rust-hyphenation" ,rust-hyphenation-0.8) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))))) (define-public rust-textwrap-0.11 (package