From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 06:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162460399116965 (code B ref -1); Fri, 25 Jun 2021 06:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jun 2021 06:53:11 +0000 Received: from localhost ([127.0.0.1]:44688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwfiA-0004PZ-SQ for submit@debbugs.gnu.org; Fri, 25 Jun 2021 02:53:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:60576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwfi8-0004PR-O3 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 02:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwfi8-0005Ko-D0 for guix-patches@gnu.org; Fri, 25 Jun 2021 02:53:08 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:52528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwfi4-0000zI-Bj for guix-patches@gnu.org; Fri, 25 Jun 2021 02:53:08 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624603978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=EWpFjkI9A4KWAUsSvbMj9qsDbRsuH/jG6fxJagTZDv4=; b=UbFQPwaBuRzfOYU/RoaFG63sbtx5jL/jr3FBF5oWdy1mUk6FFk1184hOQCDjWRCY68NfLO V/pdqoGUe0ows1FEDuX5UwveWAEIUnQ/oeM0HyHUB1ryzjjVr3pvsFXG7retDRKAzBg9Dn GvGpNpi/Cog6tTz8Dxek0kXu6bjVtAQ= From: Sarah Morgensen Date: Thu, 24 Jun 2021 23:52:55 -0700 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello Guix, This patch adds go 1.16, but does *not* make it the default for other packages which use go (as suggested in [2]). There have been a lot of changes between 1.14 and 1.16, and while I have fixed many issues, I am sure continued testing will uncover many more. This patch is based on [0], which adds gccgo-10. With this patch, go automatically bootstraps from gccgo[0][1] on platforms not supported by go 1.4, but you can do so on any platform with: guix build go --with-input=go@1.4-bootstrap-20171003=gccgo@10 Additionally, to build packages with 1.16: guix build --with-input=go@1.14=go@1.16 I would appreciate testing and feedback on the new bootstrap process, especially from powerpc64le users, as I have only been able to test on x86-64. (Note that it took about two hours for gccgo to build and 30 minutes for gccgo to build go.) Changes from 1.14: * Bootstrap with gccgo on platforms which do not support go 1.4 (see above) * Use GO_LDSO to set the interpreter rather than patching files * Fix typo in cgoldflags patch ("-rpath=" > "-Wl,-rpath=") * Fix and re-enable some cgo/gccgo tests * Remove references to perl (used for tests) to reduce closure size by 10% * Set GOCACHE so go doesn't complain that it can't access it $HOME * Break out tests into "check" phase so builders have more control I have successfully built and tested most go packages on x86-64, including restic, syncthing, chezmoi, and exercism. However... docker does not pass tests. It should probably be updated to 20.10, but it is a very complicated package and I do not have the skill to do so. I attempted to backport some of the fixes, but that was also beyond my abilities. Perhaps someone else will rise to the challenge? :) Sarah [0] [PATCH 0/1] gnu: Add gccgo-10. [1] Build go with gccgo [2] [PATCH] Added Go 1.16.2 Sarah Morgensen (13): gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0. gnu: go-go-uber-org-atomic: Update to 1.8.0. gnu: go-github-com-sergi-go-diff: Update to 1.2.0. gnu: go-github-com-pelletier-go-toml: Update to 1.9.3. gnu: go-github-com-masterminds-goutils: Update to 1.1.1. gnu: go-github-com-magiconair-properties: Update to 1.8.5. gnu: go-github-com-dlclark-regexp2: Update to 1.4.0. gnu: earlyoom: Patch tests for go-1.16. gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16. gnu: restic: Patch tests for go-1.16. gnu: go-gopkg-in-check-v1: Update to latest. gnu: go-etcd-io-bbolt: Update to 1.3.6. gnu: Add go-1.16. gnu/local.mk | 4 + gnu/packages/backup.scm | 5 +- gnu/packages/golang.scm | 243 +++++++++++++++--- gnu/packages/linux.scm | 4 +- .../earlyoom-1.6.2-disable-go-module.patch | 17 ++ .../patches/go-fix-script-tests.patch | 18 ++ ...m-bmatcuk-doublestar-1.3-remove-test.patch | 15 ++ .../restic-0.9.6-fix-tests-for-go1.15.patch | 51 ++++ 8 files changed, 314 insertions(+), 43 deletions(-) create mode 100644 gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch create mode 100644 gnu/packages/patches/go-fix-script-tests.patch create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch create mode 100644 gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch base-commit: c7804cd97b28ef012acc20c1d861904e9592382b prerequisite-patch-id: edb56de17ac3cce58402c83a9671b00381dfee76 -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 01/13] gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460567619733 (code B ref 49221); Fri, 25 Jun 2021 07:22:02 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:16 +0000 Received: from localhost ([127.0.0.1]:44706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9L-00058D-Mk for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:15 -0400 Received: from out2.migadu.com ([188.165.223.204]:12001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9H-00057t-6K for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:14 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r/UT+n41QCd0yN39JKL7LqpEhQsMPBWUy5vwZ3KsUus=; b=bCK+IYX37P2kXzBZGXRMy6JoPL48WmrAxGoFfn7DJD0xbE9f/SS/w6lHNSRPaG8wzK/nGi hWX3aTQte7WiJOjd8a/eeqGm+wZrIDmgNte2bV1+kMQpktm/mHazlz7DmFQ4UhAneVvji0 fp/SBJ2IHIqJV47RaKDJI8Za6pSuw9I= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:20:54 -0700 Message-Id: <8f3694da5501c292517f77d16ff327fecdf8636a.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang.scm (go-github-com-puerkitobio-goquery): Update to 1.7.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1d17f02cdd..c08c3cd821 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5518,7 +5518,7 @@ the parse trees produced by the html package.") (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") - (version "1.5.1") + (version "1.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -5527,7 +5527,7 @@ the parse trees produced by the html package.") (file-name (git-file-name name version)) (sha256 (base32 - "08nf88cg663slzqr51k2jxlm1krnh86nrzwbk6v41ccq5jkfm7fx")))) + "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc")))) (build-system go-build-system) (arguments `(#:import-path "github.com/PuerkitoBio/goquery")) -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 02/13] gnu: go-go-uber-org-atomic: Update to 1.8.0. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460567919758 (code B ref 49221); Fri, 25 Jun 2021 07:22:02 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:19 +0000 Received: from localhost ([127.0.0.1]:44710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9O-00058b-U8 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:19 -0400 Received: from out2.migadu.com ([188.165.223.204]:12008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9H-00057v-U2 for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:14 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RQLuCy9DrNRupL1c7+5CnfcuPIYsk471XHxG3pqJP44=; b=fgkT8VF4omXF+WAL1Q8PJAYLDtHJ9zZOHTOXC/UBHqWTx9fk0QSaa8zwUxOdeyokn4XoMg 7hGiGnO29TMOsmt5jYgyVbZo8owzulPioGeR0SRcpII6UREQBuDddMLhK6k+Uo7dJm/EYf ZPiksZ1Ju+i+YAsULPb3/YvaPMMZRCw= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:20:55 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang.scm (go-go-uber-org-atomic): Update to 1.8.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c08c3cd821..e9c8969263 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6894,7 +6894,7 @@ programs that use traditional command lines.") (define-public go-go-uber-org-atomic (package (name "go-go-uber-org-atomic") - (version "1.7.0") + (version "1.8.0") (source (origin (method git-fetch) @@ -6903,7 +6903,7 @@ programs that use traditional command lines.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0yxvb5sixh76cl9j8dpa97gznj0p8pmg2cdw0ypfwhd3ipx9wph1")))) + (base32 "0grswsk7nkf7zmmychf6aj6032shyag1kgs6zf7qwxyn55dym1v8")))) (build-system go-build-system) (arguments '(#:import-path "go.uber.org/atomic")) -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 04/13] gnu: go-github-com-pelletier-go-toml: Update to 1.9.3. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460567919767 (code B ref 49221); Fri, 25 Jun 2021 07:22:03 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:19 +0000 Received: from localhost ([127.0.0.1]:44712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9P-00058d-9D for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:19 -0400 Received: from out2.migadu.com ([188.165.223.204]:12021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9L-00058C-Pw for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:16 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T5LN9yGCzYT0Oz/Yqf74XEHmFtQCTq7ZvzRZ1oxVN6g=; b=EEdWW9D55V2d2rkNo2UVJMniIJ5KTRjz+yBS00SXmptXuRki+Si4MrUuhGFcT2Iw+dCicG E8FJazQnGmMGNd3XTxVteV+T+j7y1lkoW7HILGyoMafdKzus+QKQ6CfKVD3Dk4XGbYgmzb uCPsPefAUnVw1L1eNDiiW3aMnyD4sKY= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:20:57 -0700 Message-Id: <71692884fbcab382d73b65f1f83633ec8d5b9af1.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang.scm (go-github-com-pelletier-go-toml): Update to 1.9.3. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f4f31b2943..9c9543e059 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2050,7 +2050,7 @@ application's http.Handlers.") (define-public go-github-com-pelletier-go-toml (package (name "go-github-com-pelletier-go-toml") - (version "1.8.0") + (version "1.9.3") (source (origin (method git-fetch) @@ -2060,7 +2060,7 @@ application's http.Handlers.") (file-name (git-file-name name version)) (sha256 (base32 - "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y")))) + "0cqwnvlgs1wgdgjxlwv8j52f7d6syniadr51sjh2fya99m5wzvsn")))) (build-system go-build-system) (arguments `(#:import-path "github.com/pelletier/go-toml")) -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 03/13] gnu: go-github-com-sergi-go-diff: Update to 1.2.0. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460568319787 (code B ref 49221); Fri, 25 Jun 2021 07:22:03 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:23 +0000 Received: from localhost ([127.0.0.1]:44714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9P-00058m-Il for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:22 -0400 Received: from out0.migadu.com ([94.23.1.103]:54499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9L-00057y-40 for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:18 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o/H6lcOhDVYLVEiXCwtkz39R4bMESBAGXdA9xRUWuzE=; b=UfWYm1nJ5SEf0YNYcwXivTeuyLbCsusucMnDYHuztF7EwvAsVhpC4GiH/dfWfPH2tUjoJT 4h5qtkt7ZJk6wp5kV2NV1zRITmklIqsXk7PpOCNqAhgRze+UMo4LbdTYcW5FXI9G9rCixa 7hFgnF4t2WdXzUJ0snFvCde0MFxLUh8= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:20:56 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/golang.scm (go-github-com-sergi-go-diff): Update to 1.2.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e9c8969263..f4f31b2943 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5402,7 +5402,7 @@ can be used almost directly in Go source code.") (define-public go-github-com-sergi-go-diff (package (name "go-github-com-sergi-go-diff") - (version "1.1.0") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -5411,7 +5411,7 @@ can be used almost directly in Go source code.") (file-name (git-file-name name version)) (sha256 (base32 - "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2")))) + "0cbj8nshllq102iiav0k1s01b8gwbkzj674g71n938qqna32y2pa")))) (build-system go-build-system) (arguments `(#:import-path "github.com/sergi/go-diff/diffmatchpatch" -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 05/13] gnu: go-github-com-masterminds-goutils: Update to 1.1.1. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460568819821 (code B ref 49221); Fri, 25 Jun 2021 07:22:03 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:28 +0000 Received: from localhost ([127.0.0.1]:44721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9X-00059c-Tm for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:28 -0400 Received: from out1.migadu.com ([91.121.223.63]:30532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9O-00058U-Pr for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:20 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tGvac2l+13OG2BebjOtLWCOuUmahHdLaLDXnXQHjTqs=; b=CAmBqk60O3bdo60pR+9s7I26x/TzwSMtm561zSIddJYSYJLRr8d/PUBj9ksz/O15qGIV0I BQ0VAMmoc+WJRP6IlYsLWxR1gl9mWAAsfZ4EoFTk+X7CehJD/pEd6HzEr9Hjp8VL9df240 U9Y806h+Dd4SOMcxJXpxWdcd6rT3YdA= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:20:58 -0700 Message-Id: <9209526b2cc2dff8491e4958087df6f72d557810.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/golang.scm (go-github-com-masterminds-goutils): Update to 1.1.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9c9543e059..97caa6ac35 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5169,7 +5169,7 @@ suffix comparison, rather than the string-based or tree-based approaches.") (define-public go-github-com-masterminds-goutils (package (name "go-github-com-masterminds-goutils") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -5178,7 +5178,7 @@ suffix comparison, rather than the string-based or tree-based approaches.") (file-name (git-file-name name version)) (sha256 (base32 - "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq")))) + "09m4mbcdlv9ng3xcrmjlxi0niavby52y9nl2jhjnbx1xxpjw0jrh")))) (build-system go-build-system) (arguments `(#:import-path "github.com/Masterminds/goutils")) -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 07/13] gnu: go-github-com-dlclark-regexp2: Update to 1.4.0. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460568819829 (code B ref 49221); Fri, 25 Jun 2021 07:22:04 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:28 +0000 Received: from localhost ([127.0.0.1]:44723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9Y-00059e-5m for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:28 -0400 Received: from out2.migadu.com ([188.165.223.204]:12045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9R-00058z-El for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:21 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=79Dz/IObAD9puU8fJ3fpDHU4sUkIGd5KZWHAz25Gs+4=; b=fp473nQmNISgAkf6ASPLkdOD4OB1DDPM9mDLDC9g7/4+8DXgkDvR/jTK0Hj0nqiGNaMXZb 3D+tBxRPTmAzCUaXJ1H/TS+5+tWgVE2XC2WrDyyX1asubs7QzYh7MqCG3vWn/q9dBNxDgp ijsTDk8s85h9bVaFcRMm5SW9ptdhXYM= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:00 -0700 Message-Id: <15c7d50ca4e08e7a89a0b8798d58159e8f141379.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang.scm (go-github-com-dlclark-regexp2): Update to 1.4.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0760090651..9d5fc36710 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5327,7 +5327,7 @@ matching and globbing with support for \"doublestar\" patterns.") (define-public go-github-com-dlclark-regexp2 (package (name "go-github-com-dlclark-regexp2") - (version "1.2.0") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -5336,7 +5336,7 @@ matching and globbing with support for \"doublestar\" patterns.") (file-name (git-file-name name version)) (sha256 (base32 - "011l1prsywvhhi0yc7qmpsca1cwavmawyyld5kjzi0ff9ghvj4ng")))) + "1irfv89b7lfkn7k3zgx610ssil6k61qs1wjj31kvqpxb3pdx4kry")))) (build-system go-build-system) (arguments `(#:import-path "github.com/dlclark/regexp2")) -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 06/13] gnu: go-github-com-magiconair-properties: Update to 1.8.5. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460568919842 (code B ref 49221); Fri, 25 Jun 2021 07:22:04 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:29 +0000 Received: from localhost ([127.0.0.1]:44725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9Y-00059m-Eo for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:28 -0400 Received: from out0.migadu.com ([94.23.1.103]:54521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9P-00058i-JF for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:23 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3lh4TFJJzyT68holvq95UmPgpP4V6CFVfE5d9Rsj7Sw=; b=F4ueQoK4u9AyF4ScTDEuX2xy/oL8Kub7hwLZUa++JF8IeAujIIoE4QDe8Td7eowa+BdHaI oKKOfiX16O+GoAYkNZd9VrD0nUR5CL7LjyoVQDGj9IRHfnZFMnGXjCbriokc0lbKcHi+hH t6ozSfXL0vYix1PsXJ3a4IT31WG2dkM= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:20:59 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/golang.scm (go-github-com-magiconair-properties): Update to 1.8.5. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 97caa6ac35..0760090651 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2028,7 +2028,7 @@ application's http.Handlers.") (define-public go-github-com-magiconair-properties (package (name "go-github-com-magiconair-properties") - (version "1.8.4") + (version "1.8.5") (source (origin (method git-fetch) @@ -2038,7 +2038,7 @@ application's http.Handlers.") (file-name (git-file-name name version)) (sha256 (base32 - "0q7d55z0v8y55dyy8nhgdnswf5zkgj3i87irbk294nvzhx01bnxd")))) + "0v4agnkhc30fblbmhs0gq2bikhdnnmqmpp4phrnza68m04j5hxbn")))) (build-system go-build-system) (arguments `(#:import-path "github.com/magiconair/properties")) -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 08/13] gnu: earlyoom: Patch tests for go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460569719879 (code B ref 49221); Fri, 25 Jun 2021 07:22:04 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:37 +0000 Received: from localhost ([127.0.0.1]:44727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9Y-00059z-T5 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:36 -0400 Received: from out0.migadu.com ([94.23.1.103]:54534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9T-00059D-FK for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:25 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=obaCOhQ1XrYqYx3OFyCXjbjeN0Dt06OHuB5v+EtJcok=; b=EsD+sZ+HDeLROftiArxfoOepkQmW6k8ms1PZPSpyYs5FTtDpOa1JKpWJzKfBfOYaDnUpwW 6vrdZMS13xwtZcR2eXtMLxnfjQmu5OZPuA3dtgfmUkFfV/g1fi7zWcnzGYQjGHJ/Xm6+IL hd2uMSlSje3fAPYenTtWl6GtVXPReqs= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:01 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/linux.scm (earlyoom): Use it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 4 +++- .../earlyoom-1.6.2-disable-go-module.patch | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch diff --git a/gnu/local.mk b/gnu/local.mk index 509970f044..9caae52306 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -968,6 +968,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/earlyoom-1.6.2-disable-go-module.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ %D%/packages/patches/ecl-16-libffi.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 65f9057077..1f0b4cdb8e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2020 David Dashyan ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 B. Wilson +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -3393,7 +3394,8 @@ from the module-init-tools project.") (file-name (git-file-name name version)) (sha256 (base32 - "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq")))) + "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq")) + (patches (search-patches "earlyoom-1.6.2-disable-go-module.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch b/gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch new file mode 100644 index 0000000000..f7ef1222ed --- /dev/null +++ b/gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch @@ -0,0 +1,17 @@ +Explicitly disable Go module support for testing with Go >= 1.15 + +diff --git a/Makefile b/Makefile +index e072c1b..f301f00 100644 +--- a/Makefile ++++ b/Makefile +@@ -83,8 +83,8 @@ format: earlyoom + + test: earlyoom + cppcheck -q . || echo "skipping optional cppcheck" +- go test -v ++ GO111MODULE=off go test -v + + .PHONY: bench + bench: +- go test -run=NONE -bench=. ++ GO111MODULE=off go test -run=NONE -bench=. -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 09/13] gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460569719885 (code B ref 49221); Fri, 25 Jun 2021 07:22:05 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:37 +0000 Received: from localhost ([127.0.0.1]:44732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9g-0005Aa-U3 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:37 -0400 Received: from out2.migadu.com ([188.165.223.204]:12062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9V-00059N-Aa for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:25 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z3GDOZA420dJvOlZTZeCoIlgEttrBYiqWMgACx9lvac=; b=BQygWwGeuwiyVIHCfCCTjOWgf2cFONbLrD5bJ3J1njzFbHizI4viaH7/BKm9IhY1MCpOyT +FPKywktmRXw/ODvjslzT1oh8G8WIJashi+4eutueY5LpBwVEJPZL61JDuzk7T77k8iGQc OsxyYa7AxDry5sKHnb6UsGFjBzBWWP8= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:02 -0700 Message-Id: <00966aa0d291e3eeed89103fc456981171b403cf.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/golang.scm (go-github-com-bmatcuk-doublestar): Use it. --- gnu/local.mk | 1 + gnu/packages/golang.scm | 5 ++++- ...b-com-bmatcuk-doublestar-1.3-remove-test.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9caae52306..a176772ece 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1172,6 +1172,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-skip-gc-test.patch \ + %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ %D%/packages/patches/gpsbabel-fix-i686-test.patch \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9d5fc36710..3170e11925 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5314,7 +5314,10 @@ template functions.") (file-name (git-file-name name version)) (sha256 (base32 - "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")))) + "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")) + (patches + (search-patches + "go-github-com-bmatcuk-doublestar-1.3-remove-test.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/bmatcuk/doublestar")) diff --git a/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch new file mode 100644 index 0000000000..2c64575914 --- /dev/null +++ b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch @@ -0,0 +1,15 @@ +Remove test which fails with Go >= 1.15 due to API changes. +This patch should no longer be necessary with doublestar v4+ + +diff --git a/doublestar_test.go b/doublestar_test.go +index b21d20ad4b..f510c3d06b 100644 +--- a/doublestar_test.go ++++ b/doublestar_test.go +@@ -80,7 +80,6 @@ var matchTests = []MatchTest{ + {"[", "a", false, ErrBadPattern, true}, + {"[^", "a", false, ErrBadPattern, true}, + {"[^bc", "a", false, ErrBadPattern, true}, +- {"a[", "a", false, nil, false}, + {"a[", "ab", false, ErrBadPattern, true}, + {"*x", "xxx", true, nil, true}, + {"[abc]", "b", true, nil, true}, -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 10/13] gnu: restic: Patch tests for go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460570119897 (code B ref 49221); Fri, 25 Jun 2021 07:22:05 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:41 +0000 Received: from localhost ([127.0.0.1]:44734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9k-0005Ap-9w for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:41 -0400 Received: from out0.migadu.com ([94.23.1.103]:54546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9X-00059a-H5 for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:28 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TtKilRUtTgfMNtUD1Zm2duzQLdxwyp1opyLHhGLSW6k=; b=gVRo0QRGbma3E7mdEN9l6Ec6DgP29GIVvp9MpVZNIU2gGARwRMrcfNSQmy/2r5MYCSnPup Je4I42AeWfxC3N4psTD/1PgTdb4g0kqbG16U1AkwDKClNT2V/PsNwA2avwqaJ7L/MOxEA3 YzjxJf1ixf2KAhl0fDoF7MFhvYm5j8M= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:03 -0700 Message-Id: <8faa83d9d24cbd87afd8a93613dbf872aaf45573.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/backup.scm (restic): Use it. --- gnu/local.mk | 1 + gnu/packages/backup.scm | 5 +- .../restic-0.9.6-fix-tests-for-go1.15.patch | 51 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch diff --git a/gnu/local.mk b/gnu/local.mk index a176772ece..24f2d9d013 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1674,6 +1674,7 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-sh-via-rktio.patch \ %D%/packages/patches/remake-impure-dirs.patch \ + %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index d425243848..67dc4b2cc9 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Timothy Sample +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -876,7 +877,9 @@ is like a time machine for your data. ") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")))) + "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")) + (patches + (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" diff --git a/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch b/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch new file mode 100644 index 0000000000..cc510c1cfe --- /dev/null +++ b/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch @@ -0,0 +1,51 @@ +This cherry-picked patch fixes tests for Go >= 1.15. Restic v0.10 (which +includes this patch) requires go module support from the Go build system. +Original patch follows. + +--- +From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001 +From: Alexander Neumann +Date: Sat, 12 Sep 2020 17:36:44 +0200 +Subject: [PATCH] options: Fix test for Go >= 1.15 + +--- + internal/options/options_test.go | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/internal/options/options_test.go b/internal/options/options_test.go +index de94fc90a1..8d268992a3 100644 +--- a/internal/options/options_test.go ++++ b/internal/options/options_test.go +@@ -3,6 +3,7 @@ package options + import ( + "fmt" + "reflect" ++ "regexp" + "testing" + "time" + ) +@@ -199,7 +200,7 @@ var invalidSetTests = []struct { + "timeout": "2134", + }, + "ns", +- `time: missing unit in duration 2134`, ++ `time: missing unit in duration "?2134"?`, + }, + } + +@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) { + t.Fatalf("expected error %v not found", test.err) + } + +- if err.Error() != test.err { +- t.Fatalf("expected error %q, got %q", test.err, err.Error()) ++ matched, err := regexp.MatchString(test.err, err.Error()) ++ if err != nil { ++ t.Fatal(err) ++ } ++ ++ if !matched { ++ t.Fatalf("expected error to match %q, got %q", test.err, err.Error()) + } + }) + } -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 11/13] gnu: go-gopkg-in-check-v1: Update to latest. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460570119904 (code B ref 49221); Fri, 25 Jun 2021 07:22:06 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:41 +0000 Received: from localhost ([127.0.0.1]:44736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9l-0005As-F5 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:41 -0400 Received: from out2.migadu.com ([188.165.223.204]:12077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9Z-0005A5-I1 for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:29 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TFfV1VwGI3drkiwpCAyfq/nKd+tXEhyvsYkz7eV3Ug8=; b=Y7Ajc6MXJSfy0yXhsrEBEZJ999kV7PolQBUFvGS0lr7Txbg635XrQGbONa/mel3m7vivwG bNOvOJM0TT2uM7v39fTkl0nk1iBRL4eL4feNJqLInTeowKBQG5VSheFJzsmvSYMw7N3dDj 1PdYRO0a4k3OSiau8Mm8n6rTJtpAtZk= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:04 -0700 Message-Id: <2d43187f01a608e4f25b066e40a55229124cc125.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang.scm (go-gopkg-in-check-v1): Update to latest, fix license. --- gnu/packages/golang.scm | 46 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3170e11925..369bfc271c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2339,30 +2339,28 @@ which satisfies the cron expression.") license:asl2.0))))) (define-public go-gopkg-in-check-v1 - (let ((commit "788fd78401277ebd861206a03c884797c6ec5541") - (revision "1")) - (package - (name "go-gopkg-in-check-v1") - (version (git-version "1.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-check/check") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a")))) - (build-system go-build-system) - (arguments - '(#:import-path "gopkg.in/check.v1")) - (propagated-inputs - `(("go-github-com-kr-pretty" ,go-github-com-kr-pretty))) - (home-page "https://gopkg.in/check.v1") - (synopsis "Test framework for the Go language") - (description "This package provides a test library for the Go language.") - (license license:asl2.0)))) + (package + (name "go-gopkg-in-check-v1") + (version "1.0.0-20201130134442-10cb98267c6c") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-check/check") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/check.v1")) + (propagated-inputs + `(("go-github-com-kr-pretty" ,go-github-com-kr-pretty))) + (home-page "https://gopkg.in/check.v1") + (synopsis "Test framework for the Go language") + (description "This package provides a test library for the Go language.") + (license license:bsd-2))) (define-public go-gopkg-in-ini-v1 (package -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 12/13] gnu: go-etcd-io-bbolt: Update to 1.3.6. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460570219912 (code B ref 49221); Fri, 25 Jun 2021 07:22:06 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:42 +0000 Received: from localhost ([127.0.0.1]:44738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9l-0005Az-Pq for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:42 -0400 Received: from out1.migadu.com ([91.121.223.63]:30570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9b-0005AF-Lg for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:32 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3My6zq0g1rkoF+q2H+tvCnEpKx61djPVE+a79m1+D3c=; b=Vl5YYNnbdJZ1l/ZpgrChxYCyhQK23tewcgsJQ5Gq1+3JqV+QJS9pmVyABY+Bgjh+vBKsLE rnyMnODSf4IRNB6e8buP7HBR9LjPLtNVT6gHjxXjqh4tqmW9oY0NeLdZ3klSbd6RsfdaxL vBjZq6ENDaiQwplYlIpU5gqTT75e7UI= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:05 -0700 Message-Id: <66e4f623f2dde28705224716ddc4c2986c8ff7cb.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/golang.scm (go-etcd-io-bbolt): Update to 1.3.6. --- gnu/packages/golang.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 369bfc271c..ae32e9f546 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6302,7 +6302,7 @@ deleting secrets from the system keyring.") (define-public go-etcd-io-bbolt (package (name "go-etcd-io-bbolt") - (version "1.3.5") + (version "1.3.6") (source (origin (method git-fetch) (uri (git-reference @@ -6311,10 +6311,12 @@ deleting secrets from the system keyring.") (file-name (git-file-name name version)) (sha256 (base32 - "1h64gipvcg7060byv5wjlf524kqwj12p3v08kfh4ygv46vpm8p2r")))) + "0pj5245d417za41j6p09fmkbv05797vykr1bi9a6rnwddh1dbs8d")))) (build-system go-build-system) (arguments `(#:import-path "go.etcd.io/bbolt")) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) (home-page "https://pkg.go.dev/go.etcd.io/bbolt/") (synopsis "Low-level key/value store in Go") (description "This package implements a low-level key/value store in Go.") -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 13/13] gnu: Add go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 07:22:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162460570319918 (code B ref 49221); Fri, 25 Jun 2021 07:22:06 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:43 +0000 Received: from localhost ([127.0.0.1]:44740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9m-0005B7-7m for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:43 -0400 Received: from out2.migadu.com ([188.165.223.204]:12088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9d-0005AO-Tb for 49221@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:34 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624605693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JZGILPouBE39neeKn94pzk9Ux//6HfMXmuunjZ+0GaI=; b=At1EZ93UIQ2P5DmTw9ot/neYJTuwebnjhqSj2JbWCShQbBcgVk5/I6avYxct8wi8jddB2M dp81Wsb/MdkJ1AXlByJMeRYE1jQdksS8VqVFTcjTf62wEtda5w+LztqkVxiPVQ+4QcMLiY nd7jspv9P12TvqQyGdfzNOmD0HBrX0E= From: Sarah Morgensen Date: Fri, 25 Jun 2021 00:21:06 -0700 Message-Id: <50a63395dda110ff8cc14d9e8f3516668f0c2e28.1624602942.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Add go@1.16 as a non-default go. Changes from 1.14: Use now-supported GO_LDSO configuration option for setting the interpreter. Bootstrap with gccgo on platforms which do not support go-1.4. Fix and re-enable cmd/go script tests. Fix typo in cgoldflags patch. Break out tests into "check" phase. Remove references to perl to reduce closure size by ~10%. Set GOCACHE so go doesn't attempt to access $HOME. * gnu/packages/patches/go-fix-script-tests.patch: New file. * local.mk (dist_patch_DATA): Register it. * gnu/packages/golang.scm (go-1.16): New variable. Use the patch. --- gnu/local.mk | 1 + gnu/packages/golang.scm | 158 ++++++++++++++++++ .../patches/go-fix-script-tests.patch | 18 ++ 3 files changed, 177 insertions(+) create mode 100644 gnu/packages/patches/go-fix-script-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 24f2d9d013..59df29a72e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1171,6 +1171,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ + %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ae32e9f546..c169d573b4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -45,6 +45,7 @@ (define-module (gnu packages golang) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -54,6 +55,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module ((gnu packages bootstrap) #:select (glibc-dynamic-linker)) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages lua) @@ -441,6 +443,162 @@ in the style of communicating sequential processes (@dfn{CSP}).") ,@(package-native-inputs go-1.4))) (supported-systems %supported-systems))) +(define-public go-1.16 + (package + (inherit go-1.14) + (name "go") + (version "1.16.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19a93p217h5xi2sgh34qzv24pkd4df0sw4fc5z6k47lspjp3vx2l")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.14) + ((#:tests? _) #t) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'remove-unused-sourcecode-generators + (lambda _ + ;; Prevent perl from inclusion in closure through unused files + (for-each delete-file (find-files "src" "\\.pl$")))) + (replace 'prebuild + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) + (net-base (assoc-ref inputs "net-base")) + (tzdata-path + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + + ;; Having the patch in the 'patches' field of breaks + ;; the 'TestServeContent' test due to the fact that + ;; timestamps are reset. Thus, apply it from here. + (invoke "patch" "-p2" "--force" "-i" + (assoc-ref inputs "go-skip-gc-test.patch")) + (invoke "patch" "-p2" "--force" "-i" + (assoc-ref inputs "go-fix-script-tests.patch")) + + (for-each make-file-writable (find-files ".")) + + (substitute* "os/os_test.go" + (("/usr/bin") (getcwd)) + (("/bin/sh") (which "sh"))) + + (substitute* "cmd/go/testdata/script/cgo_path_space.txt" + (("/bin/sh") (which "sh"))) + + ;; Add libgcc to runpath + (substitute* "cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "cmd/go/internal/work/gccgo.go" + (("cgoldflags := \\[\\]string\\{\\}") + (string-append "cgoldflags := []string{" + "\"-Wl,-rpath=" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + (substitute* "cmd/go/internal/work/gc.go" + (("ldflags = setextld\\(ldflags, compiler\\)") + (string-append + "ldflags = setextld(ldflags, compiler)\n" + "ldflags = append(ldflags, \"-r\")\n" + "ldflags = append(ldflags, \"" gcclib "\")\n"))) + + ;; Disable failing tests: these tests attempt to access + ;; commands or network resources which are neither available + ;; nor necessary for the build to succeed. + (for-each + (match-lambda + ((file regex) + (substitute* file + ((regex all before test_name) + (string-append before "Disabled" test_name))))) + '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") + ("net/dial_test.go" "(.+)(TestDialTimeout.+)") + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPort.+)") + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPortWithCancel.+)") + ;; 127.0.0.1 doesn't exist + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTR.+)") + ;; 127.0.0.1 doesn't exist + ("net/cgo_unix_test.go" "(.+)(TestCgoLookupPTRWithCancel.+)") + ;; /etc/services doesn't exist + ("net/parse_test.go" "(.+)(TestReadLine.+)") + ("os/os_test.go" "(.+)(TestHostname.+)") + ;; The user's directory doesn't exist + ("os/os_test.go" "(.+)(TestUserHomeDir.+)") + ("time/format_test.go" "(.+)(TestParseInSydney.+)") + ("time/format_test.go" "(.+)(TestParseInLocation.+)") + ("os/exec/exec_test.go" "(.+)(TestEcho.+)") + ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") + ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") + ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") + ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") + ("os/exec/exec_test.go" "(.+)(TestPipes.+)") + ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") + ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") + ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") + ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") + ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") + ("net/lookup_test.go" "(.+)(TestLookupPort.+)") + ("syscall/exec_linux_test.go" + "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) + + ;; These tests fail on aarch64-linux + (substitute* "cmd/dist/test.go" + (("t.registerHostTest\\(\"testsanitizers/msan.*") "")) + + ;; fix shebang for testar script + ;; note the target script is generated at build time. + (substitute* "../misc/cgo/testcarchive/carchive_test.go" + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + + (substitute* "net/lookup_unix.go" + (("/etc/protocols") (string-append net-base "/etc/protocols"))) + (substitute* "net/port_unix.go" + (("/etc/services") (string-append net-base "/etc/services"))) + (substitute* "time/zoneinfo_unix.go" + (("/usr/share/zoneinfo/") tzdata-path))))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Some of the .a files are not bit-reproducible. + ;; (Is this still true?) + (let* ((output (assoc-ref outputs "out")) + (loader (string-append (assoc-ref inputs "libc") + ,(glibc-dynamic-linker)))) + (setenv "CC" (which "gcc")) + (setenv "GO_LDSO" loader) + (setenv "GOOS" "linux") + (setenv "GOROOT" (dirname (getcwd))) + (setenv "GOROOT_FINAL" output) + (setenv "GOCACHE" "/tmp/go-cache") + (invoke "sh" "make.bash" "--no-banner")))) + (replace 'check + (lambda* (#:key target (tests? (not target)) (parallel-tests? #t) + #:allow-other-keys) + (let* ((njobs (if parallel-tests? (parallel-job-count) 1))) + (when tests? + (setenv "GOMAXPROCS" (number->string njobs)) + (invoke "sh" "run.bash" "--no-rebuild"))))) + (add-before 'install 'unpatch-perl-shebangs + (lambda _ + ;; Rewrite references to perl input in test scripts + (substitute* "net/http/cgi/testdata/test.cgi" + (("^#!.*") "#!/usr/bin/env perl\n")))))))) + (native-inputs + `(("go-fix-script-tests.patch" ,(search-patch "go-fix-script-tests.patch")) + ,@(if (not (member (%current-system) (package-supported-systems go-1.4))) + (alist-replace "go" `(,gccgo-10) (package-native-inputs go-1.14)) + (package-native-inputs go-1.14)))))) + (define-public go go-1.14) (define-public go-github-com-alsm-ioprogress diff --git a/gnu/packages/patches/go-fix-script-tests.patch b/gnu/packages/patches/go-fix-script-tests.patch new file mode 100644 index 0000000000..b29e83fef0 --- /dev/null +++ b/gnu/packages/patches/go-fix-script-tests.patch @@ -0,0 +1,18 @@ +Make library/header paths visible to cmd/go script tests, which is necessary for +cgo/gccgo tests to work correctly + +diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go +index dfaa40548e..9d0f0e9bcd 100644 +--- a/src/cmd/go/script_test.go ++++ b/src/cmd/go/script_test.go +@@ -100,6 +100,10 @@ const ( + var extraEnvKeys = []string{ + "SYSTEMROOT", // must be preserved on Windows to find DLLs; golang.org/issue/25210 + "WINDIR", // must be preserved on Windows to be able to run PowerShell command; golang.org/issue/30711 ++ "CPATH", ++ "C_INCLUDE_PATH", ++ "CPLUS_INCLUDE_PATH", ++ "LIBRARY_PATH", + "LD_LIBRARY_PATH", // must be preserved on Unix systems to find shared libraries + "CC", // don't lose user settings when invoking cgo + "GO_TESTING_GOTOOLS", // for gccgo testing -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 19:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sarah Morgensen Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162490824115513 (code B ref 49221); Mon, 28 Jun 2021 19:24:02 +0000 Received: (at 49221) by debbugs.gnu.org; 28 Jun 2021 19:24:01 +0000 Received: from localhost ([127.0.0.1]:52606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxwrQ-000429-RA for submit@debbugs.gnu.org; Mon, 28 Jun 2021 15:24:01 -0400 Received: from flashner.co.il ([178.62.234.194]:53082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxwrL-00041o-Ge for 49221@debbugs.gnu.org; Mon, 28 Jun 2021 15:23:58 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id AA01A40190; Mon, 28 Jun 2021 19:23:49 +0000 (UTC) Date: Mon, 28 Jun 2021 22:22:15 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Sarah Morgensen , 49221@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="13OgINQYSVkhXmBJ" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --13OgINQYSVkhXmBJ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 24, 2021 at 11:52:55PM -0700, Sarah Morgensen via Guix-patches = via wrote: > Hello Guix, >=20 > This patch adds go 1.16, but does *not* make it the default for other pac= kages > which use go (as suggested in [2]). There have been a lot of changes betw= een > 1.14 and 1.16, and while I have fixed many issues, I am sure continued te= sting > will uncover many more. >=20 > This patch is based on [0], which adds gccgo-10. I've applied the patch, so it should now be available in the main repo :) > With this patch, go automatically bootstraps from gccgo[0][1] on platform= s not > supported by go 1.4, but you can do so on any platform with: >=20 > guix build go --with-input=3Dgo@1.4-bootstrap-20171003=3Dgccgo@10 >=20 > Additionally, to build packages with 1.16: >=20 > guix build --with-input=3Dgo@1.14=3Dgo@1.16 >=20 > I would appreciate testing and feedback on the new bootstrap process, > especially from powerpc64le users, as I have only been able to test on x8= 6-64. > (Note that it took about two hours for gccgo to build and 30 minutes for = gccgo > to build go.) I was able to build go@1.16 as-is and with the conditional switched, so it used gccgo to bootstrap go@1.16. Additionally on my x86_64 machine using emulation I was able to build go@1.16 for powerpc64le. On the powerpc64le box I have access to I was able to build gccgo and I'm still building out to go@1.16. > Changes from 1.14: >=20 > * Bootstrap with gccgo on platforms which do not support go 1.4 (see ab= ove) > * Use GO_LDSO to set the interpreter rather than patching files > * Fix typo in cgoldflags patch ("-rpath=3D" > "-Wl,-rpath=3D") > * Fix and re-enable some cgo/gccgo tests > * Remove references to perl (used for tests) to reduce closure size by = 10% > * Set GOCACHE so go doesn't complain that it can't access it $HOME > * Break out tests into "check" phase so builders have more control >=20 > I have successfully built and tested most go packages on x86-64, including > restic, syncthing, chezmoi, and exercism. >=20 > However... docker does not pass tests. It should probably be updated to 2= 0.10, > but it is a very complicated package and I do not have the skill to do so= =2E I > attempted to backport some of the fixes, but that was also beyond my abil= ities. >=20 > Perhaps someone else will rise to the challenge? :) My only concern about the patches is that I've been burned before about pushing updates to go packages, where some seem to have insufficient testing and then they'll build and fail. So in the meantime I've pushed the go@1.16 patch. > Sarah >=20 > [0] [PATCH 0/1] gnu: Add gccgo-10. > [1] Build go with gccgo > [2] [PATCH] Added Go 1.16.2 >=20 > Sarah Morgensen (13): > gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0. > gnu: go-go-uber-org-atomic: Update to 1.8.0. > gnu: go-github-com-sergi-go-diff: Update to 1.2.0. > gnu: go-github-com-pelletier-go-toml: Update to 1.9.3. > gnu: go-github-com-masterminds-goutils: Update to 1.1.1. > gnu: go-github-com-magiconair-properties: Update to 1.8.5. > gnu: go-github-com-dlclark-regexp2: Update to 1.4.0. > gnu: earlyoom: Patch tests for go-1.16. > gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with > go-1.16. > gnu: restic: Patch tests for go-1.16. > gnu: go-gopkg-in-check-v1: Update to latest. > gnu: go-etcd-io-bbolt: Update to 1.3.6. > gnu: Add go-1.16. >=20 > gnu/local.mk | 4 + > gnu/packages/backup.scm | 5 +- > gnu/packages/golang.scm | 243 +++++++++++++++--- > gnu/packages/linux.scm | 4 +- > .../earlyoom-1.6.2-disable-go-module.patch | 17 ++ > .../patches/go-fix-script-tests.patch | 18 ++ > ...m-bmatcuk-doublestar-1.3-remove-test.patch | 15 ++ > .../restic-0.9.6-fix-tests-for-go1.15.patch | 51 ++++ > 8 files changed, 314 insertions(+), 43 deletions(-) > create mode 100644 gnu/packages/patches/earlyoom-1.6.2-disable-go-module= =2Epatch > create mode 100644 gnu/packages/patches/go-fix-script-tests.patch > create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar= -1.3-remove-test.patch > create mode 100644 gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.1= 5.patch >=20 >=20 > base-commit: c7804cd97b28ef012acc20c1d861904e9592382b > prerequisite-patch-id: edb56de17ac3cce58402c83a9671b00381dfee76 > --=20 > 2.31.1 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --13OgINQYSVkhXmBJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmDaIWcACgkQQarn3Mo9 g1FkrhAAhDM5brVtI5lkvc9Kx3hG0k7AU2O33NMInolluamKeq+3VpZVNJRBlXLK eRoIU9BObhiQCN2aEBlm0LT9gfJxH6tAcbHXIP7mK7BNcGZoN2hMQPMgosC5FsKJ 71qVXrQSJS8TbMWZqO5M0Np69iAAoWJweKkzpQ3VDnJzHGLs7HkOxz/5fdy7InG1 RXQlR31rHK4z/sogM8eUAeIpkBGL5kLAlKUWRQbJAdIIj9yQfBqcemzzT2QJrwUY VjTdJen1xI8r/5ZllHRibrB74jNHZZRtdd71roUclJE5fxtwLWDOKsTtzsfUaZtD 0wvQ91up5SqntDqBIeE5VzDkeDYgXo5LimzdVmWzGAIUqlQTb+TDINTV+9Royc4v eqnVMmRB6mtq/waxLhVbp075Zv4IpixKZDfSqBzda7OzPW70kw2aVpB4wzU2ipNK QGKzjuzd2bqkMKgENdECKbSnCDcuzgyfnXxqFJkaVcdiozQExEhnzqSQV8lWP5JS V2saZNWtVhNFCuyItmbKuh/erDpGKa2UN4MlG8DyCLf1Su9KG6qE6imC5OdxwDKs 9bldn41Wp2X4je37JM9N6IrQF92UP98VgxtzfUrBG7dURfdphXfk2W5Bu+2u5SN/ 6bwVPmml3tIHuI+DAi9HW18JXVd85XLia4LARz5BwWPdnyKfMjY= =P6bq -----END PGP SIGNATURE----- --13OgINQYSVkhXmBJ-- From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Jul 2021 03:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.16251098829012 (code B ref 49221); Thu, 01 Jul 2021 03:25:02 +0000 Received: (at 49221) by debbugs.gnu.org; 1 Jul 2021 03:24:42 +0000 Received: from localhost ([127.0.0.1]:59241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lynJh-0002LI-O4 for submit@debbugs.gnu.org; Wed, 30 Jun 2021 23:24:41 -0400 Received: from out0.migadu.com ([94.23.1.103]:50808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lynJe-0002L8-56 for 49221@debbugs.gnu.org; Wed, 30 Jun 2021 23:24:39 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1625109876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yO+jUTUk4UIthoc6FekLZOCHhZZ+fzJtPafc4iZCETs=; b=Z2cXScxzQSjhdNNl0PxcbCanjqZ7PlMgRfSEM3ecn+HlkcMCvHhCLN5192LxA8Eevt30w8 AQtoYOlco0EMvUEZgm819sQ8AoDPwhg0mEzbr18NX9JC88XlNYcxDvi/pUlzChTDyDjJTH zAeI8qjmL2n9nRwi/NNnPOC/IWxu0sA= From: Sarah Morgensen References: Date: Wed, 30 Jun 2021 20:24:32 -0700 In-Reply-To: (Efraim Flashner's message of "Mon, 28 Jun 2021 22:22:15 +0300") Message-ID: <86im1u7m33.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Thanks for the push! Efraim Flashner writes: > On Thu, Jun 24, 2021 at 11:52:55PM -0700, Sarah Morgensen via Guix-patches via wrote: > >> I would appreciate testing and feedback on the new bootstrap process, >> especially from powerpc64le users, as I have only been able to test on x86-64. >> (Note that it took about two hours for gccgo to build and 30 minutes for gccgo >> to build go.) > > I was able to build go@1.16 as-is and with the conditional switched, so > it used gccgo to bootstrap go@1.16. Additionally on my x86_64 machine > using emulation I was able to build go@1.16 for powerpc64le. On the > powerpc64le box I have access to I was able to build gccgo and I'm still > building out to go@1.16. Excellent! Thanks for testing. Fingers crossed :) > My only concern about the patches is that I've been burned before about > pushing updates to go packages, where some seem to have insufficient > testing and then they'll build and fail. So in the meantime I've pushed > the go@1.16 patch. Fair enough. We'll have to wait & see if any issues surface. On that note, I've found the tests in etcd-io-bbolt and go-gopkg-in-check-v1 to be performance-based, and they would sometimes fail on my VM. Updating them did help, but did not completely eliminate the issue. -- Sarah From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jul 2021 02:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162717945530498 (code B ref 49221); Sun, 25 Jul 2021 02:18:02 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jul 2021 02:17:35 +0000 Received: from localhost ([127.0.0.1]:47288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m7Thv-0007vq-G6 for submit@debbugs.gnu.org; Sat, 24 Jul 2021 22:17:35 -0400 Received: from out0.migadu.com ([94.23.1.103]:10759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m7Ths-0007vc-If for 49221@debbugs.gnu.org; Sat, 24 Jul 2021 22:17:34 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1627179450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6F2CmmA5FbZOshvqQxVFXrztjWaZVTapC4ovKmJiVa8=; b=OyX4FSooMcgdpLG09PnwkuRQDuRd2MG8RSCkv3boxJDA23fqJUKdkUnHnckhGwjw/8f0ID 19Ex+mfC+bXEEOczzVMOZk8MS44G932P2NYicYgyPpqKHVXspsH/XHYycj2Mk5tOPTxhf7 wHPLURr2tqTSnl964JBcpSwTH0qoEcc= From: Sarah Morgensen References: Date: Sat, 24 Jul 2021 19:17:28 -0700 In-Reply-To: (Efraim Flashner's message of "Mon, 28 Jun 2021 22:22:15 +0300") Message-ID: <86h7gjp26f.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Efraim, Just following up on this. Efraim Flashner writes: > On Thu, Jun 24, 2021 at 11:52:55PM -0700, Sarah Morgensen via Guix-patches via wrote: >> Hello Guix, >> >> This patch adds go 1.16, but does *not* make it the default for other packages >> which use go (as suggested in [2]). There have been a lot of changes between >> 1.14 and 1.16, and while I have fixed many issues, I am sure continued testing >> will uncover many more. >> >> This patch is based on [0], which adds gccgo-10. > > I've applied the patch, so it should now be available in the main repo :) Should the following related issues be closed now? [0] Build go with gccgo [1] gnu: gccgo: Add version 10. [2] Added Go 1.16.2 [3] Update go? [...] > My only concern about the patches is that I've been burned before about > pushing updates to go packages, where some seem to have insufficient > testing and then they'll build and fail. So in the meantime I've pushed > the go@1.16 patch. Is there something specific to be done to sufficiently test them? I'm not sure what else to do other than manually testing dependents. Thanks, Sarah From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 14:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sarah Morgensen Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162817233726766 (code B ref 49221); Thu, 05 Aug 2021 14:06:02 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 14:05:37 +0000 Received: from localhost ([127.0.0.1]:47970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBe09-0006xe-1Q for submit@debbugs.gnu.org; Thu, 05 Aug 2021 10:05:37 -0400 Received: from flashner.co.il ([178.62.234.194]:42816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBe07-0006xR-EU for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 10:05:36 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id A5FA5401F2; Thu, 5 Aug 2021 14:05:29 +0000 (UTC) Date: Thu, 5 Aug 2021 17:03:46 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Sarah Morgensen , 49221@debbugs.gnu.org References: <86h7gjp26f.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8TW63YxVpDZswmk/" Content-Disposition: inline In-Reply-To: <86h7gjp26f.fsf_-_@mgsn.dev> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --8TW63YxVpDZswmk/ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jul 24, 2021 at 07:17:28PM -0700, Sarah Morgensen wrote: > Hi Efraim, >=20 > Just following up on this. Sorry for taking so long to get back to you. > Efraim Flashner writes: >=20 > > On Thu, Jun 24, 2021 at 11:52:55PM -0700, Sarah Morgensen via Guix-patc= hes via wrote: > >> Hello Guix, > >>=20 > >> This patch adds go 1.16, but does *not* make it the default for other = packages > >> which use go (as suggested in [2]). There have been a lot of changes b= etween > >> 1.14 and 1.16, and while I have fixed many issues, I am sure continued= testing > >> will uncover many more. > >>=20 > >> This patch is based on [0], which adds gccgo-10. > > > > I've applied the patch, so it should now be available in the main repo = :) >=20 > Should the following related issues be closed now? >=20 > [0] Build go with gccgo > [1] gnu: gccgo: Add version 10. > [2] Added Go 1.16.2 > [3] Update go? Looks like they should be safe to close. > > My only concern about the patches is that I've been burned before about > > pushing updates to go packages, where some seem to have insufficient > > testing and then they'll build and fail. So in the meantime I've pushed > > the go@1.16 patch. >=20 > Is there something specific to be done to sufficiently test them? I'm > not sure what else to do other than manually testing dependents. I thought more about it and I went ahead and applied most of them. I wasn't able to apply the go-github-com-bmatcuk-doublestar one or the restic patch. Can you resend those? > Thanks, > Sarah Thank you for doing all the work. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --8TW63YxVpDZswmk/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmEL78EACgkQQarn3Mo9 g1GPxBAAndGSp/TUCikTvX+fxOUUcy/kVkVSXXg44rFJPoZKWB0tIiBQUUtCzWaP qt4R3YiyNDZ5gmSTveSqq/s6hdzk6+fEFF985zxxpz9W6SLkgh72BKYWt3FQvpah iW3iaRnmfSHSe1m/BfI87rAxWafGcB6ZEo00iP4im7NInjmDloWH4EbGazBsS4JO viUj98afh78flfnqn9iTHzJja9iXYrBtaZ3/RNCl7vtMl8C4epFNWQXjEbi+n6wi FjlwNfbAAdFnVEg3xCUOgefXIQLoITFGeIh9oIJItdyTKfxOXc23OcPDMjRzGKR+ TjDZqX0etuJVl5c3P+/uecMAPyRUJ6Wz3FzKK9e7HP6OU9VZVP6sVIQ3zHnI/QfU ceQw90anbc5I8FDr5yO5bUqhaOukaNaVmeDFh/6S2ohLv+AWuNbadJo6fxoYVjRT 0chOo60CnVYwxkHfm46Qz7GaxkoU/FrAscyt6MFDsM24viwlCIDWtz4mkTkrvlFl FdUJW2redYo0EOTdqFV/HdC3Km7frEFs0c3suAbCWpSVv27vBF7hD1YSQOIdZBuD umO8TjkUit8dfyd7F7TiiwTeFb1JIYzyMaGcOgGSQt/4niY2em8wUAeM/bcA5JoC OLNp0/tZFbdLVBTf0T5CTVkCK/Mx5f/YBbMfPihRrw1/ocFZvI4= =DmQG -----END PGP SIGNATURE----- --8TW63YxVpDZswmk/-- From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 17:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sarah Morgensen Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162818385622017 (code B ref 49221); Thu, 05 Aug 2021 17:18:01 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 17:17:36 +0000 Received: from localhost ([127.0.0.1]:48313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBgzv-0005j1-OL for submit@debbugs.gnu.org; Thu, 05 Aug 2021 13:17:36 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:34770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBgzt-0005in-TQ for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 13:17:34 -0400 Received: by mail-qk1-f176.google.com with SMTP id w197so5699671qkb.1 for <49221@debbugs.gnu.org>; Thu, 05 Aug 2021 10:17:33 -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=VkR1EpncbTcCdXAR03VFsuNG0+NhmERiMEglz5Ll6ro=; b=njc2NeDuqi8Vw0ecfS68Gbz0rmrqIObq03DP1UYM+T+oZbw6hfLg38NsgAuZutOfo3 9PmRndpn6qB3gHKn3qtg44MZCvlNRm/qY+i6iqTwJKo15LpU6N3+cjZblDdFoiO43Xzz KiRRaeiqj85SIhhKn9gezTlCuTEHIychuR5tIcEe7Va3pIiAScHLp60Nr0nPz5/jH25X /OOTprSYvrJhtLNe52xHORNvc0CtebDMS6pTQ/2wdKyo7RL7rZTT5IZPQYzTyVR0YZgX 8poFdrghXWT/Hjjr1km1Epie3fK8nK+k8/FfY4kh4c+d0fcWh+Kdcsud9V4AgxsjX/JI 5oMg== 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=VkR1EpncbTcCdXAR03VFsuNG0+NhmERiMEglz5Ll6ro=; b=WE6V7cWrfNcMIJ5c50Ii0+AAEypRCfKdWoRO9q39G2I6iy4QlLg4FvaIVJOapr1aZS nK8edLWQjzDyUbEAbqpeauFr2GrvRPSB+tAUFvUDrnB66ojD74Lt4jF/wGcgbl7+/iRo QCStSX5d/O76veRK17VwXsUPnkt3h6TzfcmRO6jyTPCdKTstSMFZiisK9kS3C5FRF6F+ ESn1cgsqThBdZsDXBGxeSX5w39HiGzajUvc33Bg8uNaTUWboLZ4AMp2nMH8YTv0eE25o sitAO5OGNxlRslImg8Cib8cw+3JQ6Z7gyuKw7vTUH3mV2iuTDT1P7epCda5IHDZTpVoL wPMw== X-Gm-Message-State: AOAM533SDehBARMMJbcFdaJU4fQkxB/og91Wvzj6TNLzXLkSoSKDKnX1 WQyiDIC3AjDZ4dRse+MJiSKftdwnb1tnly7b X-Google-Smtp-Source: ABdhPJymETtvG6XmYnzRi0i4IsudFBs8S0H2MLtgepBlN7Y24iMxEVz2LxZ+0cPp68xw8weg4O+LUA== X-Received: by 2002:a37:e91:: with SMTP id 139mr6047612qko.239.1628183848326; Thu, 05 Aug 2021 10:17:28 -0700 (PDT) Received: from raisin ([2607:fad8:4:6:235e:8579:8464:aacc]) by smtp.gmail.com with ESMTPSA id s19sm2501644qtx.5.2021.08.05.10.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 10:17:27 -0700 (PDT) From: Maxim Cournoyer References: <00966aa0d291e3eeed89103fc456981171b403cf.1624602942.git.iskarian@mgsn.dev> Date: Thu, 05 Aug 2021 13:17:27 -0400 In-Reply-To: <00966aa0d291e3eeed89103fc456981171b403cf.1624602942.git.iskarian@mgsn.dev> (Sarah Morgensen's message of "Fri, 25 Jun 2021 00:21:02 -0700") Message-ID: <87wnoz7qvs.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Sarah Morgensen writes: > * gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/golang.scm (go-github-com-bmatcuk-doublestar): Use it. > --- > gnu/local.mk | 1 + > gnu/packages/golang.scm | 5 ++++- > ...b-com-bmatcuk-doublestar-1.3-remove-test.patch | 15 +++++++++++++++ > 3 files changed, 20 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 9caae52306..a176772ece 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1172,6 +1172,7 @@ dist_patch_DATA = \ > %D%/packages/patches/gobject-introspection-cc.patch \ > %D%/packages/patches/gobject-introspection-girepository.patch \ > %D%/packages/patches/go-skip-gc-test.patch \ > + %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ > %D%/packages/patches/gpm-glibc-2.26.patch \ > %D%/packages/patches/gpodder-disable-updater.patch \ > %D%/packages/patches/gpsbabel-fix-i686-test.patch \ > diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm > index 9d5fc36710..3170e11925 100644 > --- a/gnu/packages/golang.scm > +++ b/gnu/packages/golang.scm > @@ -5314,7 +5314,10 @@ template functions.") > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")))) > + "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")) > + (patches > + (search-patches > + "go-github-com-bmatcuk-doublestar-1.3-remove-test.patch")))) > (build-system go-build-system) > (arguments > `(#:import-path "github.com/bmatcuk/doublestar")) > diff --git a/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch > new file mode 100644 > index 0000000000..2c64575914 > --- /dev/null > +++ b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch > @@ -0,0 +1,15 @@ > +Remove test which fails with Go >= 1.15 due to API changes. > +This patch should no longer be necessary with doublestar v4+ > + > +diff --git a/doublestar_test.go b/doublestar_test.go > +index b21d20ad4b..f510c3d06b 100644 > +--- a/doublestar_test.go > ++++ b/doublestar_test.go > +@@ -80,7 +80,6 @@ var matchTests = []MatchTest{ > + {"[", "a", false, ErrBadPattern, true}, > + {"[^", "a", false, ErrBadPattern, true}, > + {"[^bc", "a", false, ErrBadPattern, true}, > +- {"a[", "a", false, nil, false}, > + {"a[", "ab", false, ErrBadPattern, true}, > + {"*x", "xxx", true, nil, true}, > + {"[abc]", "b", true, nil, true}, This should be reported upstream, if the test is still not working with the latest release (v4.0.2). Thanks, Maxim From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 17:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sarah Morgensen Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162818404522327 (code B ref 49221); Thu, 05 Aug 2021 17:21:01 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 17:20:45 +0000 Received: from localhost ([127.0.0.1]:48327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBh2z-0005o2-1e for submit@debbugs.gnu.org; Thu, 05 Aug 2021 13:20:45 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:40903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBh2x-0005no-6p for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 13:20:43 -0400 Received: by mail-qt1-f172.google.com with SMTP id m11so4403091qtx.7 for <49221@debbugs.gnu.org>; Thu, 05 Aug 2021 10:20:43 -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=JRN2are5rWK0MrYiFhWRsIhvzy9FWAjRGVQC/uvxDKE=; b=TrSXH5utryAB9DnS82DZRFqGiMQCelf+cm0HT4Fd9E2zTnIkdpi7Y3Wqv2AlvnrUEm 25T1+Zy6uAtZVWCuLsw5+vi7qWYCSqO5H/xsc/1l6jvaceyHyiJj3FIeUhFIJXKGwJi+ SnmDv3IiW2CvssgaxuXCN/1dLaxM1++2TbTS6InM26w5iKg5emhus7y9+cMX4vFECqrF jR3m+FI9U3O1CdFxqRt4igEYJ7BYXsDi4syLJtj2XdJcjxXCUGzfyaMzFYqKViRECbX7 UaNCed7i+lzqeWPCubqkNT2DeEhhgLtNcsG+pRghzjXq6Gnph1n1FeSJr0cIeNfF31As n1wQ== 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=JRN2are5rWK0MrYiFhWRsIhvzy9FWAjRGVQC/uvxDKE=; b=t8ggGoROnCLrcq4k9tmAsR4rpKZ7tk96o9aex6gPO2qpKkYJ5V/9a1NHhZSLtz0nEQ z9qDWRJ5tDmJ+94o4mxdxovsJtTMhP1dnnrj4/lzBDXDaDSxgfwE/VYilXggxhTyRAkV 7WbASc+itB6xoFJrHSA8SDYR7VDfyNVz9j2qiSQsT3LQTGUeTvrmzboeK5/BbgQnal9Y ZWzd8nciHY9ZuElaLgicRG+efAQGfQmsjHAd1qJUOgeDRxwjnRF6HoVlhXGpJ0vMQhRC JUVXTBjcb0esPoJI0uWyiIJfFQUWiMJXjk5GNrWBcQe3Ol1GoHVlVHpyh3RESqz6/X9m zG+A== X-Gm-Message-State: AOAM531MrTZiD/DUJ2SRYjKMlnk2/R/ez0n6wrVEXky5a7crgj8Q3QrF wZqsRBPedlMJxJ1xRhGOC0pirx2zCHAA6AR6 X-Google-Smtp-Source: ABdhPJwuTqTQZYw/5rO+xa+MTopLDh+8jn3NJUNeSaT/pLIWQ4Qp5h5WHk/3wlVUIFHTKvuorvdblw== X-Received: by 2002:a05:622a:14ce:: with SMTP id u14mr5360286qtx.165.1628184037709; Thu, 05 Aug 2021 10:20:37 -0700 (PDT) Received: from raisin ([2607:fad8:4:6:235e:8579:8464:aacc]) by smtp.gmail.com with ESMTPSA id p187sm3296882qkd.101.2021.08.05.10.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 10:20:37 -0700 (PDT) From: Maxim Cournoyer References: <8faa83d9d24cbd87afd8a93613dbf872aaf45573.1624602942.git.iskarian@mgsn.dev> Date: Thu, 05 Aug 2021 13:20:36 -0400 In-Reply-To: <8faa83d9d24cbd87afd8a93613dbf872aaf45573.1624602942.git.iskarian@mgsn.dev> (Sarah Morgensen's message of "Fri, 25 Jun 2021 00:21:03 -0700") Message-ID: <87sfzn7qqj.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Sarah Morgensen writes: [...] > +From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001 > +From: Alexander Neumann > +Date: Sat, 12 Sep 2020 17:36:44 +0200 > +Subject: [PATCH] options: Fix test for Go >= 1.15 > + > +--- > + internal/options/options_test.go | 12 +++++++++--- > + 1 file changed, 9 insertions(+), 3 deletions(-) > + > +diff --git a/internal/options/options_test.go b/internal/options/options_test.go > +index de94fc90a1..8d268992a3 100644 > +--- a/internal/options/options_test.go > ++++ b/internal/options/options_test.go > +@@ -3,6 +3,7 @@ package options > + import ( > + "fmt" > + "reflect" > ++ "regexp" > + "testing" > + "time" > + ) > +@@ -199,7 +200,7 @@ var invalidSetTests = []struct { > + "timeout": "2134", > + }, > + "ns", > +- `time: missing unit in duration 2134`, > ++ `time: missing unit in duration "?2134"?`, > + }, > + } > + > +@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) { > + t.Fatalf("expected error %v not found", test.err) > + } > + > +- if err.Error() != test.err { > +- t.Fatalf("expected error %q, got %q", test.err, err.Error()) > ++ matched, err := regexp.MatchString(test.err, err.Error()) > ++ if err != nil { > ++ t.Fatal(err) > ++ } > ++ > ++ if !matched { > ++ t.Fatalf("expected error to match %q, got %q", test.err, err.Error()) > + } > + }) > + } I'm guessing this may also be not be necessary if we were to successfully update restic to v0.12.1. Do you think that would be difficult to try? Thanks, Maxim From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH v2 1/2] gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 20:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162819481616044 (code B ref 49221); Thu, 05 Aug 2021 20:21:02 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 20:20:16 +0000 Received: from localhost ([127.0.0.1]:48511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjqh-0004Ai-Ra for submit@debbugs.gnu.org; Thu, 05 Aug 2021 16:20:16 -0400 Received: from out2.migadu.com ([188.165.223.204]:30235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjqf-0004AX-30 for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 16:20:14 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628194810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n7Eicg6RoaFfPDpBnYFNAuK+V/BZbOBuMhiqG9GgEZI=; b=jowoupphjHAWInAvaVy5yCTyus70AeXSKGIsW2Wnkq9Bk72F3dtxX64ecIsM7JunGj8r1o 3tskavqc9J/VnJgWqpk9CkMXepVJaPtc+nzCG44K2t+wgz/q27Zl2IakAjtsesLE9NVJX2 EMAKrv75TDObDp10ygggjHf1d7jh0H0= From: Sarah Morgensen Date: Thu, 5 Aug 2021 13:20:06 -0700 Message-Id: <7857e451389aa8081dac1bb783c5c7d29f2e9189.1628192044.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/golang.scm (go-github-com-bmatcuk-doublestar): Use it. --- gnu/local.mk | 1 + gnu/packages/golang.scm | 5 ++++- ...b-com-bmatcuk-doublestar-1.3-remove-test.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 61ac39618a..5b2e64a8b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1183,6 +1183,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-skip-gc-test.patch \ + %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ %D%/packages/patches/gpsbabel-fix-i686-test.patch \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 89020648f0..cf72aa6e20 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6480,7 +6480,10 @@ template functions.") (file-name (git-file-name name version)) (sha256 (base32 - "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")))) + "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")) + (patches + (search-patches + "go-github-com-bmatcuk-doublestar-1.3-remove-test.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/bmatcuk/doublestar")) diff --git a/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch new file mode 100644 index 0000000000..2c64575914 --- /dev/null +++ b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch @@ -0,0 +1,15 @@ +Remove test which fails with Go >= 1.15 due to API changes. +This patch should no longer be necessary with doublestar v4+ + +diff --git a/doublestar_test.go b/doublestar_test.go +index b21d20ad4b..f510c3d06b 100644 +--- a/doublestar_test.go ++++ b/doublestar_test.go +@@ -80,7 +80,6 @@ var matchTests = []MatchTest{ + {"[", "a", false, ErrBadPattern, true}, + {"[^", "a", false, ErrBadPattern, true}, + {"[^bc", "a", false, ErrBadPattern, true}, +- {"a[", "a", false, nil, false}, + {"a[", "ab", false, ErrBadPattern, true}, + {"*x", "xxx", true, nil, true}, + {"[abc]", "b", true, nil, true}, base-commit: fd3f1e809234c3e675d2eb8bc17774b0d4a94b0c -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH v2 2/2] gnu: restic: Patch tests for go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 20:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162819482116061 (code B ref 49221); Thu, 05 Aug 2021 20:21:02 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 20:20:21 +0000 Received: from localhost ([127.0.0.1]:48513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjqj-0004Av-88 for submit@debbugs.gnu.org; Thu, 05 Aug 2021 16:20:21 -0400 Received: from out1.migadu.com ([91.121.223.63]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjqh-0004Aa-Ev for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 16:20:16 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628194813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jKFF6d4/2sGpjPtedccEh4tt0TNoxYU5MsNpvA/77jw=; b=Y8YkHpSc9h4k++j87IOcyc7QgviGvzyTYBVyJbOwnLstEoA3NM0b7sDSOh5YJp3I/bPNdQ WV8Ld70fMlUnFcPoGyAZvFwWzm5YLaXPd+OAM7vPga/vtfOnKb79rODjg6+c7VBFIOQQO4 cUZ7wDjmoU8KhBSmyI4pK5fpfbwmynk= From: Sarah Morgensen Date: Thu, 5 Aug 2021 13:20:07 -0700 Message-Id: <869af0902740eceb02bf4d7125d81658c5ff9692.1628192044.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/backup.scm (restic): Use it. --- gnu/local.mk | 1 + gnu/packages/backup.scm | 5 +- .../restic-0.9.6-fix-tests-for-go1.15.patch | 51 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b2e64a8b8..03a93caed6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1694,6 +1694,7 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-minimal-sh-via-rktio.patch \ %D%/packages/patches/remake-impure-dirs.patch \ + %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 9ec4e281d8..d8d8728a14 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Timothy Sample ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -928,7 +929,9 @@ is like a time machine for your data. ") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")))) + "1zmh42aah32ah8w5n6ilz9bci0y2xrf8p7qshy3yf1lzm5gnbj0w")) + (patches + (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/restic/restic" diff --git a/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch b/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch new file mode 100644 index 0000000000..cc510c1cfe --- /dev/null +++ b/gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch @@ -0,0 +1,51 @@ +This cherry-picked patch fixes tests for Go >= 1.15. Restic v0.10 (which +includes this patch) requires go module support from the Go build system. +Original patch follows. + +--- +From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001 +From: Alexander Neumann +Date: Sat, 12 Sep 2020 17:36:44 +0200 +Subject: [PATCH] options: Fix test for Go >= 1.15 + +--- + internal/options/options_test.go | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/internal/options/options_test.go b/internal/options/options_test.go +index de94fc90a1..8d268992a3 100644 +--- a/internal/options/options_test.go ++++ b/internal/options/options_test.go +@@ -3,6 +3,7 @@ package options + import ( + "fmt" + "reflect" ++ "regexp" + "testing" + "time" + ) +@@ -199,7 +200,7 @@ var invalidSetTests = []struct { + "timeout": "2134", + }, + "ns", +- `time: missing unit in duration 2134`, ++ `time: missing unit in duration "?2134"?`, + }, + } + +@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) { + t.Fatalf("expected error %v not found", test.err) + } + +- if err.Error() != test.err { +- t.Fatalf("expected error %q, got %q", test.err, err.Error()) ++ matched, err := regexp.MatchString(test.err, err.Error()) ++ if err != nil { ++ t.Fatal(err) ++ } ++ ++ if !matched { ++ t.Fatalf("expected error to match %q, got %q", test.err, err.Error()) + } + }) + } -- 2.31.1 From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162819502216425 (code B ref 49221); Thu, 05 Aug 2021 20:24:02 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 20:23:42 +0000 Received: from localhost ([127.0.0.1]:48526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBju2-0004Gr-6D for submit@debbugs.gnu.org; Thu, 05 Aug 2021 16:23:42 -0400 Received: from out2.migadu.com ([188.165.223.204]:30900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjtz-0004Gh-WD for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 16:23:41 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628195019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WdBBjkyDf8MVTgHDZAeUqn1Mg5jvT5v57/G+x01wXlg=; b=bVXSqVpoFXjmMKH4fiQCl28zt8fdiDBW1IaEoEpUpVYbZkqRQlheNlPdzkz+Zt9ZdEZU0V Aqb1UI5kYYb/8/F36b3/BN6EKH/OU00p7iOwPdKd0yX2ylVdMhi8ISvVJVSukH8jSOZdBU OgwueiUWvbaRgoQnxPBeRdF5TOV3dOQ= From: Sarah Morgensen References: <00966aa0d291e3eeed89103fc456981171b403cf.1624602942.git.iskarian@mgsn.dev> <87wnoz7qvs.fsf_-_@gmail.com> Date: Thu, 05 Aug 2021 13:23:37 -0700 In-Reply-To: <87wnoz7qvs.fsf_-_@gmail.com> (Maxim Cournoyer's message of "Thu, 05 Aug 2021 13:17:27 -0400") Message-ID: <868s1f3ak6.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > Hello, > > Sarah Morgensen writes: > >> * gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch: >> New file. >> * gnu/local.mk (dist_patch_DATA): Register it. >> * gnu/packages/golang.scm (go-github-com-bmatcuk-doublestar): Use it. >> --- >> gnu/local.mk | 1 + >> gnu/packages/golang.scm | 5 ++++- >> ...b-com-bmatcuk-doublestar-1.3-remove-test.patch | 15 +++++++++++++++ >> 3 files changed, 20 insertions(+), 1 deletion(-) >> create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch >> >> diff --git a/gnu/local.mk b/gnu/local.mk >> index 9caae52306..a176772ece 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -1172,6 +1172,7 @@ dist_patch_DATA = \ >> %D%/packages/patches/gobject-introspection-cc.patch \ >> %D%/packages/patches/gobject-introspection-girepository.patch \ >> %D%/packages/patches/go-skip-gc-test.patch \ >> + %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ >> %D%/packages/patches/gpm-glibc-2.26.patch \ >> %D%/packages/patches/gpodder-disable-updater.patch \ >> %D%/packages/patches/gpsbabel-fix-i686-test.patch \ >> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm >> index 9d5fc36710..3170e11925 100644 >> --- a/gnu/packages/golang.scm >> +++ b/gnu/packages/golang.scm >> @@ -5314,7 +5314,10 @@ template functions.") >> (file-name (git-file-name name version)) >> (sha256 >> (base32 >> - "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")))) >> + "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")) >> + (patches >> + (search-patches >> + "go-github-com-bmatcuk-doublestar-1.3-remove-test.patch")))) >> (build-system go-build-system) >> (arguments >> `(#:import-path "github.com/bmatcuk/doublestar")) >> diff --git a/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch >> new file mode 100644 >> index 0000000000..2c64575914 >> --- /dev/null >> +++ b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch >> @@ -0,0 +1,15 @@ >> +Remove test which fails with Go >= 1.15 due to API changes. >> +This patch should no longer be necessary with doublestar v4+ >> + >> +diff --git a/doublestar_test.go b/doublestar_test.go >> +index b21d20ad4b..f510c3d06b 100644 >> +--- a/doublestar_test.go >> ++++ b/doublestar_test.go >> +@@ -80,7 +80,6 @@ var matchTests = []MatchTest{ >> + {"[", "a", false, ErrBadPattern, true}, >> + {"[^", "a", false, ErrBadPattern, true}, >> + {"[^bc", "a", false, ErrBadPattern, true}, >> +- {"a[", "a", false, nil, false}, >> + {"a[", "ab", false, ErrBadPattern, true}, >> + {"*x", "xxx", true, nil, true}, >> + {"[abc]", "b", true, nil, true}, > > This should be reported upstream, if the test is still not working with > the latest release (v4.0.2). It is fixed in v2 or v3, but those are backwards-incompatible upgrades, so I backported this patch. > > Thanks, > > Maxim -- Sarah From unknown Sat Jun 14 19:37:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 20:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 49221@debbugs.gnu.org Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162819508716559 (code B ref 49221); Thu, 05 Aug 2021 20:25:01 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 20:24:47 +0000 Received: from localhost ([127.0.0.1]:48532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjv5-0004J1-IP for submit@debbugs.gnu.org; Thu, 05 Aug 2021 16:24:47 -0400 Received: from out2.migadu.com ([188.165.223.204]:31137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjv3-0004It-NE for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 16:24:46 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628195084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CheGlDErdZcVe5u523cS7fdIDIeomm3P472o0wXq1B4=; b=O9ddkC1KoLWjLZEZD6f1pTum5LzoL9CfhQWfxvPuWK/IkI9dbLKZegfdrb+Cz/csF5jX54 oX5wT/9TMKG+AwqZOXR03mEQHrfwUvX4Jm+qIplXQJIP8f4DRVFIzRM2u6+E1uEKl8KtVw JP2kjxYptJH9g2zVOd8hePjQhTB1/Zc= From: Sarah Morgensen References: <8faa83d9d24cbd87afd8a93613dbf872aaf45573.1624602942.git.iskarian@mgsn.dev> <87sfzn7qqj.fsf_-_@gmail.com> Date: Thu, 05 Aug 2021 13:24:43 -0700 In-Reply-To: <87sfzn7qqj.fsf_-_@gmail.com> (Maxim Cournoyer's message of "Thu, 05 Aug 2021 13:20:36 -0400") Message-ID: <865ywj3aic.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > Hello, > > Sarah Morgensen writes: > > [...] > >> +From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001 >> +From: Alexander Neumann >> +Date: Sat, 12 Sep 2020 17:36:44 +0200 >> +Subject: [PATCH] options: Fix test for Go >= 1.15 >> + >> +--- >> + internal/options/options_test.go | 12 +++++++++--- >> + 1 file changed, 9 insertions(+), 3 deletions(-) >> + >> +diff --git a/internal/options/options_test.go b/internal/options/options_test.go >> +index de94fc90a1..8d268992a3 100644 >> +--- a/internal/options/options_test.go >> ++++ b/internal/options/options_test.go >> +@@ -3,6 +3,7 @@ package options >> + import ( >> + "fmt" >> + "reflect" >> ++ "regexp" >> + "testing" >> + "time" >> + ) >> +@@ -199,7 +200,7 @@ var invalidSetTests = []struct { >> + "timeout": "2134", >> + }, >> + "ns", >> +- `time: missing unit in duration 2134`, >> ++ `time: missing unit in duration "?2134"?`, >> + }, >> + } >> + >> +@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) { >> + t.Fatalf("expected error %v not found", test.err) >> + } >> + >> +- if err.Error() != test.err { >> +- t.Fatalf("expected error %q, got %q", test.err, err.Error()) >> ++ matched, err := regexp.MatchString(test.err, err.Error()) >> ++ if err != nil { >> ++ t.Fatal(err) >> ++ } >> ++ >> ++ if !matched { >> ++ t.Fatalf("expected error to match %q, got %q", test.err, err.Error()) >> + } >> + }) >> + } > > I'm guessing this may also be not be necessary if we were to > successfully update restic to v0.12.1. Do you think that would be > difficult to try? You are correct. This should eventually be done, but between v0.9.6 and v0.10, restic unvendored all its dependencies, so it would require packaging any missing dependencies. > > Thanks, > > Maxim -- Sarah From unknown Sat Jun 14 19:37:56 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Sarah Morgensen Subject: bug#49221: closed (Re: bug#49221: [PATCH 00/13] Add go-1.16 and build with gccgo) Message-ID: References: <874kc3mg5z.fsf@gmail.com> X-Gnu-PR-Message: they-closed 49221 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49221@debbugs.gnu.org Date: Fri, 06 Aug 2021 03:01:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1628218862-29532-1" This is a multi-part message in MIME format... ------------=_1628218862-29532-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49221: [PATCH 00/13] Add go-1.16 and build with gccgo which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49221@debbugs.gnu.org. --=20 49221: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49221 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1628218862-29532-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49221-done) by debbugs.gnu.org; 6 Aug 2021 03:00:03 +0000 Received: from localhost ([127.0.0.1]:48758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBq5b-0007dg-3B for submit@debbugs.gnu.org; Thu, 05 Aug 2021 23:00:03 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:34511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBq5X-0007cc-It for 49221-done@debbugs.gnu.org; Thu, 05 Aug 2021 23:00:01 -0400 Received: by mail-qk1-f179.google.com with SMTP id w197so7199683qkb.1 for <49221-done@debbugs.gnu.org>; Thu, 05 Aug 2021 19:59:59 -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=mrSZeJYLamr+4Z9pBB6nnxi39f0c5fzeMNcW+Ty3z9M=; b=EywHC6ZiJ4/aAWO08WXJJcaz+KtNAu/xW2DnmK0CF0wfDI14eMKD3rsIP3bnbZgh3w PkEab2rRrB8u2zNWykJ1x+GcXlY50H/0NUpbRacSdihATZ19lYrZ4jwG7zp5nHw7ZFk7 +eVbNOPDzWmZM9EtxpkoHnykjEt34xzGHmtcVLNsIDG6kr3OiJAvlifxGDU6tRe+CXAO 2uHXXc1fDhBKx3lzFxoFWANOPPBrSqKMOIrv9miTuqPqAfsDq1SfW8S04iV0Sn/1jmgn S0wM4FZ9A1dv/XlxHQDMPhYeMwPzKrRj+Q6l69fvPSgIGnZxLONVvgPZ2cGQxL9rn9Z4 1yWQ== 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=mrSZeJYLamr+4Z9pBB6nnxi39f0c5fzeMNcW+Ty3z9M=; b=XCx68k9Nm///IE2jGzQs55bS0RO9BBKVq5Kemro3K9I39jB80fLIwC/Rpq9rv4FHhf 4Jlo7nm3kL3xX9RuxNbUjxYRAwzkmAglAKO7BNy4g6WME7Bdp00GdWPz8NhNCru+R14x luM/1vPQ4JAIHq4e+oXwEackVydpQGsVG4N4NxoN+tu20vtw25Clt4dv6KihRJD6YCla cLanQ998natSszCSdp65pyWPH2uDHprVZWKehIhZqYAEr//5u7Gb5fK61Rs2g7gnzH8A dSsgSgKca6PPwm4OcLdSQI+0UFA1knKiUbQbhXaecoByfcOpv03pj+ftiggUxPM/VXSw wVqg== X-Gm-Message-State: AOAM532mJ8PyMEG8CAmbOEqG6mhteFNdwGV8tlPPL+LRZnaoEvTKArTg 8Ej9dLYz/e+AcifT1jKdouqC43Wxrr1wAfVr X-Google-Smtp-Source: ABdhPJwMUXh7gZGgrWebmng6lORBhKy2kbJX9rh1gq4Ion3uVVOwPnep2ZpnPLspEq/m/uCW11pmOQ== X-Received: by 2002:a05:620a:b1b:: with SMTP id t27mr7992638qkg.460.1628218793702; Thu, 05 Aug 2021 19:59:53 -0700 (PDT) Received: from hurd (dsl-151-109.b2b2c.ca. [66.158.151.109]) by smtp.gmail.com with ESMTPSA id x10sm3827099qkl.82.2021.08.05.19.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 19:59:53 -0700 (PDT) From: Maxim Cournoyer To: Sarah Morgensen Subject: Re: bug#49221: [PATCH 00/13] Add go-1.16 and build with gccgo References: <8faa83d9d24cbd87afd8a93613dbf872aaf45573.1624602942.git.iskarian@mgsn.dev> <87sfzn7qqj.fsf_-_@gmail.com> <865ywj3aic.fsf_-_@mgsn.dev> Date: Thu, 05 Aug 2021 22:59:52 -0400 In-Reply-To: <865ywj3aic.fsf_-_@mgsn.dev> (Sarah Morgensen's message of "Thu, 05 Aug 2021 13:24:43 -0700") Message-ID: <874kc3mg5z.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49221-done Cc: 49221-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Sarah, Sarah Morgensen writes: [...] >> I'm guessing this may also be not be necessary if we were to >> successfully update restic to v0.12.1. Do you think that would be >> difficult to try? > > You are correct. This should eventually be done, but between v0.9.6 and > v0.10, restic unvendored all its dependencies, so it would require > packaging any missing dependencies. I see! Thanks for the explanation. I've now merged both remaining patches from this tracker as commits 733ca63bcd and 1273548f4f, with the first one modified to do the patching as a phase (the patch file name was too long -- caught by guix lint). Thank you! Closing. Maxim ------------=_1628218862-29532-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 25 Jun 2021 06:53:11 +0000 Received: from localhost ([127.0.0.1]:44688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwfiA-0004PZ-SQ for submit@debbugs.gnu.org; Fri, 25 Jun 2021 02:53:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:60576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwfi8-0004PR-O3 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 02:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwfi8-0005Ko-D0 for guix-patches@gnu.org; Fri, 25 Jun 2021 02:53:08 -0400 Received: from out0.migadu.com ([2001:41d0:2:267::]:52528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwfi4-0000zI-Bj for guix-patches@gnu.org; Fri, 25 Jun 2021 02:53:08 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1624603978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=EWpFjkI9A4KWAUsSvbMj9qsDbRsuH/jG6fxJagTZDv4=; b=UbFQPwaBuRzfOYU/RoaFG63sbtx5jL/jr3FBF5oWdy1mUk6FFk1184hOQCDjWRCY68NfLO V/pdqoGUe0ows1FEDuX5UwveWAEIUnQ/oeM0HyHUB1ryzjjVr3pvsFXG7retDRKAzBg9Dn GvGpNpi/Cog6tTz8Dxek0kXu6bjVtAQ= From: Sarah Morgensen To: guix-patches@gnu.org Subject: [PATCH 00/13] Add go-1.16 and build with gccgo Date: Thu, 24 Jun 2021 23:52:55 -0700 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=iskarian@mgsn.dev; helo=out0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello Guix, This patch adds go 1.16, but does *not* make it the default for other packages which use go (as suggested in [2]). There have been a lot of changes between 1.14 and 1.16, and while I have fixed many issues, I am sure continued testing will uncover many more. This patch is based on [0], which adds gccgo-10. With this patch, go automatically bootstraps from gccgo[0][1] on platforms not supported by go 1.4, but you can do so on any platform with: guix build go --with-input=go@1.4-bootstrap-20171003=gccgo@10 Additionally, to build packages with 1.16: guix build --with-input=go@1.14=go@1.16 I would appreciate testing and feedback on the new bootstrap process, especially from powerpc64le users, as I have only been able to test on x86-64. (Note that it took about two hours for gccgo to build and 30 minutes for gccgo to build go.) Changes from 1.14: * Bootstrap with gccgo on platforms which do not support go 1.4 (see above) * Use GO_LDSO to set the interpreter rather than patching files * Fix typo in cgoldflags patch ("-rpath=" > "-Wl,-rpath=") * Fix and re-enable some cgo/gccgo tests * Remove references to perl (used for tests) to reduce closure size by 10% * Set GOCACHE so go doesn't complain that it can't access it $HOME * Break out tests into "check" phase so builders have more control I have successfully built and tested most go packages on x86-64, including restic, syncthing, chezmoi, and exercism. However... docker does not pass tests. It should probably be updated to 20.10, but it is a very complicated package and I do not have the skill to do so. I attempted to backport some of the fixes, but that was also beyond my abilities. Perhaps someone else will rise to the challenge? :) Sarah [0] [PATCH 0/1] gnu: Add gccgo-10. [1] Build go with gccgo [2] [PATCH] Added Go 1.16.2 Sarah Morgensen (13): gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0. gnu: go-go-uber-org-atomic: Update to 1.8.0. gnu: go-github-com-sergi-go-diff: Update to 1.2.0. gnu: go-github-com-pelletier-go-toml: Update to 1.9.3. gnu: go-github-com-masterminds-goutils: Update to 1.1.1. gnu: go-github-com-magiconair-properties: Update to 1.8.5. gnu: go-github-com-dlclark-regexp2: Update to 1.4.0. gnu: earlyoom: Patch tests for go-1.16. gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16. gnu: restic: Patch tests for go-1.16. gnu: go-gopkg-in-check-v1: Update to latest. gnu: go-etcd-io-bbolt: Update to 1.3.6. gnu: Add go-1.16. gnu/local.mk | 4 + gnu/packages/backup.scm | 5 +- gnu/packages/golang.scm | 243 +++++++++++++++--- gnu/packages/linux.scm | 4 +- .../earlyoom-1.6.2-disable-go-module.patch | 17 ++ .../patches/go-fix-script-tests.patch | 18 ++ ...m-bmatcuk-doublestar-1.3-remove-test.patch | 15 ++ .../restic-0.9.6-fix-tests-for-go1.15.patch | 51 ++++ 8 files changed, 314 insertions(+), 43 deletions(-) create mode 100644 gnu/packages/patches/earlyoom-1.6.2-disable-go-module.patch create mode 100644 gnu/packages/patches/go-fix-script-tests.patch create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch create mode 100644 gnu/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch base-commit: c7804cd97b28ef012acc20c1d861904e9592382b prerequisite-patch-id: edb56de17ac3cce58402c83a9671b00381dfee76 -- 2.31.1 ------------=_1628218862-29532-1--