From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id x0uXBjiE1WDwAgAAgWs5BA (envelope-from ) for ; Fri, 25 Jun 2021 09:22:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uNi9ATiE1WAzRgAA1q6Kng (envelope-from ) for ; Fri, 25 Jun 2021 07:22:32 +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 B69C717FEE for ; Fri, 25 Jun 2021 09:22:31 +0200 (CEST) Received: from localhost ([::1]:55190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwgAY-00077h-87 for larch@yhetil.org; Fri, 25 Jun 2021 03:22:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwgA9-00061k-DR for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwgA9-0005r9-4O 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-0005Cc-0r for guix-patches@gnu.org; Fri, 25 Jun 2021 03:22:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49221] [PATCH 08/13] gnu: earlyoom: Patch tests for 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:04 +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.162460569719879 (code B ref 49221); Fri, 25 Jun 2021 07:22:04 +0000 Received: (at 49221) by debbugs.gnu.org; 25 Jun 2021 07:21:37 +0000 Received: from localhost ([127.0.0.1]:44727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9Y-00059z-T5 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 03:21:36 -0400 Received: from out0.migadu.com ([94.23.1.103]:54534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwg9T-00059D-FK 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=1624605682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=obaCOhQ1XrYqYx3OFyCXjbjeN0Dt06OHuB5v+EtJcok=; b=EsD+sZ+HDeLROftiArxfoOepkQmW6k8ms1PZPSpyYs5FTtDpOa1JKpWJzKfBfOYaDnUpwW 6vrdZMS13xwtZcR2eXtMLxnfjQmu5OZPuA3dtgfmUkFfV/g1fi7zWcnzGYQjGHJ/Xm6+IL hd2uMSlSje3fAPYenTtWl6GtVXPReqs= Date: Fri, 25 Jun 2021 00:21:01 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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=1624605751; 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-type:content-type: 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=obaCOhQ1XrYqYx3OFyCXjbjeN0Dt06OHuB5v+EtJcok=; b=jizpDUMBpDOs6+qNTuHV2uuWVNoMkgbBEuh0Ys1PRU3TAitK0u8//bPjGBwge6KXI0vsNP GclfHPIO9g0IrvBPQHG92y9jKpCdqMOzTN52UCfuuiAsdu1RNEJrJC6qsdw++X5qj0SYjf 8vR4uKZzXGaeowbzfCJcHZXoNpGs1zaeZ07ZaQIYif54rJG1vF4D6hZzV8GoA60zVs1F2H TdifQdp2Bz5sVWMMvZEev62Cijpo1my+/JVkp02Z8K0cOI/lceBcu4f6JUI15aSs2+lWxX 1tgBmZuGkuiOiPj950hHylXQ8pOhQ32dH0/jw3hppF2EQks/0CCFKvcFBiIcFw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624605751; a=rsa-sha256; cv=none; b=IEAl0NHDf+Ej9dEFNMqmpdzs6UUT7kp0py7D8sh74Z0MPG22byPXPihD9McL+NGb8EqMiu Zv3BHlsTpM/hJOaUHqSZ+mv2vTu094j0M/MhP+ynQuAmDKR9jlamZvHwr/QDMhqbZ3X9aB +ggIp+JWCWoTCc7HJBU8Yp5Pv55vlHK9ZcErVsCkEbDc5r+mIGan6jehHKSqY2MpWUDGBM wE+YOMSdChtO8QPvMF0774sTkTUw7ot3dWwCsETWv9WKrOu4W01F+Ep34ORJGIGWhDUmLs w26yb3t6AwHwYCV7q7XoydUAZ/YpX7v0jidKxekmL0FCdSQT6E32jzdAkd8lzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=EsD+sZ+H; 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: -2.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=EsD+sZ+H; 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: B69C717FEE X-Spam-Score: -2.93 X-Migadu-Scanner: scn1.migadu.com X-TUID: A1uv3H4mRTMe * 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 ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 B. Wilson +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; 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