all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sarah Morgensen <iskarian@mgsn.dev>
To: 49221@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#49221] [PATCH v2 1/2] gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16.
Date: Thu,  5 Aug 2021 13:20:06 -0700	[thread overview]
Message-ID: <7857e451389aa8081dac1bb783c5c7d29f2e9189.1628192044.git.iskarian@mgsn.dev> (raw)
In-Reply-To: <YQvvwtvQMBGNsH2b@3900XT>

* 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





  reply	other threads:[~2021-08-05 20:21 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25  6:52 [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Sarah Morgensen via Guix-patches via
2021-06-25  7:20 ` [bug#49221] [PATCH 01/13] gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0 Sarah Morgensen via Guix-patches via
2021-06-25  7:20 ` [bug#49221] [PATCH 02/13] gnu: go-go-uber-org-atomic: Update to 1.8.0 Sarah Morgensen via Guix-patches via
2021-06-25  7:20 ` [bug#49221] [PATCH 03/13] gnu: go-github-com-sergi-go-diff: Update to 1.2.0 Sarah Morgensen via Guix-patches via
2021-06-25  7:20 ` [bug#49221] [PATCH 04/13] gnu: go-github-com-pelletier-go-toml: Update to 1.9.3 Sarah Morgensen via Guix-patches via
2021-06-25  7:20 ` [bug#49221] [PATCH 05/13] gnu: go-github-com-masterminds-goutils: Update to 1.1.1 Sarah Morgensen via Guix-patches via
2021-06-25  7:20 ` [bug#49221] [PATCH 06/13] gnu: go-github-com-magiconair-properties: Update to 1.8.5 Sarah Morgensen via Guix-patches via
2021-06-25  7:21 ` [bug#49221] [PATCH 07/13] gnu: go-github-com-dlclark-regexp2: Update to 1.4.0 Sarah Morgensen via Guix-patches via
2021-06-25  7:21 ` [bug#49221] [PATCH 08/13] gnu: earlyoom: Patch tests for go-1.16 Sarah Morgensen via Guix-patches via
2021-06-25  7:21 ` [bug#49221] [PATCH 09/13] gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16 Sarah Morgensen via Guix-patches via
2021-08-05 17:17   ` [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Maxim Cournoyer
2021-08-05 20:23     ` Sarah Morgensen
2021-06-25  7:21 ` [bug#49221] [PATCH 10/13] gnu: restic: Patch tests for go-1.16 Sarah Morgensen via Guix-patches via
2021-08-05 17:20   ` [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Maxim Cournoyer
2021-08-05 20:24     ` Sarah Morgensen
2021-08-06  2:59       ` bug#49221: " Maxim Cournoyer
2021-06-25  7:21 ` [bug#49221] [PATCH 11/13] gnu: go-gopkg-in-check-v1: Update to latest Sarah Morgensen via Guix-patches via
2021-06-25  7:21 ` [bug#49221] [PATCH 12/13] gnu: go-etcd-io-bbolt: Update to 1.3.6 Sarah Morgensen via Guix-patches via
2021-06-25  7:21 ` [bug#49221] [PATCH 13/13] gnu: Add go-1.16 Sarah Morgensen via Guix-patches via
2021-06-28 19:22 ` [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo Efraim Flashner
2021-07-01  3:24   ` Sarah Morgensen via Guix-patches via
2021-07-25  2:17   ` Sarah Morgensen
2021-08-05 14:03     ` Efraim Flashner
2021-08-05 20:20       ` Sarah Morgensen [this message]
2021-08-05 20:20       ` [bug#49221] [PATCH v2 2/2] gnu: restic: Patch tests for go-1.16 Sarah Morgensen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7857e451389aa8081dac1bb783c5c7d29f2e9189.1628192044.git.iskarian@mgsn.dev \
    --to=iskarian@mgsn.dev \
    --cc=49221@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.