From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +NayI2MIQ2d9pwAAqHPOHw:P1 (envelope-from ) for ; Sun, 24 Nov 2024 11:05:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +NayI2MIQ2d9pwAAqHPOHw (envelope-from ) for ; Sun, 24 Nov 2024 12:05:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Lh2lVR0y; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=O1ho0YvG; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732446307; a=rsa-sha256; cv=none; b=Hp+wln14x7GxPTArRPr9ooUkSyhDwOkfIbdatOR2mn1ZPprdI7DAOsF5rsmWgRl8zOjnFy /XOuTdET9WYoqTO5KYBy2Yj9FnZUiHJY19xJ/hkUEBYcy4qup4RR2A76OrNZxn9BLoIsze F+ld5YrJ4a2UCy4XHJV96XgzEQF6n+IjWgi2/C69SI3Sct3RVWqqqGJs4ai9zMsfpxXaPI Ct1fz6jfTgQraE2wH7NDs1urYc3unS1BgFEvvpVEsm2mh60tF8lT1FFBM9kE0nKXRNUZBw 9FLsJva4jcczCxXeKPBd8dx4gELOAgEGT33Jou7ArsOkAzZaazXsnafZn/BFOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Lh2lVR0y; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=O1ho0YvG; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732446307; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=J06UwMj84SX2f58sxqshOrTo5ZdqwhkfxhOivc5tPvU=; b=Cq7+3HeFvERDuxkDulov4UeHu1BWI/5+YYOhtZTW6i7rK7g056EIWr1b5H1cfcCXRxPsCm dXjuwGqPB3Bb+jrV9phBO6IM5HkuWcHpPxKYEZvG9msXhrrkw6IxSSJQWrFBP+Hu2xW786 ur6235vPVhi+qLT9gBDd6kxh6FQtGVSt1n1WgEOrPUHqvEbZ8ehu+93HmlmiXk/Z4izV8a nsZ9/XD3qIvQfndJ5JOv2q/jhAQ4A/7IRvYZ5IzpYH5Dlz2OGlKwJ0WY962NUDLocr4RqT 7y5nVdbXUWGGHKnMxE1nBMp9Da9wv9vFJnXAw5lZtyQVR3LbnktmYFDJtUJlIA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 56E2D1CBEA for ; Sun, 24 Nov 2024 12:05:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF9sc-0005qb-Bc; Sun, 24 Nov 2024 05:30:14 -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 1tF9sW-0005nE-QI for guix-patches@gnu.org; Sun, 24 Nov 2024 05:30:09 -0500 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 1tF9sV-0001el-Ng for guix-patches@gnu.org; Sun, 24 Nov 2024 05:30:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=J06UwMj84SX2f58sxqshOrTo5ZdqwhkfxhOivc5tPvU=; b=Lh2lVR0yz8bIfE9yHcz01E3/4HCJsporSTxsTIuZfnV8CfWsHuC7MGyeEv8Ntd6GijWaTiJsrPFhP6RnC2bAKu3XViHDlVtFHWnvCgwBoJzTuCU2dazABuw95eF4aUQksh3V4bkNv/ljH72pLPnqB36VnGtJXItrlrhIyD1XvlDH5j/QZmmWMAZ8d1Zl6tqk+RQOQltMBKnXPzzSWMAqJGyEtuqwNzK23hFrnLAXk+iOKLz+jgPfBb3Plb8XZx4pp1fDCBx4fwl9c0VaDm06vDRrPWY+lZpKdQTctd/XheUTJsisle/5aSTPqIA1+CDiCKbzFUn34BDkuJwLM/wj2A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF9sV-0003XI-Il for guix-patches@gnu.org; Sun, 24 Nov 2024 05:30:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74495] [PATCH v2 15/16] gnu: go-github-com-charmbracelet-bubbletea: Update to 1.2.3. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 10:30:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74495@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 74495-submit@debbugs.gnu.org id=B74495.173244418313280 (code B ref 74495); Sun, 24 Nov 2024 10:30:07 +0000 Received: (at 74495) by debbugs.gnu.org; 24 Nov 2024 10:29:43 +0000 Received: from localhost ([127.0.0.1]:32974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF9s6-0003S4-AU for submit@debbugs.gnu.org; Sun, 24 Nov 2024 05:29:42 -0500 Received: from mail-lj1-f171.google.com ([209.85.208.171]:38468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF9ru-0003RI-6A for 74495@debbugs.gnu.org; Sun, 24 Nov 2024 05:29:30 -0500 Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2ffc068f492so235691fa.2 for <74495@debbugs.gnu.org>; Sun, 24 Nov 2024 02:29:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732444104; x=1733048904; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J06UwMj84SX2f58sxqshOrTo5ZdqwhkfxhOivc5tPvU=; b=O1ho0YvGeUA1CWx7PZ9z67KQCTjT/UdZt3tMMbl+bUZbv2ebxz2BKKY2Ba/sNGtgWn A8nrmSFB4rrDJr2I0dpNv7ZIWwlw+ZGq5DVkmRgmBa2GqU2rii1pXuPPzMMRsBi3utdg xB6SuqD3KDXOHaLGPTOdPsW/hYqw/8saDaQ2Z+ISYcQLRIGaZNMKF0opLGcIca0sA0NI 9L/nGSiBmw/bEdVmbghuPbGwQz9uxo510eSBnGoE0hfdmqZI15gCRLROhRhorGcILf1V 1DbQTFHcq3LR5ooRMt3lZ60ZjJpZmLcn9oL5OW+9MPv8h8OI4I5NZp8glBe8ymvcjOrk MJjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732444104; x=1733048904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J06UwMj84SX2f58sxqshOrTo5ZdqwhkfxhOivc5tPvU=; b=h2dro85QFL/3VnAruXRGMMV5Y11jnfYuEEbYGCiPxFjhJrYAEuNkN0FE23wqa4zbsw j1UvmOm/+xySSn4fXEm00XKI98SH9Q1iYV41E4d7nlHuau5S0ABQaBuxr6eGeN7BjNQl Ek0CfoU/UHssbziqPcJW1Nc9nSW/1YJVu3sGgJtoJJ0bxwDtwABgC5Ix9g3uRGJjHJmr vin/NaftezbWJpGpqJitcgrKi8FK8suiClfOlxdScAQHhE4U+K4oLs0WcYCTBjdF60zc QCWfhOH6k7lDNh689B8psnDKMM1F9LqW2QA77OFbdoVsIY8TnP74Dk67vcHUolJqWkpW yJyg== X-Gm-Message-State: AOJu0YzZC2nEpFmQlqm7KG3ZJuxUU3q9twiDtPh6dtS8V1UR0EZxOGYA EE0zkbKHEyMoyKK9CKe3BHfE2X74abGpA2VPjfEd9FnTQDM9DBtLGIlnP4ss X-Gm-Gg: ASbGncuo9aGVLVY643DGlXq6/aTKfkehVEDJvE9Iy5U6Dh4ZN3EdtYxWZlobgA3s1L3 ydDAGzoCH4kNsjjjR4wcWqVjEiRSCFcuokzXuhA+E0/Doj6BQtShrGW1ntLU5KLfHniiCr/wLbk TJEV1+9da7Kb+cPKGoraB0n6ge9mpcKhHVA/SZGo9Atsv5+J0w8cMkpgiEHTpQjfHHIpdkl+SnH H8J+Wtg6WT3C+gP+SttNl+U93fflgAwsEbbhCIZxy2XiGuND8uu X-Google-Smtp-Source: AGHT+IFjraDQu5kqkT90awqSzRhbraW7M/MN6zjpTo5WqLu7w8zq7wX0JEO0FLcKeHJXsVWxs2rA6g== X-Received: by 2002:a05:6512:3b8d:b0:53d:a09d:ab9b with SMTP id 2adb3069b0e04-53dd389dfdfmr832242e87.7.1732444103960; Sun, 24 Nov 2024 02:28:23 -0800 (PST) Received: from elephant.. ([95.79.145.11]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53dd24455e6sm1262873e87.3.2024.11.24.02.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2024 02:28:22 -0800 (PST) From: "Artyom V. Poptsov" Date: Sun, 24 Nov 2024 13:27:36 +0300 Message-ID: <4a8985f97204d40f187337d99609ea13419c1131.1732444026.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.59 X-Spam-Score: -0.59 X-Migadu-Queue-Id: 56E2D1CBEA X-Migadu-Scanner: mx10.migadu.com X-TUID: y8y8L0WnkH7v * gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): Update to 1.2.3. [propagated-inputs]: Add go-github-com-muesli-ansi, go-github-com-muesli-cancelreader, go-github-com-charmbracelet-lipgloss, go-github-com-charmbracelet-x-term, go-github-com-charmbracelet-x-ansi, and go-golang-org-x-sync. Sort inputs alphabetically. [arguments] : Fix tests that are failing due to newer version of "go-github-com-charmbracelet-x-ansi" package. Change-Id: Ifdb3074f342b34c07c0e7ab47341b159d1eea0c2 --- gnu/packages/golang.scm | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index df5111922b..401626326b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7030,7 +7030,7 @@ (define-public go-github-com-rivo-uniseg (define-public go-github-com-charmbracelet-bubbletea (package (name "go-github-com-charmbracelet-bubbletea") - (version "0.13.2") + (version "1.2.3") (source (origin (method git-fetch) @@ -7040,7 +7040,7 @@ (define-public go-github-com-charmbracelet-bubbletea (file-name (git-file-name name version)) (sha256 (base32 - "1105cggi5fwqx69m0vrhgwx6kaw82w4ahn58sj0a81603c4yvrk0")))) + "0ggkl29qixgin5av1mbnwfbb31kmwpczh8pgpjsx9z277fs55mph")))) (build-system go-build-system) (arguments (list @@ -7050,18 +7050,36 @@ (define-public go-github-com-charmbracelet-bubbletea (lambda* (#:key import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (for-each delete-file-recursively - '("examples" "tutorials")))))))) + '("examples" "tutorials"))))) + (add-before 'check 'fix-tests + (lambda _ + ;; XXX: The package requires + ;; "go-github-com-charmbracelet-x-ansi" version 0.4.5; with + ;; the newer version of "ansi", some "bubbletea" screen tests + ;; fail as "ansi" 0.5.2 handles escape sequences a little bit + ;; differently. + (substitute* "src/github.com/charmbracelet/bubbletea/screen_test.go" + (("x1b\\[0K") + "x1b[K") + (("x1b\\[2;0H") + "x1b[2;H"))))))) (propagated-inputs - (list go-github-com-mattn-go-isatty - go-github-com-muesli-termenv + (list go-github-com-charmbracelet-lipgloss + go-github-com-charmbracelet-x-ansi + go-github-com-charmbracelet-x-term + go-github-com-containerd-console + go-github-com-lucasb-eyer-go-colorful + go-github-com-mattn-go-isatty + go-github-com-mattn-go-isatty go-github-com-mattn-go-runewidth + go-github-com-muesli-ansi + go-github-com-muesli-cancelreader go-github-com-muesli-reflow - go-github-com-lucasb-eyer-go-colorful - go-github-com-containerd-console + go-github-com-muesli-termenv go-golang-org-x-crypto + go-golang-org-x-sync go-golang-org-x-sys - go-golang-org-x-term - go-github-com-mattn-go-isatty)) + go-golang-org-x-term)) (home-page "https://github.com/charmbracelet/bubbletea") (synopsis "Powerful little TUI framework") (description -- 2.46.0