From patchwork Sun Jul 24 21:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 40918 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 0094127BBEB; Sun, 24 Jul 2022 23:01:15 +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=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 24F6527BBE9 for ; Sun, 24 Jul 2022 23:01:15 +0100 (BST) Received: from localhost ([::1]:40770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFjf0-0000V9-A1 for patchwork@mira.cbaines.net; Sun, 24 Jul 2022 18:01:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFjdw-0000UT-LL for guix-patches@gnu.org; Sun, 24 Jul 2022 18:00:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFjdr-0001UJ-JJ for guix-patches@gnu.org; Sun, 24 Jul 2022 18:00:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFjdr-00030R-C4 for guix-patches@gnu.org; Sun, 24 Jul 2022 18:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56074] [bug#56057] [gnu: Add dua-cli. 20/27] gnu: Add rust-textwrap-0.15. Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Jul 2022 22:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: antlers Cc: antlers@luris.net, 56074@debbugs.gnu.org, 56057@debbugs.gnu.org Received: via spool by 56074-submit@debbugs.gnu.org id=B56074.165869999011459 (code B ref 56074); Sun, 24 Jul 2022 22:00:03 +0000 Received: (at 56074) by debbugs.gnu.org; 24 Jul 2022 21:59:50 +0000 Received: from localhost ([127.0.0.1]:48894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFjdd-0002yh-R4 for submit@debbugs.gnu.org; Sun, 24 Jul 2022 17:59:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFjdY-0002yD-1d for 56074@debbugs.gnu.org; Sun, 24 Jul 2022 17:59:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id DF27A240108 for <56074@debbugs.gnu.org>; Sun, 24 Jul 2022 23:59:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1658699977; bh=dxt6m+Voh757EOLxwK9AFLlgdtMOc93Xqv0H2sw+K8E=; h=From:To:Cc:Subject:Date:From; b=eajilaGp+IW0qZaYcoCg14lC9v7Z1pXsyPVaDlcCCPm5WuiWW2pXArZBC9Pp/UZ6r P7sJBKPoCph0bNfdSE9XH4+FjrWnPslV7T03PgZtABbFG0u2h9Zp4AEywd6Cee7NoH 9p7/n5zJgeFCq5GNyGps8B1718u13QWqhLpvP/+YBd9JVGdiwgtzO0HQSHWKcvlbJQ Q2fk3sECsapDGNyrFzBuDmA0V+UkYc/Z8XWyMUfeUuzpVPIXRi3yLvmEsTfWsYDxWX OC5k5BNnibkHTSw9ZvBAXs8zTEkeQLVqNXm5dmv03aerR6+ZfMxhgmgp9UpuZ9b5fo TqXn43xMa1S+w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4LrcXS29yRz6tm6; Sun, 24 Jul 2022 23:59:33 +0200 (CEST) From: Aleksandr Vityazev References: <20220618195656.10108-1-antlers@luris.net> <20220618195656.10108-21-antlers@luris.net> Date: Sun, 24 Jul 2022 21:59:31 +0000 In-Reply-To: <20220618195656.10108-21-antlers@luris.net> (antlers's message of "Sat, 18 Jun 2022 12:56:49 -0700") Message-ID: <87lesikw8s.fsf@posteo.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, The textwrap-0.15 build will fail On 2022-06-18, 12:56 -0700, antlers wrote: > * gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable. > (rust-textwrap-0.12): Inherit from rust-textwrap-0.15. > --- > :100644 100644 fd431e544b f9aabbb334 M gnu/packages/crates-io.scm > gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++++----- > 1 file changed, 27 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm > index fd431e544b..f9aabbb334 100644 > --- a/gnu/packages/crates-io.scm > +++ b/gnu/packages/crates-io.scm > @@ -62665,10 +62665,10 @@ (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.12 > +(define-public rust-textwrap-0.15 > (package > (name "rust-textwrap") > - (version "0.12.1") > + (version "0.15.0") > (source > (origin > (method url-fetch) > @@ -62677,16 +62677,17 @@ (define-public rust-textwrap-0.12 > (string-append name "-" version ".tar.gz")) > (sha256 > (base32 > - "12978qmkl5gcp94lxndpvp9qxq8mxp7hm9xbrw3422dgikchhc10")))) > + "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i")))) > (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") > + (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 > @@ -62695,6 +62696,27 @@ (define-public rust-textwrap-0.12 > handle Unicode characters correctly.") > (license license:expat))) > > +(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")))) > + (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)))))) > + > (define-public rust-textwrap-0.11 > (package > (inherit rust-textwrap-0.12) To correctly build textwrap-0.15 u can use these patches (see in attachments). Although, of course, it does not play a big role, older versions also fails when building. From b7b5118274309e91a9599e487ea3e531a461ce19 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Aleksandr Vityazev Date: Sun, 24 Jul 2022 23:34:33 +0300 Subject: [PATCH 23/27] gnu: Add rust-textwrap-0.15. * gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable. --- gnu/packages/crates-io.scm | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bb608a5ebb..f9a11dd408 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62748,6 +62748,47 @@ (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 + (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")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + (("version = \"1.5.6\"") "version = \"^1.5.5\"")))))) + (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)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-lipsum" ,rust-lipsum-0.8) + ("rust-termion" ,rust-termion-1) + ("rust-unic-emoji-char" ,rust-unic-emoji-char-0.9) + ("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 +strings. You can use it to format strings (such as help and error messages) +for display in commandline applications. It is designed to be efficient and +handle Unicode characters correctly.") + (license license:expat))) + (define-public rust-textwrap-0.12 (package (name "rust-textwrap") -- 2.37.1