diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:15:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:15:49 +0200 |
| commit | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (patch) | |
| tree | b3d6aa01aec86a7f224e15d97a40b64de4e5cdb8 /gnu/packages/golang.scm | |
| parent | c20cd0d24d9b5e8a47b864db9799e0992ffd44b9 (diff) | |
| parent | 2f837cf7fe100b0584fb02cf8f19d4cfb4e14d88 (diff) | |
| download | guix-72e2815d18ad688b0a16ce3b3efba1172423cec4.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/golang.scm')
| -rw-r--r-- | gnu/packages/golang.scm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 95cfa4c674..9f3ccc8f69 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Sergei Trofimovich <slyfox@inbox.ru> +;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,6 +297,13 @@ sequential processes (CSP) concurrent programming features added.") (substitute* "../misc/cgo/testcarchive/carchive_test.go" (("#!/usr/bin/env") (string-append "#!" (which "env")))) + ;; Escape braces in test data to workaround test failure. For + ;; more information: + ;; https://github.com/golang/go/issues/20007 + ;; FIXME: remove this once we upgrade to 1.9 + (substitute* "cmd/vet/testdata/copylock_func.go" + (("struct\\{lock sync.Mutex\\}") "struct\\{lock sync.Mutex\\}")) + (substitute* "net/lookup_unix.go" (("/etc/protocols") (string-append net-base "/etc/protocols"))) (substitute* "net/port_unix.go" |