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},