guix_mirror_bot pushed a commit to branch emacs-team
in repository guix.
commit 57087fbd3404a5131b42bb8fceb674ebd891d50e
Author: Morgan Smith <[email protected]>
AuthorDate: Sat Aug 29 15:43:08 2026 -0400
gnu: emacs-haskell-mode: Update to 17.5-1.d252d4a.
* gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.5-1.d252d4a.
[build-system]: Switch to emacs-build-system.
[arguments]: Remove #:make-flags, #:modules, and #:imported-modules.
Add #:test-command.
<#:phases>: Drop deletion of ‘configure’ and replacement for ‘install’.
Remove ‘pre-build’
Adjust ‘delete-failing-tests’ accordingly.
Add ‘make-info’.
[native-inputs]: Remove emacs-minimal, emacs-el-search and emacs-stream.
Order after arguments.
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/emacs-xyz.scm | 76 ++++++++++++++--------------------------------
1 file changed, 22 insertions(+), 54 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 731f81a1c0..c027873d95 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4486,8 +4486,8 @@ replacement.")
(license license:gpl3+))))
(define-public emacs-haskell-mode
- (let ((commit "e9c356739310332afe59b10ffa2e6c3e76f124e3")
- (revision "0"))
+ (let ((commit "d252d4a6feb3b15e4d0be88e6a42b98d8f5766ba")
+ (revision "1"))
(package
(name "emacs-haskell-mode")
(version (git-version "17.5" revision commit))
@@ -4499,45 +4499,17 @@ replacement.")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "1mkp9b31ai1z6sccx8cff40viryamw7dm85acig3q82dwlbmxx98"))))
- (propagated-inputs
- (list emacs-dash))
- (native-inputs
- (list emacs-minimal emacs-el-search emacs-stream texinfo))
- (build-system gnu-build-system)
+ (base32 "06ic6w36db2h0bfavwrrcnas8va95cdwfsiw736mn7m8qbcy7xli"))))
+ (build-system emacs-build-system)
(arguments
(list
- #:make-flags #~(list
- (string-append "EMACS=" #$emacs-minimal "/bin/emacs"))
- #:modules `((ice-9 match)
- (srfi srfi-26)
- ((guix build emacs-build-system) #:prefix emacs:)
- ,@%default-gnu-imported-modules)
- #:imported-modules `(,@%default-gnu-imported-modules
- (guix build emacs-build-system)
- (guix build emacs-utils))
+ #:test-command
+ #~(list "emacs" "-Q" "--batch"
+ "-L" "tests"
+ "--eval=(mapc 'load (directory-files \"tests\" t \"\\.el$\"))"
+ "-f" "ert-run-tests-batch-and-exit")
#: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 (search-input-file inputs "/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)))))
(add-before 'check 'delete-failing-tests
;; XXX: these tests require GHC executable, which would be a big
;; native input.
@@ -4555,24 +4527,20 @@ replacement.")
;; requires many external tools (e.g. git, hasktags)
(substitute* "haskell-mode-tests.el"
(("\\(ert-deftest haskell-generate-tags.*" all)
- (string-append all " (skip-unless nil)"))))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (el-dir (emacs:elpa-directory out))
- (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))
+ (string-append all " (skip-unless nil)")))
- (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?"))))))))
+ ;; TODO: why are these failing?
+ (substitute* "haskell-mode-tests.el"
+ (("\\(ert-deftest haskell-stylish-on-save-add-first-line.*"
all)
+ (string-append all " (skip-unless nil)")))
+ (substitute* "haskell-exec-tests.el"
+ (("\\(ert-deftest haskell-exec-subst-script.*" all)
+ (string-append all " (skip-unless nil)"))))))
+ (add-before 'install 'make-info
+ (lambda _
+ (with-directory-excursion "doc"
+ (invoke "makeinfo" "--no-split" "haskell-mode.texi")))))))
+ (native-inputs (list texinfo))
(home-page "https://github.com/haskell/haskell-mode";)
(synopsis "Haskell mode for Emacs")
(description
