diff mbox series

[bug#68311] gnu: go-github-com-charmbracelet-glamour: Fix build.

Message ID 87ttnopycp.fsf@gmail.com
State New
Headers show
Series [bug#68311] gnu: go-github-com-charmbracelet-glamour: Fix build. | expand

Commit Message

Artyom V. Poptsov Jan. 7, 2024, 10:33 p.m. UTC 
Hello,

this patch fixes 'go-github-com-charmbracelet-glamour' build.
- avp

Comments

Mathieu Othacehe Jan. 12, 2024, 4:29 p.m. UTC | #1 
Hello,

> +;;; Copyright © 2023-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>

',' instead of '-'

Applied, thanks,

Mathieu
diff mbox series

Patch

From f579a9338598e2a947e5b37b8248acf7d17f13d5 Mon Sep 17 00:00:00 2001
Message-ID: <f579a9338598e2a947e5b37b8248acf7d17f13d5.1704666787.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
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 <christopher@librehacker.com>
 ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
-;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; 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