From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aPAFJCmE1WCuAQAAgWs5BA (envelope-from ) for ; Fri, 25 Jun 2021 09:22:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eAq4HymE1WDlVwAAB5/wlQ (envelope-from ) for ; Fri, 25 Jun 2021 07:22:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4BC1317FDB for ; Fri, 25 Jun 2021 09:22:17 +0200 (CEST) Received: from localhost ([::1]:53712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAK-00065y-Ax for larch@yhetil.org; Fri, 25 Jun 2021 03:22:16 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Sarah Morgensen X-ACL-Warn: , Sarah Morgensen via Guix-patches From: Sarah Morgensen via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624605737; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=z3GDOZA420dJvOlZTZeCoIlgEttrBYiqWMgACx9lvac=; b=ji+Sb6HBI5hLQ/XRRsmIvNR8pO7vUjLdQT2BCBE7kJ1M2stUY65SKCOMy2fO68k/lpHnQm EENqC30zIRKC/0A5njbG87GZON5y6mlkMlR6T2uowjG8r/PU3xr0kuwM6hFjwkFDQxyy/3 qeuRR2Wl3NrF4cIQG1IEPC/JB6CMu1klooJeeP7QlAioCcXnPrlsAuRtfPA+w//WaAnWpf Dk0zKKwxtdSgkmyDycLRWThgJ2Lj43bPumu/yW44h24Fk7yQbd5LhhCrD8565eEq6S+EdB hBSmBihYSruDJR6JPPE/OM9Q4tVleoWTy3IsbV+3NqbDrQqvLrgLUxaEmD2HYQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624605737; a=rsa-sha256; cv=none; b=kzlVvkjnN9xjq5SazPLg0xZtVrl2AuzOkSwsSqpYw2DgEPCLJPreE3/wkzJLH0tFHb5F5r UsBnqFaqtYdSasZ+Qv59evdnC0lh2K8OUv2v5ElHTNP18PAYavl64rR0WlA1fSbR9NJznI oSDMk0eabnvzTQ2c82qwCGtN5CJcUvC6ugNGi0afjZk+GDR+Bm4h9L3r93TRBnv/nchdcB cvji6e6OJsPAlBcBwNWDJAZ7GI87ocYEmqKq6dAunHDmfkYm9/13XgrYMUs37CAC4jPkra X+DADGceD0i8B+psUztp0lxxQNuji9w0ZapGaU5LWZ3XHQSjQNPGab5QBT+RRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=BQygWwGe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.07 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=BQygWwGe; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4BC1317FDB X-Spam-Score: 1.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: H6sYK+/fxPAz * 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