Re: [PATCH] gnu: go: Update to 1.8.1

[Petter <petter@mykolab.ch>]

[-- Attachment #1: Type: text/plain, Size: 2494 bytes --]

Hi Sergei,

I definitely think your fix deserves recognition. Without it I would 
certainly have been unable to build 1.8(.1)? this month. While editing 
the recipe is trivial mechanical wise, figuring out what to change was 
not :)

Sorry to hear about your issues; I'm on x86_64 and Linux as well 
though...

> $ /gnu/store/b4gflqj64yvksq7959r6m22mf9lzdy69-go-1.8.1/bin/go version
> go version go1.8.1 linux/amd64

Hope you'll be able to work this out!

Thanks for fixing Go 1.8 :)

Best,
Petter

On 2017-04-17 14:54, Sergei Trofimovich wrote:
> On Mon, 17 Apr 2017 14:16:06 +0200
> Petter <petter@mykolab.ch> wrote:
> 
>> Hi,
>> 
>> With this patch I'm not sure how to properly handle Copyright. I've
>> taken a guess and prepared a
>> patch anyway.
>> 
>> Here's the situation.
>> 
>> Updating to 1.8 was not trivial. A fix has been posted in a comment by
>> Sergei Trofimovich on
>> github[1]. It's a proper Guix patch, updating Go to 1.8, with the fix
>> and the trivial update stuff,
>> but as far as I can see not actually submitted to Guix.
>> 
>> [1] https://github.com/golang/go/issues/19132#issuecomment-285897612
>> 
>> After this Go 1.8.1 has been released. The attached patch has the
>> trivial update stuff for 1.8.1
>> and the fix by Sergei. I added Sergei to the Copyright section, but 
>> I'm
>> not sure if this is
>> correct, and if this is the way to do it. Also, I didn't find his 
>> e-mail
>> address, so I just added
>> his github page, in ()...
>> 
>> A little messy, please let me know if I should do something 
>> differently.
> 
> I consider the fix itself trivial thus I'm perfectly fine with not 
> being
> attributed at all. Apologies for making it hard to track me down.
> I've added one of emails to github's front page.
> 
> [ While the fix is trivial debugging was a bit more fun :) ]
> 
> If you still like to add attribution (or have other reasons) feel free
> to add "Sergei Trofimovich <slyfox@inbox.ru>"
> 
> I didn't get to submitting something that works because some unrelated
> go-1.8.0 tests failed for me.
> 
> go-1.8.1 fails in a similar way, but if it works for you
> it's very probable just my environment (x86_64-linux):
> 
> guix-master $ ./pre-inst-env guix build go-1.8
> 
>   ##### ../misc/cgo/test
>   runtime/cgo: pthread_create failed: Resource temporarily unavailable
>   scatter = 0x55ffc0
>   hello from C
>   sqrt is: 0
>   SIGABRT: abort
>   PC=0x7ffff71232c4 m=12 sigcode=18446744073709551610
> 
> Thanks for finishing go update!

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-go-Update-to-1.8.1.patch --]
[-- Type: text/x-diff; name=0001-gnu-go-Update-to-1.8.1.patch, Size: 2683 bytes --]

From ae8434c72d75f68fa25571bee72084a623661a57 Mon Sep 17 00:00:00 2001
From: Petter <petter@mykolab.ch>
Date: Mon, 17 Apr 2017 15:14:18 +0200
Subject: [PATCH] gnu: go: Update to 1.8.1.

* gnu/packages/golang.scm (go): Update to 1.8.1.
---
 gnu/packages/golang.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 00630ce06..90a809eb2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3,8 +3,9 @@
 ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
 ;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016 Petter <petter@mykolab.ch>
+;;; Copyright © 2016, 2017 Petter <petter@mykolab.ch>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2017 Sergei Trofimovich <slyfox@inbox.ru>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -197,11 +198,11 @@ garbage collection, various safety features and in the style of communicating
 sequential processes (CSP) concurrent programming features added.")
     (license license:bsd-3)))
 
-(define-public go-1.7
+(define-public go-1.8
   (package
     (inherit go-1.4)
     (name "go")
-    (version "1.7.5")
+    (version "1.8.1")
     (source
      (origin
        (method url-fetch)
@@ -209,7 +210,7 @@ sequential processes (CSP) concurrent programming features added.")
                            name version ".src.tar.gz"))
        (sha256
         (base32
-         "058q57zmi23rflingzhy1b87yl69mb62ql2psfxqr7q7l89lb0sf"))))
+         "0mqf8ydxdx1pwmrs8p8wl5y1qrplzxmxzgb6vkghy4l67z0g9nik"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.4)
        ((#:phases phases)
@@ -300,8 +301,8 @@ sequential processes (CSP) concurrent programming features added.")
                    (("/etc/services") (string-append net-base "/etc/services")))
                  (substitute* "time/zoneinfo_unix.go"
                    (("/usr/share/zoneinfo/") tzdata-path))
-                 (substitute* (find-files "cmd" "asm.c")
-                   (("/lib/ld-linux.*\\.so\\.[0-9]") loader))
+                 (substitute* (find-files "cmd" "\\.go")
+                   (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader))
                  #t)))
            (add-before 'build 'set-bootstrap-variables
              (lambda* (#:key outputs inputs #:allow-other-keys)
@@ -364,4 +365,4 @@ sequential processes (CSP) concurrent programming features added.")
      `(("go" ,go-1.4)
        ,@(package-native-inputs go-1.4)))))
 
-(define-public go go-1.7)
+(define-public go go-1.8)
-- 
2.11.1