From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: go: Update to 1.8.1 Date: Mon, 17 Apr 2017 13:18:22 -0400 Message-ID: <20170417171822.GA8224@jasmine> References: <7f4cf1ee6c558899e8c9457102c2e0d4@mykolab.ch> <20170417135418.0bf12c87@sf> <1e60418d89b070a52d90ef4b3f08eba3@mykolab.ch> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4SFOXa2GPu3tIq4H" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0AII-0008Dm-BW for guix-devel@gnu.org; Mon, 17 Apr 2017 13:18:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0AIF-0008EZ-3Q for guix-devel@gnu.org; Mon, 17 Apr 2017 13:18:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60745) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0AIE-0008Di-SO for guix-devel@gnu.org; Mon, 17 Apr 2017 13:18:27 -0400 Content-Disposition: inline In-Reply-To: <1e60418d89b070a52d90ef4b3f08eba3@mykolab.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Petter Cc: guix-devel@gnu.org --4SFOXa2GPu3tIq4H Content-Type: multipart/mixed; boundary="jRHKVT23PllUwdXP" Content-Disposition: inline --jRHKVT23PllUwdXP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 17, 2017 at 03:37:49PM +0200, Petter wrote: > Hi Sergei, >=20 > 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 :) >=20 > Sorry to hear about your issues; I'm on x86_64 and Linux as well though... >=20 > > $ /gnu/store/b4gflqj64yvksq7959r6m22mf9lzdy69-go-1.8.1/bin/go version > > go version go1.8.1 linux/amd64 >=20 > Hope you'll be able to work this out! >=20 > 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 fea= tures added.") > (("/etc/services") (string-append net-base "/etc/serv= ices"))) > (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. --jRHKVT23PllUwdXP Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-go-Update-to-1.8.1.patch" Content-Transfer-Encoding: quoted-printable =46rom c64da0b22a602302d9262b7e76ce7a95bee97f95 Mon Sep 17 00:00:00 2001 =46rom: Petter 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 =A9 2016 Matthew Jordan ;;; Copyright =A9 2016 Andy Wingo ;;; Copyright =A9 2016 Ludovic Court=E8s -;;; Copyright =A9 2016 Petter +;;; Copyright =A9 2016, 2017 Petter ;;; Copyright =A9 2016, 2017 Leo Famulari +;;; Copyright =A9 2017 Sergei Trofimovich ;;; ;;; This file is part of GNU Guix. ;;; @@ -197,11 +198,11 @@ garbage collection, various safety features and in th= e style of communicating sequential processes (CSP) concurrent programming features added.") (license license:bsd-3))) =20 -(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 featu= res 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 featu= res 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 featu= res added.") `(("go" ,go-1.4) ,@(package-native-inputs go-1.4))))) =20 -(define-public go go-1.7) +(define-public go go-1.8) --=20 2.12.2 --jRHKVT23PllUwdXP-- --4SFOXa2GPu3tIq4H Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlj0+NgACgkQJkb6MLrK fwiiWA//cEqjGUEvqvu6Ce0Rs5r+14M5ZcYVd+WkntSTDNHDYj6ZAuH2kz/vpJRY SA2FpfnSS7Fo85rb3/Cl1KmPp+ru2AJfTcEOWBjOZ/BYX3b48JTL45QdjHXab7DM 8cBZ2DL2cZhBgImTWV2/Y007qPf5rzETUT7y9ZyyNqkfBnMQbNi4XYbAR2qmoP+K kDlxAEOTt7kytniG/pbUxmD8xPdhYOcgLOnhSf/c91ZBSeSNhiOMCMgKPsPfJ8Et 2AousJY6JG6KJv7OAXDm5D7pOJyFlGdm6E4qmN7zZJGfK7tdiVlUC88ql7erkQ1C 81KbtZU45PVNZX0I1z8PIV8Wloqjwa4Jj/qUsMY54q7Er+cde8JWeaMVClTrg2lV DaPpODYFvmVlvg6npbQ1q8WJEGWmUv5ySDo+Vp9fsAcLfgbrDoJlhR6olbj9EMbN BSlpYbACoaUiq+4pAhEmGtQ3fV+AfRbj51jHiNfL0MXKmUwfFRhdb9lJYH+Br7AZ XlCgk0cj+VMywNLyYETeII4jcfPuAqZa/shQ8wMzGxGRTr2+XKblplbnFWY9r0dn JKyCR+fVGSGLAr9ADG1jhNmbrXG0unaE6iHyJWRXn0X+VG0Vl1ADTxc4aPtNI+dH 8K59WSJcRR1DoNdzcwOY9hrD4b+1i50Ezuz+AO3MoyBTsKwJxcI= =VofI -----END PGP SIGNATURE----- --4SFOXa2GPu3tIq4H--