From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QCbXFzdIDGEGewEAgWs5BA (envelope-from ) for ; Thu, 05 Aug 2021 22:21:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MK8rEzdIDGF1MwAAbx9fmQ (envelope-from ) for ; Thu, 05 Aug 2021 20:21:11 +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 494F8BA8A for ; Thu, 5 Aug 2021 22:21:10 +0200 (CEST) Received: from localhost ([::1]:40528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBjrZ-0008IH-84 for larch@yhetil.org; Thu, 05 Aug 2021 16:21:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBjrU-0008Go-4A for guix-patches@gnu.org; Thu, 05 Aug 2021 16:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBjrS-00005G-Nw for guix-patches@gnu.org; Thu, 05 Aug 2021 16:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mBjrS-0004CD-EJ for guix-patches@gnu.org; Thu, 05 Aug 2021 16:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH v2 1/2] gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 20:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49221@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 49221-submit@debbugs.gnu.org id=B49221.162819481616044 (code B ref 49221); Thu, 05 Aug 2021 20:21:02 +0000 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 20:20:16 +0000 Received: from localhost ([127.0.0.1]:48511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjqh-0004Ai-Ra for submit@debbugs.gnu.org; Thu, 05 Aug 2021 16:20:16 -0400 Received: from out2.migadu.com ([188.165.223.204]:30235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjqf-0004AX-30 for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 16:20:14 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628194810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n7Eicg6RoaFfPDpBnYFNAuK+V/BZbOBuMhiqG9GgEZI=; b=jowoupphjHAWInAvaVy5yCTyus70AeXSKGIsW2Wnkq9Bk72F3dtxX64ecIsM7JunGj8r1o 3tskavqc9J/VnJgWqpk9CkMXepVJaPtc+nzCG44K2t+wgz/q27Zl2IakAjtsesLE9NVJX2 EMAKrv75TDObDp10ygggjHf1d7jh0H0= From: Sarah Morgensen Date: Thu, 5 Aug 2021 13:20:06 -0700 Message-Id: <7857e451389aa8081dac1bb783c5c7d29f2e9189.1628192044.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628194870; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=n7Eicg6RoaFfPDpBnYFNAuK+V/BZbOBuMhiqG9GgEZI=; b=ffXBNX4AYLtJf1eqEInk7XII7rXCuG2UwffkC7r6si497pIyR5RZBRcEX8DAzlGaet82xj KLB9H4NoZCjnkqi/1J1fYLlks+rS5BYJP2iPbNjSHNp7vd+otVMKL5VVQUO9OdQkJF4CD0 tLHDTBGr52x9zlZnlkN6eob2szGnsDfUHtseWfA2q8qfc/beyHMZkfRmGos1MJ1561ZygE virtSoKl/MpwnfvJA8QIr1zoxq5f3NhO2xIRij9BrNrv9uxWz46epxX0WT1S6JsQCus82F KRbU7KzKjFJTZug2QmxKIRvd025rlORAWqsz1C4AXHMuxclCOnMwWc9e4TNQWg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628194870; a=rsa-sha256; cv=none; b=qfRdZlDwIQ1atu6o1wPPkSiboVP56L710t2V/3+eBNcPkG1dCEPHgetjaLqLVjyiK59FbO JPicNyb6Nsh1HlTDjgBxJigv5ucNgn7m1dDIWNxllhrZgnEdqkkF4kVZecxXeKX+UMEfjg u+9AIlN4GZtn01H2kUmouaD20m4HQ0fpjWriaZGPUXkUvtEMMvbXHqj5Y7yvskklCLbXZ+ dj6VjIbMVi78ylY9LiriLMOd9rNKuCFUuWY1QUJeVtoECdk3gNQ6Ijhiivi6RQTZB6S84/ QAs/KOZ0eFRHYBSkHl+r1TsRowpHubBcouFJ5S5mJY/Lbdebff3mjML8eVdTjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=jowoupph; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=jowoupph; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 494F8BA8A X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: nIvXg6R8Y1mO * gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/golang.scm (go-github-com-bmatcuk-doublestar): Use it. --- gnu/local.mk | 1 + gnu/packages/golang.scm | 5 ++++- ...b-com-bmatcuk-doublestar-1.3-remove-test.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 61ac39618a..5b2e64a8b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1183,6 +1183,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-skip-gc-test.patch \ + %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ %D%/packages/patches/gpsbabel-fix-i686-test.patch \ diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 89020648f0..cf72aa6e20 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6480,7 +6480,10 @@ template functions.") (file-name (git-file-name name version)) (sha256 (base32 - "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")))) + "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")) + (patches + (search-patches + "go-github-com-bmatcuk-doublestar-1.3-remove-test.patch")))) (build-system go-build-system) (arguments `(#:import-path "github.com/bmatcuk/doublestar")) diff --git a/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch new file mode 100644 index 0000000000..2c64575914 --- /dev/null +++ b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch @@ -0,0 +1,15 @@ +Remove test which fails with Go >= 1.15 due to API changes. +This patch should no longer be necessary with doublestar v4+ + +diff --git a/doublestar_test.go b/doublestar_test.go +index b21d20ad4b..f510c3d06b 100644 +--- a/doublestar_test.go ++++ b/doublestar_test.go +@@ -80,7 +80,6 @@ var matchTests = []MatchTest{ + {"[", "a", false, ErrBadPattern, true}, + {"[^", "a", false, ErrBadPattern, true}, + {"[^bc", "a", false, ErrBadPattern, true}, +- {"a[", "a", false, nil, false}, + {"a[", "ab", false, ErrBadPattern, true}, + {"*x", "xxx", true, nil, true}, + {"[abc]", "b", true, nil, true}, base-commit: fd3f1e809234c3e675d2eb8bc17774b0d4a94b0c -- 2.31.1