@@ -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 \
@@ -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
new file mode 100644
@@ -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=.