diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-06 21:25:43 +0200 |
| commit | 7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df (patch) | |
| tree | 504a250d235a3bc39571e6af1c755077390a371f /gnu/packages/patches/haskell-mode-make-check.patch | |
| parent | f20d1cfb51ed14f325da000406807076323f70bc (diff) | |
| parent | b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 (diff) | |
| download | guix-7ce1b5e7b74d6409d0bd0bc4272f65edc34fd9df.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/haskell-mode-make-check.patch')
| -rw-r--r-- | gnu/packages/patches/haskell-mode-make-check.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/haskell-mode-make-check.patch b/gnu/packages/patches/haskell-mode-make-check.patch deleted file mode 100644 index a4d4d525f2..0000000000 --- a/gnu/packages/patches/haskell-mode-make-check.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - |