Copied from upstream repository.
Hunk #2 is removed since it cannot be applied and it is not needed.

From 7cead7137bf54851c1b7df5a3854351296d21276 Mon Sep 17 00:00:00 2001
From: Vasantha Ganesh K <vasanthaganesh.k@tuta.io>
Date: Thu, 22 Jun 2017 23:38:40 +0530
Subject: [PATCH] removed `check-conventions' from make

---
 Makefile                          |   7 +-
 tests/haskell-code-conventions.el | 165 ------------------------------
 2 files changed, 1 insertion(+), 171 deletions(-)
 delete mode 100644 tests/haskell-code-conventions.el

diff --git a/Makefile b/Makefile
index b2c89d6..aa907c5 100644
--- a/Makefile
+++ b/Makefile
@@ -79,12 +79,7 @@ build-$(EMACS_VERSION)/build-flag : build-$(EMACS_VERSION) $(patsubst %.el,build
 check-%: tests/%-tests.el
 	$(BATCH) -l "$<" -f ert-run-tests-batch-and-exit;
 
-check: compile $(AUTOLOADS) check-ert check-conventions
-
-check-conventions :
-	$(BATCH) -l tests/haskell-code-conventions.el                                           \
-                 -f haskell-check-conventions-batch-and-exit
-	@echo "conventions are okay"
+check: compile $(AUTOLOADS) check-ert
 
 check-ert: $(ELCHECKS)
 	$(BATCH) --eval "(when (= emacs-major-version 24)					\
-- 
2.18.0

anch.sh'>log</a><a href='/guix/tree/tests/guix-build-branch.sh?id=fbcb6b2d876a524163401c51462935a03223dfaa'>tree</a><a href='/guix/commit/tests/guix-build-branch.sh?id=fbcb6b2d876a524163401c51462935a03223dfaa'>commit</a><a href='/guix/diff/tests/guix-build-branch.sh?id=fbcb6b2d876a524163401c51462935a03223dfaa'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-build-branch.sh'>
<input type='hidden' name='id' value='fbcb6b2d876a524163401c51462935a03223dfaa'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fbcb6b2d876a524163401c51462935a03223dfaa'>root</a>/<a href='/guix/log/tests?id=fbcb6b2d876a524163401c51462935a03223dfaa'>tests</a>/<a href='/guix/log/tests/guix-build-branch.sh?id=fbcb6b2d876a524163401c51462935a03223dfaa'>guix-build-branch.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-build-branch.sh?id=fbcb6b2d876a524163401c51462935a03223dfaa&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-04-21 16:16:38 +0200'>2023-04-21</span></td><td><a href='/guix/commit/tests/guix-build-branch.sh?id=37dd69b44511dc73eb04bdebe8d82c9a0386338e'>tests: Fix checks for expected failures.</a><span class='msg-avail'>...<span class='msg-tooltip'>Addresses &lt;https://issues.guix.gnu.org/62406&gt;.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&amp;&amp; false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... &amp;&amp; false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2022-10-22 01:46:54 +0200'>2022-10-22</span></td><td><a href='/guix/commit/tests/guix-build-branch.sh?id=fa6566bdc02958823b342b86c7d88853542444ae'>tests: 'guix build --with-commit' output no longer refers to the tag ID.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 46f7011591601b4783b2dc2c7252c41564ca0140.

* tests/guix-build-branch.sh: Replace tag ID by commit ID.
</span></span></td><td>Ludovic Courtès</td></tr>