From patchwork Sun Jan 7 22:33:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 58460 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 06B3727BBEA; Sun, 7 Jan 2024 22:35:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 B175527BBE2 for ; Sun, 7 Jan 2024 22:35:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMbjP-0003Nd-57; Sun, 07 Jan 2024 17:34:59 -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 1rMbjM-0003NE-Sq for guix-patches@gnu.org; Sun, 07 Jan 2024 17:34:57 -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 1rMbjM-00066G-LI for guix-patches@gnu.org; Sun, 07 Jan 2024 17:34:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMbjS-00031r-Dm for guix-patches@gnu.org; Sun, 07 Jan 2024 17:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68311] [PATCH] gnu: go-github-com-charmbracelet-glamour: Fix build. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jan 2024 22:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68311@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170466686011556 (code B ref -1); Sun, 07 Jan 2024 22:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2024 22:34:20 +0000 Received: from localhost ([127.0.0.1]:34062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMbim-00030J-AN for submit@debbugs.gnu.org; Sun, 07 Jan 2024 17:34:20 -0500 Received: from lists.gnu.org ([2001:470:142::17]:45906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMbik-0002zr-90 for submit@debbugs.gnu.org; Sun, 07 Jan 2024 17:34:19 -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 1rMbiZ-0003G7-0M for guix-patches@gnu.org; Sun, 07 Jan 2024 17:34:07 -0500 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMbiW-0005yl-1I for guix-patches@gnu.org; Sun, 07 Jan 2024 17:34:05 -0500 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2cd3f7e2aa1so13024951fa.3 for ; Sun, 07 Jan 2024 14:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704666841; x=1705271641; darn=gnu.org; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=ovSiDiNZe5owLtKrnOGA8Ik2NR03L6hboHgSEA/aCCI=; b=TTjQj/e+lMC2HI7einXO503N2kNrxKf5+N7J3ds2D4x2bdLj6vg/wmOQPEPngUyt4G VvmUEMI4CyqJ2cqXr23OGaV3hvvu4KQ341xnilkRz2S9/tpdLMmsVrT229BjR+czO4+j dTZLQwK68So+djjb69gowO6Q3CTj/GuZe1/IuAZAUb4fJVUhpgvJY0u4hXE6gNfVGN/x e/eZDCjp2g5N2fmy8ngQYFY832LcQi8V2PJYadEmD2XzJ5qhLDoKWC/mps2HRkQjsOVy u0WWKM2bIVl8RHym88FTRPVMBUBsN/RynakgU8TVgLC9BtDvga/hEhc4Rg6VvAL7jmfT YCdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704666841; x=1705271641; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ovSiDiNZe5owLtKrnOGA8Ik2NR03L6hboHgSEA/aCCI=; b=d/vMmY/gqzEt5deqgIKV8UleZHAR7kmuXocuEPBeTvbMivPuLVUc0SKP4nferTHBIk lkUG33j5GKGXAi+86sfzU4WNjrd6htO5a7gvYErxSIjjgh+u2hQRuCxINzz0aQv6Yc4f Ewda3KKMjW+BFOK+j6KwFLvsXBkUcLX/ChhR42bA9opYOKZTRb5fPHzWb820Aon3rviq L+Cqa8e3PHvdbIZuYTMe35Sb2ImqMg/c6O9N2piN0Et34zMs9kbbOk95LbulCDv51aGG mdWrwmRd7aM5MJUlNU9Mn/hzTjCJd5y+4B+ttn1TNFBaE9pbAqZhUBSaapMGe2MXH7lK /7DQ== X-Gm-Message-State: AOJu0YySUIUWjnfhuQtAF50Fg848GJLbeaSIUcDYqxVG8CllrnCD0+m8 BxP5TKlmvRCgjXQA3gUBkfb0boLDLnY= X-Google-Smtp-Source: AGHT+IECD+96AfUZ5MP2sMvlLqMvULL4Nvz12DM43gGZiJKALfquqDRuHgnPAkgO4BbXkJJtXfzPpw== X-Received: by 2002:a2e:a419:0:b0:2cc:f162:5524 with SMTP id p25-20020a2ea419000000b002ccf1625524mr965008ljn.84.1704666841102; Sun, 07 Jan 2024 14:34:01 -0800 (PST) Received: from elephant ([95.79.79.224]) by smtp.gmail.com with ESMTPSA id a5-20020a2eb545000000b002ccba7a96c4sm1299527ljn.118.2024.01.07.14.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 14:34:00 -0800 (PST) From: "Artyom V. Poptsov" Date: Mon, 08 Jan 2024 01:33:58 +0300 Message-ID: <87ttnopycp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22c; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x22c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, this patch fixes 'go-github-com-charmbracelet-glamour' build. - avp From f579a9338598e2a947e5b37b8248acf7d17f13d5 Mon Sep 17 00:00:00 2001 Message-ID: From: "Artyom V. Poptsov" Date: Mon, 8 Jan 2024 01:30:11 +0300 Subject: [PATCH] gnu: go-github-com-charmbracelet-glamour: Fix build. * gnu/packages/golang.scm (go-github-com-charmbracelet-glamour): Fix build. Change-Id: I14ce450360e684c4c1ac324e77b47771bbdf1410 --- gnu/packages/golang.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 58681af958..baa6e631d6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2022 Christopher Howard ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Timo Wilken -;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023-2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -9004,7 +9004,20 @@ (define-public go-github-com-charmbracelet-glamour "1idq8d13rp1hx2a1xak31fwl9fmi09p2x4ymvzl7aj850saw5w0z")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/charmbracelet/glamour")) + (list #:import-path "github.com/charmbracelet/glamour" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; Some tests fail due to different number of '^[0m' symbols at + ;; the beginning and the end of paragraphs. To fix that we + ;; re-generate 'readme.test' so the test output will match the + ;; 'readme.test' contents. + (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test" + #o644) + (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go" + ((" generate = false") + " generate = true"))))))) (native-inputs (list go-github-com-alecthomas-chroma go-github-com-danwakefield-fnmatch base-commit: 5f8a993aa85554ca09bd27139230d7664107e1b6 -- 2.41.0