From patchwork Fri Jun 25 07:20:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30695 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A9DF827BC81; Fri, 25 Jun 2021 08:22:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55F6B27BC78 for ; Fri, 25 Jun 2021 08:22:14 +0100 (BST) Received: from localhost ([::1]:53584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAH-00060S-9T for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005wO-0o for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA6-0005oy-Mi for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA6-0005Bm-7M for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:02 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Fri Jun 25 07:20:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30703 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7B80E27BC81; Fri, 25 Jun 2021 08:23:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5043B27BC78 for ; Fri, 25 Jun 2021 08:23:01 +0100 (BST) Received: from localhost ([::1]:56824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgB2-0008Fi-E3 for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:23:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005wN-0q for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA6-0005pI-OH for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA6-0005Bu-KZ for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:02 -0400 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= Date: Fri, 25 Jun 2021 00:20:55 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Fri Jun 25 07:20:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30704 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F25A27BC81; Fri, 25 Jun 2021 08:23:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CBD4B27BC78 for ; Fri, 25 Jun 2021 08:23:06 +0100 (BST) Received: from localhost ([::1]:57046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgB7-0008Oc-Th for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:23:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005xm-Py for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005qQ-Ip for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA7-0005C9-Fn for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 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= Date: Fri, 25 Jun 2021 00:20:56 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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" From patchwork Fri Jun 25 07:20:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30693 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D39A827BC81; Fri, 25 Jun 2021 08:22:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9EC8D27BC78 for ; Fri, 25 Jun 2021 08:22:13 +0100 (BST) Received: from localhost ([::1]:53560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAG-0005zA-JU for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005xA-Ci for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005q2-54 for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA7-0005C1-22 for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Fri Jun 25 07:20:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30698 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E1F4F27BC81; Fri, 25 Jun 2021 08:22:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A69FB27BC78 for ; Fri, 25 Jun 2021 08:22:24 +0100 (BST) Received: from localhost ([::1]:54586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAR-0006ia-Mw for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA8-0005y6-6L for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA7-0005qX-Uq for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA7-0005CG-SE for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:03 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Fri Jun 25 07:20:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30705 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 984AC27BC81; Fri, 25 Jun 2021 08:23:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3A8CB27BC78 for ; Fri, 25 Jun 2021 08:23:12 +0100 (BST) Received: from localhost ([::1]:57262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgBD-000062-BN for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA8-000606-W2 for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA8-0005ql-Nr for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA8-0005CV-Kx for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:04 -0400 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= Date: Fri, 25 Jun 2021 00:20:59 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Fri Jun 25 07:21:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30696 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 804D027BC81; Fri, 25 Jun 2021 08:22:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4267427BC78 for ; Fri, 25 Jun 2021 08:22:22 +0100 (BST) Received: from localhost ([::1]:54338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAP-0006YR-Ab for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA8-0005yx-LP for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33199) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA8-0005qe-Bf for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA8-0005CN-8O for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:04 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Fri Jun 25 07:21:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30699 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F16FA27BC83; Fri, 25 Jun 2021 08:22:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 412A427BC78 for ; Fri, 25 Jun 2021 08:22:30 +0100 (BST) Received: from localhost ([::1]:55190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAX-00077h-Ac for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA9-00061k-DR for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA9-0005r9-4O for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA9-0005Cc-0r for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 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= Date: Fri, 25 Jun 2021 00:21:01 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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=. From patchwork Fri Jun 25 07:21:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30694 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4C56B27BC81; Fri, 25 Jun 2021 08:22:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,TVD_SPACE_RATIO,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F5A927BC78 for ; Fri, 25 Jun 2021 08:22:16 +0100 (BST) Received: from localhost ([::1]:53712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAJ-00065y-0e for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA9-00063B-Pf for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA9-0005rr-Go for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA9-0005Cj-Dl for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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}, From patchwork Fri Jun 25 07:21:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30697 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AA9C127BC81; Fri, 25 Jun 2021 08:22:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B29527BC78 for ; Fri, 25 Jun 2021 08:22:22 +0100 (BST) Received: from localhost ([::1]:54386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAP-0006aH-LQ for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgAA-00064d-5J for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA9-0005sw-Tp for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgA9-0005Cr-R5 for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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()) + } + }) + } From patchwork Fri Jun 25 07:21:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30700 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6A50627BC78; Fri, 25 Jun 2021 08:22:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8C6BC27BC81 for ; Fri, 25 Jun 2021 08:22:30 +0100 (BST) Received: from localhost ([::1]:55240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAX-00079c-KE for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgAA-00065Y-ID for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgAA-0005tO-AG for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgAA-0005Cy-7G for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:06 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Fri Jun 25 07:21:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30701 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8D3327BC83; Fri, 25 Jun 2021 08:22:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46E9727BC81 for ; Fri, 25 Jun 2021 08:22:38 +0100 (BST) Received: from localhost ([::1]:55940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAf-0007cb-Cz for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgAB-00066v-0f for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgAA-0005tm-NL for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgAA-0005D5-KD for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:06 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches * 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.") From patchwork Fri Jun 25 07:21:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 30702 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3F6DA27BC81; Fri, 25 Jun 2021 08:22:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1459527BC78 for ; Fri, 25 Jun 2021 08:22:38 +0100 (BST) Received: from localhost ([::1]:55910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAf-0007bP-5J for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 03:22:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgAB-00068o-Fe for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgAB-0005u2-3p for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwgAB-0005DD-0W for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:07 -0400 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= 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 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches X-Patchwork-Original-From: Sarah Morgensen via Guix-patches via From: Sarah Morgensen X-getmail-retrieved-from-mailbox: Patches 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