guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: go-gopkg.in-tomb.v2: Fix build.


From: guix-commits
Subject: 01/01: gnu: go-gopkg.in-tomb.v2: Fix build.
Date: Tue, 4 Dec 2018 14:53:39 -0500 (EST)

cbaines pushed a commit to branch master
in repository guix.

commit 69a64ecd66733e394a3b116b38f67b354dcebcc9
Author: Christopher Baines <address@hidden>
Date:   Tue Dec 4 19:44:47 2018 +0000

    gnu: go-gopkg.in-tomb.v2: Fix build.
    
    Looks like this test isn't compiling with newer versions of go, so fix it to
    get the package building again.
    
    * gnu/packages/golang.scm (go-gopkg.in-tomb.v2)[arguments]: Add new
    patch-source phase.
---
 gnu/packages/golang.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 60890bf..6c97070 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -632,7 +632,16 @@ way of specifying command line options.")
                   "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10"))))
       (build-system go-build-system)
       (arguments
-       '(#:import-path "gopkg.in/tomb.v2"))
+       '(#:import-path "gopkg.in/tomb.v2"
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch-source
+             (lambda _
+               ;; Add a missing % to fix the compilation of this test
+               (substitute* "src/gopkg.in/tomb.v2/tomb_test.go"
+                 (("t.Fatalf\\(`Killf\\(\"BO%s")
+                  "t.Fatalf(`Killf(\"BO%%s"))
+               #t)))))
       (synopsis "@code{tomb} handles clean goroutine tracking and termination")
       (description
        "The @code{tomb} package handles clean goroutine tracking and



reply via email to

[Prev in Thread] Current Thread [Next in Thread]