[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: emacs-haskell-mode: Update to 16.2-1.56e67ee.
|
From: |
guix-commits |
|
Subject: |
01/01: gnu: emacs-haskell-mode: Update to 16.2-1.56e67ee. |
|
Date: |
Thu, 19 Sep 2019 20:35:28 -0400 (EDT) |
leungbk pushed a commit to branch emacs-haskell-mode-update
in repository guix.
commit e958e55b01ebd886cbf60ea56527d44e0c5aa2b2
Author: Brian Leung <address@hidden>
Date: Sun Aug 25 19:37:26 2019 +0200
gnu: emacs-haskell-mode: Update to 16.2-1.56e67ee.
* gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 16.2-1.56e67ee.
* gnu/packages/patches/haskell-mode-make-check.patch: Remove.
* gnu/packages/patches/haskell-mode-unused-variables.patch: Remove.
* local.mk: Remove patches.
---
gnu/local.mk | 2 -
gnu/packages/emacs-xyz.scm | 172 ++++++++++-----------
gnu/packages/patches/haskell-mode-make-check.patch | 35 -----
.../patches/haskell-mode-unused-variables.patch | 44 ------
4 files changed, 85 insertions(+), 168 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8b1b5ce..f482562 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -923,8 +923,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
%D%/packages/patches/gzdoom-search-in-installed-share.patch \
- %D%/packages/patches/haskell-mode-unused-variables.patch \
- %D%/packages/patches/haskell-mode-make-check.patch \
%D%/packages/patches/hdf4-architectures.patch \
%D%/packages/patches/hdf4-reproducibility.patch \
%D%/packages/patches/hdf4-shared-fortran.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 90910b1..dd2d014 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -645,94 +645,92 @@ replacement.")
(license license:gpl3+))))
(define-public emacs-haskell-mode
- (package
- (name "emacs-haskell-mode")
- (version "16.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/haskell/haskell-mode";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"))
- (patches
- (search-patches ; backport test failure fixes
- "haskell-mode-unused-variables.patch"
- "haskell-mode-make-check.patch"))))
- (inputs
- `(("emacs-el-search" ,emacs-el-search) ; for tests
- ("emacs-stream" ,emacs-stream))) ; for tests
- (propagated-inputs
- `(("emacs-dash" ,emacs-dash)))
- (native-inputs
- `(("emacs" ,emacs-minimal)
- ("texinfo" ,texinfo)))
- (build-system gnu-build-system)
- (arguments
- `(#:make-flags (list (string-append "EMACS="
- (assoc-ref %build-inputs "emacs")
- "/bin/emacs"))
- #:modules ((ice-9 match)
- (srfi srfi-26)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before
- 'build 'pre-build
- (lambda* (#:key inputs #:allow-other-keys)
- (define (el-dir store-dir)
- (match (find-files store-dir "\\.el$")
- ((f1 f2 ...) (dirname f1))
- (_ "")))
-
- (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
- (define emacs-prefix? (cut string-prefix? "emacs-" <>))
-
- (setenv "SHELL" "sh")
- (setenv "EMACSLOADPATH"
- (string-concatenate
- (map (match-lambda
- (((? emacs-prefix? name) . dir)
- (string-append (el-dir dir) ":"))
- (_ ""))
- inputs)))
- (substitute* (find-files "." "\\.el") (("/bin/sh") sh))
- ;; embed filename to fix test failure
- (let ((file "tests/haskell-cabal-tests.el"))
- (substitute* file
- (("\\(buffer-file-name\\)")
- (format #f "(or (buffer-file-name) ~s)" file))))
- #t)))
- (replace
- 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (el-dir (string-append out "/share/emacs/site-lisp"))
- (doc (string-append
- out "/share/doc/haskell-mode-" ,version))
- (info (string-append out "/share/info")))
- (define (copy-to-dir dir files)
- (for-each (lambda (f)
- (install-file f dir))
- files))
-
- (with-directory-excursion "doc"
- (invoke "makeinfo" "haskell-mode.texi")
- (install-file "haskell-mode.info" info))
- (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md"))
- (copy-to-dir el-dir (find-files "." "\\.elc?"))
- ;; These are part of other packages.
- (with-directory-excursion el-dir
- (for-each delete-file '("dash.el" "ert.el")))
- #t))))))
- (home-page "https://github.com/haskell/haskell-mode";)
- (synopsis "Haskell mode for Emacs")
- (description
- "This is an Emacs mode for editing, debugging and developing Haskell
+ (let ((commit "56d67ee282294c786a92e2d83c5bebf1a6d919c1")
+ (revision "1"))
+ (package
+ (name "emacs-haskell-mode")
+ (version (git-version "16.2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/haskell/haskell-mode";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
"1wschs4ny2b40bg8z86vc73zq32bv9mcxkyvgbmza44zvhqpdkwp"))))
+ (inputs
+ `(("emacs-el-search" ,emacs-el-search) ; for tests
+ ("emacs-stream" ,emacs-stream))) ; for tests
+ (propagated-inputs
+ `(("emacs-dash" ,emacs-dash)))
+ (native-inputs
+ `(("emacs" ,emacs-minimal)
+ ("texinfo" ,texinfo)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags (list (string-append "EMACS="
+ (assoc-ref %build-inputs "emacs")
+ "/bin/emacs"))
+ #:modules ((ice-9 match)
+ (srfi srfi-26)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before
+ 'build 'pre-build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (el-dir store-dir)
+ (match (find-files store-dir "\\.el$")
+ ((f1 f2 ...) (dirname f1))
+ (_ "")))
+
+ (let ((sh (string-append (assoc-ref inputs "bash") "/bin/sh")))
+ (define emacs-prefix? (cut string-prefix? "emacs-" <>))
+
+ (setenv "SHELL" "sh")
+ (setenv "EMACSLOADPATH"
+ (string-concatenate
+ (map (match-lambda
+ (((? emacs-prefix? name) . dir)
+ (string-append (el-dir dir) ":"))
+ (_ ""))
+ inputs)))
+ (substitute* (find-files "." "\\.el") (("/bin/sh") sh))
+ ;; embed filename to fix test failure
+ (let ((file "tests/haskell-cabal-tests.el"))
+ (substitute* file
+ (("\\(buffer-file-name\\)")
+ (format #f "(or (buffer-file-name) ~s)" file))))
+ #t)))
+ (replace
+ 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (el-dir (string-append out "/share/emacs/site-lisp"))
+ (doc (string-append
+ out "/share/doc/haskell-mode-" ,version))
+ (info (string-append out "/share/info")))
+ (define (copy-to-dir dir files)
+ (for-each (lambda (f)
+ (install-file f dir))
+ files))
+
+ (with-directory-excursion "doc"
+ (invoke "makeinfo" "haskell-mode.texi")
+ (install-file "haskell-mode.info" info))
+ (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md"))
+ (copy-to-dir el-dir (find-files "." "\\.elc?"))
+ ;; These are part of other packages.
+ (with-directory-excursion el-dir
+ (for-each delete-file '("dash.el" "ert.el")))
+ #t))))))
+ (home-page "https://github.com/haskell/haskell-mode";)
+ (synopsis "Haskell mode for Emacs")
+ (description
+ "This is an Emacs mode for editing, debugging and developing Haskell
programs.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public haskell-mode
(deprecated-package "haskell-mode" emacs-haskell-mode))
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 a4d4d52..0000000
--- 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 <address@hidden>
-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
-
diff --git a/gnu/packages/patches/haskell-mode-unused-variables.patch
b/gnu/packages/patches/haskell-mode-unused-variables.patch
deleted file mode 100644
index b175fae..0000000
--- a/gnu/packages/patches/haskell-mode-unused-variables.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Copied verbatim from upstream repository.
-
-From cee22450ee30e79952f594796721dc6b17798ee6 Mon Sep 17 00:00:00 2001
-From: Sascha Wilde <address@hidden>
-Date: Fri, 23 Sep 2016 15:35:59 +0200
-Subject: [PATCH] Removed unused lexical variables.
-
----
- haskell-lexeme.el | 3 +--
- haskell-process.el | 4 +---
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/haskell-lexeme.el b/haskell-lexeme.el
-index 4256a79..b832560 100644
---- a/haskell-lexeme.el
-+++ b/haskell-lexeme.el
-@@ -138,8 +138,7 @@ When match is successful, match-data will contain:
- (match-text 2) - whole qualified identifier
- (match-text 3) - unqualified part of identifier
- (match-text 4) - closing backtick"
-- (let ((begin (point))
-- (match-data-old (match-data))
-+ (let ((match-data-old (match-data))
- first-backtick-start
- last-backtick-start
- qid-start
-diff --git a/haskell-process.el b/haskell-process.el
-index b4efba2..4f3f859 100644
---- a/haskell-process.el
-+++ b/haskell-process.el
-@@ -160,9 +160,7 @@ HPTYPE is the result of calling `'haskell-process-type`'
function."
- (defun haskell-process-log (msg)
- "Effective append MSG to the process log (if enabled)."
- (when haskell-process-log
-- (let* ((append-to (get-buffer-create "*haskell-process-log*"))
-- (windows (get-buffer-window-list append-to t t))
-- move-point-in-windows)
-+ (let* ((append-to (get-buffer-create "*haskell-process-log*")))
- (with-current-buffer append-to
- ;; point should follow insertion so that it stays at the end
- ;; of the buffer
---
-2.18.0
-