[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49221] [PATCH 08/13] gnu: earlyoom: Patch tests for go-1.16.
From: |
Sarah Morgensen |
Subject: |
[bug#49221] [PATCH 08/13] gnu: earlyoom: Patch tests for go-1.16. |
Date: |
Fri, 25 Jun 2021 00:21:01 -0700 |
* 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 <mail@davie.li>
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2021 B. Wilson <elaexuotee@wilsonb.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;;
;;; 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=.
--
2.31.1
- [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo, Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 01/13] gnu: go-github-com-puerkitobio-goquery: Update to 1.7.0., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 02/13] gnu: go-go-uber-org-atomic: Update to 1.8.0., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 04/13] gnu: go-github-com-pelletier-go-toml: Update to 1.9.3., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 07/13] gnu: go-github-com-dlclark-regexp2: Update to 1.4.0., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 09/13] gnu: go-github-com-bmatcuk-doublestar: Remove test incompatible with go-1.16., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 06/13] gnu: go-github-com-magiconair-properties: Update to 1.8.5., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 10/13] gnu: restic: Patch tests for go-1.16., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 12/13] gnu: go-etcd-io-bbolt: Update to 1.3.6., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 05/13] gnu: go-github-com-masterminds-goutils: Update to 1.1.1., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 08/13] gnu: earlyoom: Patch tests for go-1.16.,
Sarah Morgensen <=
- [bug#49221] [PATCH 03/13] gnu: go-github-com-sergi-go-diff: Update to 1.2.0., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 13/13] gnu: Add go-1.16., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 11/13] gnu: go-gopkg-in-check-v1: Update to latest., Sarah Morgensen, 2021/06/25
- [bug#49221] [PATCH 00/13] Add go-1.16 and build with gccgo, Efraim Flashner, 2021/06/28