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

[Leo Famulari <leo@famulari.name>]

[-- Attachment #1.1: Type: text/plain, Size: 1400 bytes --]

On Mon, Apr 17, 2017 at 03:37:49PM +0200, Petter wrote:
> 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 :)

Yes, thanks to both of you for picking this up :)

> @@ -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))

The substitution that is removed here would still patch some files.
Shouldn't we adjust the old substitution to also match '/lib64', as well
as add the new substitution?

I've attached a patch for that.

[-- Attachment #1.2: 0001-gnu-go-Update-to-1.8.1.patch --]
[-- Type: text/plain, Size: 2839 bytes --]

From c64da0b22a602302d9262b7e76ce7a95bee97f95 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-1.7): Replace with ...
(go-1.8): New variable.
[arguments]: Modify substitutions in 'prebuild' phase.
(go): Update to go-1.8.
---
 gnu/packages/golang.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 00630ce06..f84622bae 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)
@@ -301,7 +302,9 @@ sequential processes (CSP) concurrent programming features added.")
                  (substitute* "time/zoneinfo_unix.go"
                    (("/usr/share/zoneinfo/") tzdata-path))
                  (substitute* (find-files "cmd" "asm.c")
-                   (("/lib/ld-linux.*\\.so\\.[0-9]") loader))
+                   (("/lib(64)?/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 +367,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.12.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]