From patchwork Sat Apr 20 19:41:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 12172 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F47C16ED2; Sat, 20 Apr 2019 20:53:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E539216E94 for ; Sat, 20 Apr 2019 20:53:41 +0100 (BST) Received: from localhost ([127.0.0.1]:44822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHw3R-0006He-9V for patchwork@mira.cbaines.net; Sat, 20 Apr 2019 15:53:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHw2q-0005rX-3w for guix-patches@gnu.org; Sat, 20 Apr 2019 15:53:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHw2o-0007d0-OZ for guix-patches@gnu.org; Sat, 20 Apr 2019 15:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHw2o-0007cu-LL for guix-patches@gnu.org; Sat, 20 Apr 2019 15:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHw2o-0002xR-GN for guix-patches@gnu.org; Sat, 20 Apr 2019 15:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35348] [PATCH] gnu: go@1.4: Update to 1.4-bootstrap-20171003. Resent-From: "Alex Griffin" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 19:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35348@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155578994211314 (code B ref -1); Sat, 20 Apr 2019 19:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Apr 2019 19:52:22 +0000 Received: from localhost ([127.0.0.1]:46805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHw29-0002wQ-OQ for submit@debbugs.gnu.org; Sat, 20 Apr 2019 15:52:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHw28-0002vy-5K for submit@debbugs.gnu.org; Sat, 20 Apr 2019 15:52:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:60920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHw22-0007MR-SX for submit@debbugs.gnu.org; Sat, 20 Apr 2019 15:52:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHw21-0005L4-LA for guix-patches@gnu.org; Sat, 20 Apr 2019 15:52:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHvs7-0004O7-51 for guix-patches@gnu.org; Sat, 20 Apr 2019 15:42:00 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:35775) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHvs6-0004Nh-JG for guix-patches@gnu.org; Sat, 20 Apr 2019 15:41:59 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id DB4B8807 for ; Sat, 20 Apr 2019 15:41:56 -0400 (EDT) Received: from imap1 ([10.202.2.51]) by compute6.internal (MEProxy); Sat, 20 Apr 2019 15:41:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; h= mime-version:message-id:date:from:to:subject:content-type; s= fm2; bh=PNguDjzrnW4hRh+wlphEI6YROjjbEl+xcoi0D2a9gyE=; b=GZubGNva U4NHAuEYlkMXmz6t5T7Rhv83N6BygTESiiUCoYbyek91ac4B7n+XGLMhmBYmlL1/ jk86aVGz5b7k25bpnBOjz0RvGTwC4+naet6UCjeIfA6KLiXAvq/tr1UQi+gMFe4W M+eQK6zc8G2HVA4uOLwcI7ynrlWYgb4CaMefRI7RtpgLTp/3PBmMYoE2fnjMqUmn GF2jO/AYA2Uo3B2L/QbuffXZ1Q2no8gjO+is+A+vvTcwM9brw0DirHCw4fDFdMQ6 zbf9GFdg+9S4c8rbTDQRdUeZJb/AQWG4YAphzuCqhUQqevhk5QH96K5bNOveOxy7 JqsSvY58CfS5qQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=PNguDjzrnW4hRh+wlphEI6YROjjbE l+xcoi0D2a9gyE=; b=rHkTdzcf371tijKVSsTkzNW/BrpJw/991/8IRHN9wAtCk 5uQ5/4BmD3HZNDj7Tv53sKEFehA50m3Ob+1iHXs+rwUoZnG2BAFTbF43b/0E/Mxz MDtUQbnQgy1qDLs89ylGBIlff6D7J6NQ4Vi6nRYW16ZCi+ZySUkMmsCuh3YAorX2 a4pDXPYRAVYon4HywukvDKt1fgM+j3g7jQV8s3219AQnFBWNO2uvwHMQM6iKqtby HNr8/7CwuBg+T/nubIagJ6+uAq2RlwJbSd519fgdufNFhQSqEIJMU8f67+ML5dsf G9Q5SVqpdTyemO45h8Y4eAatZqXazJ3RLH8mRjmwQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrgedugdehkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkfffhvffutgesmhdtreerre ertdenucfhrhhomhepfdetlhgvgicuifhrihhffhhinhdfuceorgesrghjghhrfhdrtgho mheqnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrsegrjhhgrhhfrdgtohhmnecuvehluh hsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 0C741D48E2; Sat, 20 Apr 2019 15:41:56 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-443-g918f9d3-fmstable-20190416v3 Mime-Version: 1.0 X-Me-Personality: 27775493 Message-Id: <6d838647-e07c-4713-a5a4-c43ec57cf526@www.fastmail.com> Date: Sat, 20 Apr 2019 15:41:34 -0400 From: "Alex Griffin" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The Go bootstrap compiler in Guix currently includes a couple unnecessary workarounds for bugs which have already been fixed. This patch switches to using the bootstrap branch which is still maintained upstream. From 4d784a54e5736d2eaeac2a6e9ed14c7d11598705 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 20 Apr 2019 14:01:17 -0500 Subject: [PATCH] gnu: go@1.4: Update to 1.4-bootstrap-20171003. * gnu/packages/golang.scm (go-1.4): Use the bootstrap branch that is still support upstream. [version]: Update to 1.4-bootstrap-20171003. [arguments]: Remove fix to timezone test which is now included upstream. Don't manually disable CGO because it is disabled by default. Manually enable test suite because future releases will disable tests by default. --- gnu/packages/golang.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0b44bd3d02..3bd1c3eb8f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo +;;; Copyright @ 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,14 +62,14 @@ (define-public go-1.4 (package (name "go") - (version "1.4.3") + (version "1.4-bootstrap-20171003") (source (origin (method url-fetch) (uri (string-append "https://storage.googleapis.com/golang/" - name version ".src.tar.gz")) + name version ".tar.gz")) (sha256 (base32 - "0na9yqilzpvq0bjndbibfp07wr796gf252y471cip10bbdqgqiwr")))) + "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl")))) (build-system gnu-build-system) (outputs '("out" "doc" @@ -135,13 +136,6 @@ ("os/os_test.go" "(.+)(TestHostname.+)") ("time/format_test.go" "(.+)(TestParseInSydney.+)") - ;; Tzdata 2016g changed the name of the time zone used in this - ;; test, and the patch for Go 1.7 does not work for 1.4.3: - ;; https://github.com/golang/go/issues/17545 - ;; https://github.com/golang/go/issues/17276 - ("time/time_test.go" "(.+)(TestLoadFixed.+)") - ("time/format_test.go" "(.+)(TestParseInLocation.+)") - ("os/exec/exec_test.go" "(.+)(TestEcho.+)") ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") @@ -168,9 +162,7 @@ (setenv "GOOS" "linux") (setenv "GOROOT" (dirname (getcwd))) (setenv "GOROOT_FINAL" output) - ;; Go 1.4's cgo will not work with binutils >= 2.27: - ;; https://github.com/golang/go/issues/16906 - (setenv "CGO_ENABLED" "0") + (setenv "GO14TESTS" "1") (invoke "sh" "all.bash")))) (replace 'install -- 2.20.1