From patchwork Sun Jun 18 03:43:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 51025 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 4AECC27BBEA; Sun, 18 Jun 2023 04:44:27 +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 0EAE127BBE2 for ; Sun, 18 Jun 2023 04:44:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAjKg-0000IA-8k; Sat, 17 Jun 2023 23:44:06 -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 1qAjKe-0000CF-7X for guix-patches@gnu.org; Sat, 17 Jun 2023 23:44:04 -0400 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 1qAjKd-0007lX-V7 for guix-patches@gnu.org; Sat, 17 Jun 2023 23:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAjKd-0004qe-PY for guix-patches@gnu.org; Sat, 17 Jun 2023 23:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64033] [PATCH v2 1/2] gnu: Update go-github-com-mattn-go-runewidth to 0.0.14 Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 03:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64033 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64033@debbugs.gnu.org Cc: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Received: via spool by 64033-submit@debbugs.gnu.org id=B64033.168705982318581 (code B ref 64033); Sun, 18 Jun 2023 03:44:03 +0000 Received: (at 64033) by debbugs.gnu.org; 18 Jun 2023 03:43:43 +0000 Received: from localhost ([127.0.0.1]:52883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAjKI-0004pY-B9 for submit@debbugs.gnu.org; Sat, 17 Jun 2023 23:43:43 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAjKB-0004ow-Sd for 64033@debbugs.gnu.org; Sat, 17 Jun 2023 23:43:37 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 401864179B; Sun, 18 Jun 2023 05:43:32 +0200 (CEST) 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 bMxk1eCQPv6E; Sun, 18 Jun 2023 05:43:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1687059810; bh=qVV7sHbiJeTiLEJKmQmTZ5mcK3mfhg8h8TobUvnBUY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HOhW3zuGcASNhMsgt83oqb7iTVAjE78FaiZ7g4R2yO9mVyX72IH8kMI/WJnJumtDA i4N+tazKxGBbyqik+8w8Votiz2GxL8NmEjDX1EQgbBhBbluffFSAIzx2134gF/9w82 MTatc8wBKzdl/WxdkTw5waC4rdNlPNq1q4ug6PUDmDNicFgP7t66FV8R1M7YpUyHPu vlczPD9RuNWmFMZEwEkD6ORjbAC+weGol44zGKTMjRpDSp0Kbbsse5zgZiwYaVic83 BLR+jLu+W3WumtRXcS3RTLUTiYlXL56uiozGmu2JBOwdJJZSvJjJkv27KZf4cQ8Z5n uLdEeuSV8j2Vg== Date: Sun, 18 Jun 2023 12:43:10 +0900 Message-Id: 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: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: "ashish.is--- via Guix-patches\" via" 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/golang.scm (go-github-com-mattn-go-runewidth): Update to 0.0.14. * gnu/packages/golang.scm: Fix input typoes Signed-off-by: Nguyễn Gia Phong --- Note that this is not a rename: the package in golang.scm was named with all hyphens. gnu/packages/configuration-management.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/disk.scm | 2 +- gnu/packages/golang.scm | 18 +++++++-------- gnu/packages/terminals.scm | 4 ++-- gnu/packages/textutils.scm | 28 ----------------------- gnu/packages/time.scm | 2 +- 7 files changed, 15 insertions(+), 43 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index b66f70545ab3..95a7e8615fc9 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -78,7 +78,7 @@ (define-public chezmoi go-github-com-google-goterm go-github-com-lucasb-eyer-go-colorful go-github-com-mattn-go-isatty - go-github.com-mattn-go-runewidth + go-github-com-mattn-go-runewidth go-github-com-olekukonko-tablewriter go-github-com-pelletier-go-toml go-github-com-pkg-diff diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 74483d27f781..937958b60031 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5075,7 +5075,7 @@ (define-public sqls go-github-com-pkg-errors go-github-com-sourcegraph-jsonrpc2 go-golang-org-x-crypto - go-github.com-mattn-go-runewidth + go-github-com-mattn-go-runewidth go-golang-org-x-xerrors go-gopkg-in-yaml-v2)) (synopsis "SQL language server written in Go") diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index abbc87a95ab4..b878614dc290 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1161,7 +1161,7 @@ (define-public lf "1piym8za0iw2s8yryh39y072f90mzisv89ffvn1jzb71f71mbfqa")))) (build-system go-build-system) (native-inputs - (list go-github.com-mattn-go-runewidth go-golang-org-x-term + (list go-github-com-mattn-go-runewidth go-golang-org-x-term go-gopkg-in-djherbis-times-v1 go-github-com-gdamore-tcell-v2-2.3)) (arguments `(#:import-path "github.com/gokcehan/lf")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d51c023808cf..b99659966dda 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2755,7 +2755,7 @@ (define-public go-github-com-gizak-termui '(#:unpack-path "github.com/gizak/termui" #:import-path "github.com/gizak/termui/v3")) (propagated-inputs - (list go-github.com-mattn-go-runewidth + (list go-github-com-mattn-go-runewidth go-github-com-mitchellh-go-wordwrap go-github.com-nsf-termbox-go)) (home-page "https://github.com/gizak/termui") (synopsis "Terminal dashboard widget Go library") @@ -7105,7 +7105,7 @@ (define-public go-github-com-gdamore-tcell (arguments `(#:import-path "github.com/gdamore/tcell")) (inputs - (list go-github.com-mattn-go-runewidth + (list go-github-com-mattn-go-runewidth go-github-com-lucasb-eyer-go-colorful go-golang-org-x-text go-github-com-gdamore-encoding)) @@ -9128,7 +9128,7 @@ (define-public go-github-com-muesli-reflow-wordwrap `(#:import-path "github.com/muesli/reflow/wordwrap" #:unpack-path "github.com/muesli/reflow")) (native-inputs - (list go-github.com-mattn-go-runewidth)) + (list go-github-com-mattn-go-runewidth)) (home-page "https://github.com/muesli/reflow/") (synopsis "Collection of methods helping to transform blocks of text") (description "This package provides a collection of ANSI-aware methods and @@ -9187,7 +9187,7 @@ (define-public go-github-com-muesli-termenv (list go-github-com-google-goterm go-github-com-lucasb-eyer-go-colorful go-github-com-mattn-go-isatty - go-github.com-mattn-go-runewidth)) + go-github-com-mattn-go-runewidth)) (home-page "https://github.com/muesli/termenv/") (synopsis "Advanced styling options on the terminal") (description "termenv lets you safely use advanced styling options on the @@ -9241,7 +9241,7 @@ (define-public go-github-com-olekukonko-tablewriter (arguments `(#:import-path "github.com/olekukonko/tablewriter")) (propagated-inputs - (list go-github.com-mattn-go-runewidth)) + (list go-github-com-mattn-go-runewidth)) (home-page "https://github.com/olekukonko/tablewriter/") (synopsis "Generate ASCII table") (description "This package generates ASCII tables. Features: @@ -9338,7 +9338,7 @@ (define-public go-github-com-charmbracelet-glamour go-github-com-muesli-reflow-wordwrap go-github-com-muesli-reflow-indent go-github-com-muesli-reflow-padding - go-github.com-mattn-go-runewidth + go-github-com-mattn-go-runewidth go-github-com-muesli-termenv go-github-com-google-goterm go-github-com-lucasb-eyer-go-colorful @@ -11521,7 +11521,7 @@ (define-public go-github-com-rivo-uniseg (define-public go-github-com-mattn-go-runewidth (package (name "go-github-com-mattn-go-runewidth") - (version "0.0.13") + (version "0.0.14") (source (origin (method git-fetch) @@ -11530,7 +11530,7 @@ (define-public go-github-com-mattn-go-runewidth (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1yir0f3wc5z5hnkwhvx5qb6nmpfb05zp2gvfjvna63s8kmla1rrn")))) + (base32 "1iaqw5pd7f4f2xz37540kp0828p2820g4vxx3hz089hwl331sx1v")))) (build-system go-build-system) (arguments '(#:import-path "github.com/mattn/go-runewidth")) (propagated-inputs @@ -11563,7 +11563,7 @@ (define-public go-github-com-charmbracelet-bubbletea (propagated-inputs `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) ("github.com/muesli/termenv" ,go-github-com-muesli-termenv) - ("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth) + ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth) ("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent) ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 7579d2e7bfb8..d1cfbeab1732 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -957,7 +957,7 @@ (define-public go-github.com-nsf-termbox-go (arguments '(#:import-path "github.com/nsf/termbox-go")) (propagated-inputs - (list go-github.com-mattn-go-runewidth)) + (list go-github-com-mattn-go-runewidth)) (synopsis "@code{termbox} provides a minimal API for text-based user interfaces") (description @@ -984,7 +984,7 @@ (define-public go-github-com-junegunn-fzf (arguments `(#:import-path "github.com/junegunn/fzf")) (inputs - (list go-github.com-mattn-go-runewidth + (list go-github-com-mattn-go-runewidth go-github-com-mattn-go-shellwords go-github-com-mattn-go-isatty go-github-com-gdamore-tcell diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 026264dc27ce..2252bb7c16fa 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1008,34 +1008,6 @@ (define-public txt2tags markup and converts it to multiple formats.") (license license:gpl2))) -(define-public go-github.com-mattn-go-runewidth - (let ((commit "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211") - (version "0.0.4") - (revision "1")) - (package - (name "go-github.com-mattn-go-runewidth") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mattn/runewidth") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/mattn/go-runewidth")) - (synopsis "@code{runewidth} provides Go functions to work with string widths") - (description - "The @code{runewidth} library provides Go functions for padding, -measuring and checking the width of strings, with support for East Asian -text.") - (home-page "https://github.com/mattn/runewidth") - (license license:expat)))) - (define-public docx2txt (package (name "docx2txt") diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 38b51583da27..5c8f65a1e67b 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -623,7 +623,7 @@ (define-public countdown (arguments '(#:import-path "github.com/antonmedv/countdown")) (native-inputs - `(("runewidth" ,go-github.com-mattn-go-runewidth) + `(("runewidth" ,go-github-com-mattn-go-runewidth) ("termbox" ,go-github.com-nsf-termbox-go))) (home-page "https://github.com/antonmedv/countdown") (synopsis "Counts to zero with a text user interface") From patchwork Sun Jun 18 03:43:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 51026 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 B820827BBEA; Sun, 18 Jun 2023 04:44:37 +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 033DD27BBE2 for ; Sun, 18 Jun 2023 04:44:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAjKe-0000Eu-Uh; Sat, 17 Jun 2023 23:44:04 -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 1qAjKd-0000AN-BJ for guix-patches@gnu.org; Sat, 17 Jun 2023 23:44:03 -0400 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 1qAjKd-0007lG-2x for guix-patches@gnu.org; Sat, 17 Jun 2023 23:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAjKc-0004qP-MV for guix-patches@gnu.org; Sat, 17 Jun 2023 23:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64033] [PATCH v2 2/2] gnu: go-github-com-gdamore-tcell-v2: Update to 2.6.0 Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 03:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64033 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64033@debbugs.gnu.org Cc: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Received: via spool by 64033-submit@debbugs.gnu.org id=B64033.168705982218566 (code B ref 64033); Sun, 18 Jun 2023 03:44:02 +0000 Received: (at 64033) by debbugs.gnu.org; 18 Jun 2023 03:43:42 +0000 Received: from localhost ([127.0.0.1]:52879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAjKF-0004pL-1G for submit@debbugs.gnu.org; Sat, 17 Jun 2023 23:43:41 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAjKB-0004oz-Se for 64033@debbugs.gnu.org; Sat, 17 Jun 2023 23:43:36 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 592CF41C63; Sun, 18 Jun 2023 05:43:34 +0200 (CEST) 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 l-_2yChJ97xo; Sun, 18 Jun 2023 05:43:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1687059813; bh=tjr/AyrUwIHdzF/HukQhvlLE5qJBfLSRtsz1yhNeTr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CpHA+w/hsDz7KB8nFuY853G2SAXIAoNQAgyo3k3lJaUwWuS1erwJ9rFDUxfdiQFa5 MJBklDeM/WvGxbUrzZ6mW7w3ACCdT1nhpLCMJzPbBGT83Jc0MEFWBht54yRjNfvldd J2t2cUxaqeRBwbvYFVaM6hn9NXovVJD/1UAtPrii8l4H0m+RwM9wsptOtanMS3gVQL GtNAnBTKtyVx48GGwSQiEjgu+1sxVpRch98Cu3JddbB0SCVO7HPYpQ9MQ0or4ofvHK 9HADM4kmN2kz+7kmfsdmnP7+nDjfT9a2bnPgY87X5sqfXvelWunc+WDW3ymrd8q3le +0BqUuNge2gVg== Date: Sun, 18 Jun 2023 12:43:11 +0900 Message-Id: <35cd3c1a8a57768cc8e8d20f9bae3eb3be3624b1.1687059530.git.mcsinyx@disroot.org> 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: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: "ashish.is--- via Guix-patches\" via" 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/golang.scm (go-github-com-gdamore-tcell-v2): Update to 2.6.0. Signed-off-by: Nguyễn Gia Phong --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b99659966dda..e4c4cb299b48 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7121,7 +7121,7 @@ (define-public go-github-com-gdamore-tcell-v2 (package (inherit go-github-com-gdamore-tcell) (name "go-github-com-gdamore-tcell") - (version "2.5.3") + (version "2.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -7130,7 +7130,7 @@ (define-public go-github-com-gdamore-tcell-v2 (file-name (git-file-name name version)) (sha256 (base32 - "0pvs0gigqxpifc7y7cx82cg95pgqmy8qzxynja3zidplrx2075j3")))) + "0126hi8glnfqdx4l9zlh6dhd5f5c8bws7arv9pp4n2kqcnhdc6g2")))) (arguments (list #:import-path "github.com/gdamore/tcell/v2" #:phases