unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: go: Update to 1.8.1
@ 2017-04-17 12:16 Petter
  2017-04-17 12:52 ` Tobias Geerinckx-Rice
  2017-04-17 12:54 ` Sergei Trofimovich
  0 siblings, 2 replies; 9+ messages in thread
From: Petter @ 2017-04-17 12:16 UTC (permalink / raw)
  To: guix-devel

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

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.

Best,
Petter

[-- 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: 2692 bytes --]

From 9b24372fc95ac32e774bbaa1c5219b771fcd1cda Mon Sep 17 00:00:00 2001
From: Petter <petter@mykolab.ch>
Date: Mon, 17 Apr 2017 13:36:16 +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..1864f780a 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 (https://github.com/trofi)
 ;;;
 ;;; 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


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2017-04-22 17:39 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-17 12:16 [PATCH] gnu: go: Update to 1.8.1 Petter
2017-04-17 12:52 ` Tobias Geerinckx-Rice
2017-04-17 12:54 ` Sergei Trofimovich
2017-04-17 13:37   ` Petter
2017-04-17 17:18     ` Leo Famulari
2017-04-17 17:55       ` Petter
2017-04-17 18:18         ` Leo Famulari
2017-04-17 18:28           ` Petter
2017-04-22 17:39     ` Sergei Trofimovich

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).