Patchwork [1/1] Go: Update to 1.7

login
register
mail settings
Submitter Alex Griffin
Date Aug. 17, 2016, 3:54 p.m.
Message ID <1471449276.3766470.698107585.14E1C4F3@webmail.messagingengine.com>
Download mbox | patch
Permalink /patch/14709/
State New
Headers show

Comments

Alex Griffin - Aug. 17, 2016, 3:54 p.m.
On Wed, Aug 17, 2016, at 04:34 AM, Petter wrote:
> Hi,
> 
> Made an attempt to update my first package.
> 
> Hope it's good!

Hi Petter,

Thanks for contributing! Your changes work for me, but it looks like
your mail client mangled the formatting of your patch. So I produced a
good patch with your changes, and added a copyright line and commit
message for you. Hopefully that will make it easier for someone with
commit access to look it over.
Petter - Aug. 17, 2016, 5:20 p.m.
Hi Alex,

Great, thank you!


On 2016-08-17 17:54, Alex Griffin wrote:
> On Wed, Aug 17, 2016, at 04:34 AM, Petter wrote:
>> Hi,
>> 
>> Made an attempt to update my first package.
>> 
>> Hope it's good!
> 
> Hi Petter,
> 
> Thanks for contributing! Your changes work for me, but it looks like
> your mail client mangled the formatting of your patch. So I produced a
> good patch with your changes, and added a copyright line and commit
> message for you. Hopefully that will make it easier for someone with
> commit access to look it over.
Leo Famulari - Aug. 20, 2016, 12:07 a.m.
On Wed, Aug 17, 2016 at 10:54:36AM -0500, Alex Griffin wrote:
> Thanks for contributing! Your changes work for me, but it looks like
> your mail client mangled the formatting of your patch. So I produced a
> good patch with your changes, and added a copyright line and commit
> message for you. Hopefully that will make it easier for someone with
> commit access to look it over.
> 
> -- 
> Alex Griffin

> From f2f28e088f2a3f833251c2b31de7e6f531bcdf9a Mon Sep 17 00:00:00 2001
> From: Petter <petter@mykolab.ch>
> Date: Wed, 17 Aug 2016 10:27:04 -0500
> Subject: [PATCH] gnu: go: Update to 1.7.
> 
> * gnu/packages/golang.scm (go-1.6): Update to 1.7, with corresponding
>   minor changes to prebuild phase, and rename variable to...
>   (go-1.7): ...this new variable.
>   (go): Inherit from new "go-1.7".

I have a working Syncthing [0] on x86_64 with this patch.

I noticed this during the test suite:

##### ../misc/cgo/testsanitizers
skipping msan tests: -fsanitize=memory not supported
gcc: error: -fsanitize=thread linking must be done with -pie or -shared
skipping tsan tests: -fsanitizer=thread build failed

I don't know whether or not that's a problem.

[0] WIP branch:
https://github.com/lfam/guix/commits/contrib-syncthing

>  ;;; 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>

Petter, I noticed your original patch did not add a line like this.
Please confirm the name and email address you'd prefer to use.
Pseudoynms are fine.
Matthew Jordan - Aug. 20, 2016, 12:27 a.m.
Hi all,

Sorry for the late reply, this week was busy one..
I'll take a closer look at it later tonight, presumming
anyone needs me to weigh in.

On first glance it looks ok though.

Respectuflly,

Matthew Jordan.
Petter - Aug. 20, 2016, 10:20 a.m.
On 2016-08-20 02:07, Leo Famulari wrote:
> On Wed, Aug 17, 2016 at 10:54:36AM -0500, Alex Griffin wrote:
>> Thanks for contributing! Your changes work for me, but it looks like
>> your mail client mangled the formatting of your patch. So I produced a
>> good patch with your changes, and added a copyright line and commit
>> message for you. Hopefully that will make it easier for someone with
>> commit access to look it over.
>> 
>> --
>> Alex Griffin
> 
>> From f2f28e088f2a3f833251c2b31de7e6f531bcdf9a Mon Sep 17 00:00:00 2001
>> From: Petter <petter@mykolab.ch>
>> Date: Wed, 17 Aug 2016 10:27:04 -0500
>> Subject: [PATCH] gnu: go: Update to 1.7.
>> 
>> * gnu/packages/golang.scm (go-1.6): Update to 1.7, with corresponding
>>   minor changes to prebuild phase, and rename variable to...
>>   (go-1.7): ...this new variable.
>>   (go): Inherit from new "go-1.7".
> 
> I have a working Syncthing [0] on x86_64 with this patch.
> 

Good, my testing on a couple of small programs have been successful as 
well.

> I noticed this during the test suite:
> 
> ##### ../misc/cgo/testsanitizers
> skipping msan tests: -fsanitize=memory not supported
> gcc: error: -fsanitize=thread linking must be done with -pie or -shared
> skipping tsan tests: -fsanitizer=thread build failed
> 
> I don't know whether or not that's a problem.
> 

Good catch, I did not notice this.

It could be an error by the Go team, ref:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703230

I don't know though if it would be correct for us in that case to add 
-fPIC to this call if that would solve it.

> [0] WIP branch:
> https://github.com/lfam/guix/commits/contrib-syncthing
> 
>>  ;;; 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>
> 
> Petter, I noticed your original patch did not add a line like this.
> Please confirm the name and email address you'd prefer to use.
> Pseudoynms are fine.

Alex got it right, this is the name and e-mail address I want to use.
non such - Sept. 6, 2016, 9:45 a.m.
I just started working on this in my gogs-feature guix checkout, when
Petter pointed me to this patch.
Is it on someones todo inbox, or can someone commit it? The last comment
reads like go is good to go.

We'll find out about the sanitizing thing when someone with more go
knownledge runs into this I guess.

Petter <petter@mykolab.ch> writes:

> On 2016-08-20 02:07, Leo Famulari wrote:
>> On Wed, Aug 17, 2016 at 10:54:36AM -0500, Alex Griffin wrote:
>>> Thanks for contributing! Your changes work for me, but it looks like
>>> your mail client mangled the formatting of your patch. So I produced a
>>> good patch with your changes, and added a copyright line and commit
>>> message for you. Hopefully that will make it easier for someone with
>>> commit access to look it over.
>>> 
>>> --
>>> Alex Griffin
>> 
>>> From f2f28e088f2a3f833251c2b31de7e6f531bcdf9a Mon Sep 17 00:00:00 2001
>>> From: Petter <petter@mykolab.ch>
>>> Date: Wed, 17 Aug 2016 10:27:04 -0500
>>> Subject: [PATCH] gnu: go: Update to 1.7.
>>> 
>>> * gnu/packages/golang.scm (go-1.6): Update to 1.7, with corresponding
>>>   minor changes to prebuild phase, and rename variable to...
>>>   (go-1.7): ...this new variable.
>>>   (go): Inherit from new "go-1.7".
>> 
>> I have a working Syncthing [0] on x86_64 with this patch.
>> 
>
> Good, my testing on a couple of small programs have been successful as 
> well.
>
>> I noticed this during the test suite:
>> 
>> ##### ../misc/cgo/testsanitizers
>> skipping msan tests: -fsanitize=memory not supported
>> gcc: error: -fsanitize=thread linking must be done with -pie or -shared
>> skipping tsan tests: -fsanitizer=thread build failed
>> 
>> I don't know whether or not that's a problem.
>> 
>
> Good catch, I did not notice this.
>
> It could be an error by the Go team, ref:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703230
>
> I don't know though if it would be correct for us in that case to add 
> -fPIC to this call if that would solve it.
>
>> [0] WIP branch:
>> https://github.com/lfam/guix/commits/contrib-syncthing
>> 
>>>  ;;; 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>
>> 
>> Petter, I noticed your original patch did not add a line like this.
>> Please confirm the name and email address you'd prefer to use.
>> Pseudoynms are fine.
>
> Alex got it right, this is the name and e-mail address I want to use.
>
Efraim Flashner - Sept. 6, 2016, 7:14 p.m.
On Sat, Aug 20, 2016 at 12:20:30PM +0200, Petter wrote:
> On 2016-08-20 02:07, Leo Famulari wrote:
> > On Wed, Aug 17, 2016 at 10:54:36AM -0500, Alex Griffin wrote:
> > > Thanks for contributing! Your changes work for me, but it looks like
> > > your mail client mangled the formatting of your patch. So I produced a
> > > good patch with your changes, and added a copyright line and commit
> > > message for you. Hopefully that will make it easier for someone with
> > > commit access to look it over.
> > > 
> > > --
> > > Alex Griffin
> > 
> > > From f2f28e088f2a3f833251c2b31de7e6f531bcdf9a Mon Sep 17 00:00:00 2001
> > > From: Petter <petter@mykolab.ch>
> > > Date: Wed, 17 Aug 2016 10:27:04 -0500
> > > Subject: [PATCH] gnu: go: Update to 1.7.
> > > 
> > > * gnu/packages/golang.scm (go-1.6): Update to 1.7, with corresponding
> > >   minor changes to prebuild phase, and rename variable to...
> > >   (go-1.7): ...this new variable.
> > >   (go): Inherit from new "go-1.7".
> > 
> > I have a working Syncthing [0] on x86_64 with this patch.
> > 
> 
> Good, my testing on a couple of small programs have been successful as well.
> 
> > I noticed this during the test suite:
> > 
> > ##### ../misc/cgo/testsanitizers
> > skipping msan tests: -fsanitize=memory not supported
> > gcc: error: -fsanitize=thread linking must be done with -pie or -shared
> > skipping tsan tests: -fsanitizer=thread build failed
> > 
> > I don't know whether or not that's a problem.
> > 
> 
> Good catch, I did not notice this.
> 
> It could be an error by the Go team, ref:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703230
> 
> I don't know though if it would be correct for us in that case to add -fPIC
> to this call if that would solve it.
> 
> > [0] WIP branch:
> > https://github.com/lfam/guix/commits/contrib-syncthing
> > 
> > >  ;;; 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>
> > 
> > Petter, I noticed your original patch did not add a line like this.
> > Please confirm the name and email address you'd prefer to use.
> > Pseudoynms are fine.
> 
> Alex got it right, this is the name and e-mail address I want to use.
> 

Patch pushed!

Patch

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 09d962d..afa3a36 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3,6 +3,7 @@ 
 ;;; 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>
 ;;;
 ;;; This file is an addendum GNU Guix.
 ;;;
@@ -185,11 +186,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.6
+(define-public go-1.7
   (package
     (inherit go-1.4)
     (name "go")
-    (version "1.6.3")
+    (version "1.7")
     (source
      (origin
        (method url-fetch)
@@ -197,7 +198,7 @@  sequential processes (CSP) concurrent programming features added.")
                            name version ".src.tar.gz"))
        (sha256
         (base32
-         "002v6irgfd63zp9iza8nski5by0lar033j3ddpqiikw6bznsw9k3"))))
+         "1h712yd5wk5mrj2dixc9z2xlgksfks00yvglrkrgr488p8b0qs3j"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.4)
        ((#:phases phases)
@@ -216,11 +217,14 @@  sequential processes (CSP) concurrent programming features added.")
                  ;; Removing net/ tests, which fail when attempting to access
                  ;; network resources not present in the build container.
                  (for-each delete-file
-                           '("net/listen_test.go" "net/parse_test.go"))
+                           '("net/listen_test.go"
+                             "net/parse_test.go"
+                             "net/cgo_unix_test.go"))
 
                  (substitute* "os/os_test.go"
                    (("/usr/bin") (getcwd))
-                   (("/bin/pwd") (which "pwd")))
+                   (("/bin/pwd") (which "pwd"))
+                   (("/bin/sh") (which "sh")))
 
                  ;; Add libgcc to runpath
                  (substitute* "cmd/link/internal/ld/lib.go"
@@ -275,7 +279,7 @@  sequential processes (CSP) concurrent programming features added.")
 
                  ;; fix shebang for testar script
                  ;; note the target script is generated at build time.
-                 (substitute* "../misc/cgo/testcarchive/test.bash"
+                 (substitute* "../misc/cgo/testcarchive/carchive_test.go"
                    (("#!/usr/bin/env") (string-append "#!" (which "env"))))
 
                  (substitute* "net/lookup_unix.go"
@@ -336,4 +340,4 @@  sequential processes (CSP) concurrent programming features added.")
      `(("go" ,go-1.4)
        ,@(package-native-inputs go-1.4)))))
 
-(define-public go go-1.6)
+(define-public go go-1.7)