From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kFpvFAfr217hSAAA0tVLHw (envelope-from ) for ; Sat, 06 Jun 2020 19:14:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MAxtEAfr215XbgAA1q6Kng (envelope-from ) for ; Sat, 06 Jun 2020 19:14:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B5CC99404D3 for ; Sat, 6 Jun 2020 19:14:14 +0000 (UTC) Received: from localhost ([::1]:51372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheGj-0008TH-L1 for larch@yhetil.org; Sat, 06 Jun 2020 15:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheGZ-0008Qy-Em for guix-patches@gnu.org; Sat, 06 Jun 2020 15:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jheGY-0004E5-JQ for guix-patches@gnu.org; Sat, 06 Jun 2020 15:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jheGY-00022r-E9 for guix-patches@gnu.org; Sat, 06 Jun 2020 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41695] [PATCH] Update Go to v1.14.4 Resent-From: Katherine Cox-Buday Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Jun 2020 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jack Hill Cc: 41695@debbugs.gnu.org Received: via spool by 41695-submit@debbugs.gnu.org id=B41695.15914708317837 (code B ref 41695); Sat, 06 Jun 2020 19:14:02 +0000 Received: (at 41695) by debbugs.gnu.org; 6 Jun 2020 19:13:51 +0000 Received: from localhost ([127.0.0.1]:52514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jheGD-000222-3T for submit@debbugs.gnu.org; Sat, 06 Jun 2020 15:13:51 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:38662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jheGA-00021i-PR for 41695@debbugs.gnu.org; Sat, 06 Jun 2020 15:13:39 -0400 Received: by mail-io1-f68.google.com with SMTP id w18so5390485iom.5 for <41695@debbugs.gnu.org>; Sat, 06 Jun 2020 12:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=d89VBAyJxos+UlHY6cXoys9iSzKP6RGy5u7YnFidE9Y=; b=sA+mI6nwIhxOGITtzWpoS16rQcJUJUD+HLOM3N3V5KUx9QlezkwZTIO94koaQ1nkdZ aVVkd3eS1SIdsqkoJUI/H8MBL6wG0RHx+GBMEIjaO9PIXvTCIQSrBnMKNHzKECCkGUbH /a77Sme1XJVKwZkPV1IiXrnaxFnMaT1hM9KKov942rN0Vf8GIMEHDo8/oOTtaFUHovPN YR20t7fKGX0kqEXUOeKRSIDW2cKyhx2CvAnw2qH4IxZkIBIpFEO15So30Vou8nC3WquR wgrGF06Y4qIThCLNPIBGk81TpWqEHKa9mZDIwAJL7WDacashkZBf/FilkueawkvbfOCm aovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=d89VBAyJxos+UlHY6cXoys9iSzKP6RGy5u7YnFidE9Y=; b=FI/fN7/VwetMNr0Ah2+Z0ppShL8PfqYDmVVqOmioTA2MCW+0fONouhUbk+O6paHw5X s5ROrkqkZ7GWC60dZ1eeLQg/TJMm1lC49dOqV1s+qrcWZEJJwau9JrCuRXLYyJJ589n8 5yHKgsggBJOX16OTgup3xnrvQuonIW7bx3cUSr41IVS2bhV5NkIMubItOQr7DaqnVRxR smBunt7hH795GthbOcySL6HbpAmuudWhaOjCCIFaZPjTXaeKsLDzC73eIKLzJ0ez9Gi4 xq84KbPFUdKnxqEApzhDpibca/EahIkVrU6TYbOw3ZvxwWSgd4Bfnr4AMTsrTOYC61eb gekw== X-Gm-Message-State: AOAM533IXWnbXgZFYlAx82RJ/36NrH7Tkka36hdLzdH47TGWdNUBz855 9yvNh3G4up+NGKlCRs1dIKBrBww6 X-Google-Smtp-Source: ABdhPJxoK+EKRrj4quqCpqg7CT4Lpqm88FH54KBstFHKWW9YBJW3nsWkzzcKola4540LcGskPUgGXQ== X-Received: by 2002:a02:6a1a:: with SMTP id l26mr14528882jac.66.1591470812719; Sat, 06 Jun 2020 12:13:32 -0700 (PDT) Received: from gazelle-pro (172-221-246-205.res.spectrum.com. [172.221.246.205]) by smtp.gmail.com with ESMTPSA id p15sm5019850ilj.15.2020.06.06.12.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jun 2020 12:13:31 -0700 (PDT) From: Katherine Cox-Buday References: Date: Sat, 06 Jun 2020 14:13:29 -0500 In-Reply-To: (Jack Hill's message of "Fri, 5 Jun 2020 17:07:03 -0400 (EDT)") Message-ID: <87d06c0zza.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.0 (++) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 1.0 (+) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=sA+mI6nw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: Sm0A8bnjAkLD --=-=-= Content-Type: text/plain Jack Hill writes: > Katherine, > > On Wed, 3 Jun 2020, Katherine Cox-Buday wrote: > >> There are too many dependent Go packages to test, but I compiled >> syncthing which should be a reasonably representative test. > > Thanks for working on updating Go. > > I have rebuilt all the packages reported by `guix refresh -l go`. The > three failures were stress-make, which was already broken (build log > attached), mongodb-tools, which was already broken [0], and docker > (build log attached). You're welcome! Thanks for the review. I wish I had more time to contribute to Guix. I suppose I should have qualified my statement by saying there's too many dependent Go packages for me to test. I should invest in a better computer :) > Reading through the Go release notes [1], the following change to the > net/url package caught my eye: > >> When parsing of a URL fails (for example by Parse or >> ParseRequestURI), the resulting Error message will now quote the >> unparsable URL. This provides clearer structure and consistency with >> other parsing errors. > > I think this could be the cause of the docker test failure. Should we > patch docker or perhaps try to update it? Spot on! I've updated docker and docker-cli. hyperledger-fabric depends on docker-cli and also continues to build. I've attached a patch which should supersede the prior patch. It updates go, docker, and docker-cli atomically. > Another item from the release notes about changes to the Go runtime: > >> A consequence of the implementation of preemption is that on Unix >> systems, including Linux and macOS systems, programs built with Go >> 1.14 will receive more signals than programs built with earlier >> releases. This means that programs that use packages like syscall or >> golang.org/x/sys/unix will see more slow system calls fail with >> EINTR errors. Those programs will have to handle those errors in >> some way, most likely looping to try the system call again. For more >> information about this see man 7 signal for Linux systems or similar >> documentation for other systems. > > I didn't notice any problems caused by this during package rebuilds > and testing, but it sounds like something that could be difficult to > write automated tests for, so we should probably be on the lookout for > future problems at runtime. Agreed. > I'm happy to see that that the go modules changes didn't cause us any > problems with this upgrade. I believe 1.14 represents a stabilization of the modules feature, so I would expect future updates to go smoothly as well. > I am curious, why switch to using git-fetch? `guix lint` now complains about downloading tarballs. I have also recently seen some chatter on the mailing list about preferring this. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-go-Update-to-1.14.4.patch Content-Transfer-Encoding: quoted-printable >From 600f60e78a19eefc3ea1bf518d658fc8fc47fb36 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Wed, 3 Jun 2020 18:31:00 -0500 Subject: [PATCH] gnu: go: Update to 1.14.4. * gnu/packages/golang.scm (go): Update to 1.14.4. * gnu/packages/docker.scm (docker, docker-cli): Update to 19.03.11. --- gnu/packages/docker.scm | 19 ++++++++++++++++--- gnu/packages/golang.scm | 27 +++++++++++++++++---------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index aeb43a6393..3dd706cbe9 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Michael Rohleder +;;; Copyright =C2=A9 2020 Katherine Cox-Buday ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,7 +48,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) =20 -(define %docker-version "19.03.9") +(define %docker-version "19.03.11") =20 (define-public python-docker-py (package @@ -314,7 +315,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a9hkprkix5d7lqi88r8svvfpzh1qbzw9nrkp11lxrcf9wdan4hg")) + (base32 "1pmbggxbazipl24hxiaccbj32379zv79xba76l78v5131ihx922h")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -390,6 +391,17 @@ built-in registry server of Docker.") (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/x= z"))) + ;; TODO: Remove when Docker proper uses v1.14.x to build + (substitute* "registry/resumable/resumablerequestreader_test.= go" + (("I%27m%20not%20an%20url" all) + (string-append "\"" all "\""))) + ;; TODO: Remove when Docker proper uses v1.14.x to build + (substitute* "vendor/gotest.tools/x/subtest/context.go" + (("func \\(tc \\*testcase\\) Cleanup\\(" all) + (string-append all "func()")) + (("tc\\.Cleanup\\(" all) + (string-append all "nil"))) + (let ((source-files (filter (lambda (name) (not (string-contains name "tes= t"))) (find-files "." "\\.go$")))) @@ -488,6 +500,7 @@ built-in registry server of Docker.") ;; Timeouts after 5 min. (delete-file "plugin/manager_linux_test.go") ;; Operation not permitted. + (delete-file "daemon/graphdriver/aufs/aufs_test.go") (delete-file "daemon/graphdriver/btrfs/btrfs_test.go") (delete-file "daemon/graphdriver/overlay/overlay_test.go") (delete-file "daemon/graphdriver/overlay2/overlay_test.go") @@ -592,7 +605,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1599ff7699p3m925rdyfg7gl3cga6gy0lli7qh2ybyiw2kwf4gj9")))) + (base32 "1y9ymv70r1hndblr64h19q34arxl2f3dqqi2qcrai5zfimcml6lr")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ae0b7c6779..94fadd3302 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,7 +12,7 @@ ;;; Copyright =C2=A9 2018 Tom=C3=A1=C5=A1 =C4=8Cech ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; Copyright =C2=A9 2018 Pierre Neidhardt -;;; Copyright @ 2018, 2019 Katherine Cox-Buday +;;; Copyright @ 2018, 2019, 2020 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo ;;; Copyright @ 2019, 2020 Alex Griffin ;;; Copyright =C2=A9 2019, 2020 Arun Isaac @@ -217,19 +217,21 @@ in the style of communicating sequential processes (@= dfn{CSP}).") (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch6= 4-linux")) (license license:bsd-3))) =20 -(define-public go-1.13 +(define-public go-1.14 (package (inherit go-1.4) (name "go") - (version "1.13.9") + (version "1.14.4") (source (origin - (method url-fetch) - (uri (string-append "https://storage.googleapis.com/golang/" - name version ".src.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go.git") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "07gksk9194wa90xyd6yhagxfv7syvsx29bh8ypc4mg700vc1kfrl")))) + "08bazglmqp123c9dgrxflvxd011xsqfxsgah2kzbvca0mhm6qcm3")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) @@ -260,7 +262,13 @@ in the style of communicating sequential processes (@d= fn{CSP}).") '("cmd/go/testdata/script/mod_case_cgo.txt" "cmd/go/testdata/script/list_find.txt" "cmd/go/testdata/script/list_compiled_imports.txt" - "cmd/go/testdata/script/cgo_syso_issue29253.txt")) + "cmd/go/testdata/script/cgo_syso_issue29253.txt" + "cmd/go/testdata/script/cover_cgo.txt" + "cmd/go/testdata/script/cover_cgo_xtest.txt" + "cmd/go/testdata/script/cover_cgo_extra_test.txt" + "cmd/go/testdata/script/cover_cgo_extra_file.txt")) + + (for-each make-file-writable (find-files ".")) =20 (substitute* "os/os_test.go" (("/usr/bin") (getcwd)) @@ -359,7 +367,6 @@ in the style of communicating sequential processes (@df= n{CSP}).") (setenv "GOROOT_FINAL" output) (setenv "CGO_ENABLED" "1") (invoke "sh" "all.bash")))) - (replace 'install ;; TODO: Most of this could be factorized with Go 1.4. (lambda* (#:key outputs #:allow-other-keys) @@ -405,7 +412,7 @@ in the style of communicating sequential processes (@df= n{CSP}).") ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) =20 -(define-public go go-1.13) +(define-public go go-1.14) =20 (define-public go-github-com-alsm-ioprogress (let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5") --=20 2.26.2 --=-=-= Content-Type: text/plain -- Katherine --=-=-=--