Hi Liliana, >> * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Fix build. >> --- >> gnu/packages/emacs-xyz.scm | 9 +- >> .../emacs-haskell-mode-fix-tests.patch | 282 >> ++++++++++++++++++ >> 2 files changed, 289 insertions(+), 2 deletions(-) >> create mode 100644 gnu/packages/patches/emacs-haskell-mode-fix- >> tests.patch >> >> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm >> index 529e9329d6..9d9669f383 100644 >> --- a/gnu/packages/emacs-xyz.scm >> +++ b/gnu/packages/emacs-xyz.scm >> @@ -1553,11 +1553,16 @@ (define-public emacs-haskell-mode >> (commit version))) >> (file-name (git-file-name name version)) >> (sha256 >> - (base32 >> "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")))) >> + (base32 >> "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")) >> + ;; Submitted for inclusion upstream. >> + ;; Not identical patches due to different target versions. >> + ;; (see: https://github.com/haskell/haskell-mode/pull/1780) >> + (patches >> + (search-patches "emacs-haskell-mode-fix-tests.patch")))) >> (propagated-inputs >> (list emacs-dash)) >> (native-inputs >> - (list emacs-minimal emacs-el-search emacs-stream texinfo)) >> + (list emacs-minimal emacs-el-search emacs-stream texinfo git)) > There are other ways of suppressing errors caused by git. One of them > would be to set vc-handled-backends to nil for the tests.
I apologize for my earlier email. I will modify it in the way you suggested. >> +- "Default build command to use for `haskell-stack-build' when a >> stack file is detected. >> ++ "Default build command to use for `haskell-stack-build' when a >> stack >> ++file is detected.x > Additional x. >> +- (let (htype dir) >> ++ (let (htype dir) > Indentation change? Suppress those, you want to make the diff as small > as possible. Thank you for pointing. I will fix these. >> +- "Generate a regex for searching for any occurrence of the prompt\ >> ++ "Generate a regex for searching for any occurrence of the prompt > LGTM, but you might want to shorten the docstring so that the first > line is a synopsis. This would make it easier for upstream to accept. >> +- "Run a loading-ish COMMAND that wants to pick up type errors\ >> ++ "Run a loading-ish COMMAND that wants to pick up type errors > As above, what is "loading-ish", are "things like that" relevant, etc. I decided not to make these corrections. Because I am not familiar with Haskell and am just one learner, and am not good at English. >> +- ((haskell-mode . ((haskell-w3m-haddock-dirs . >> (\"/home/chris/Projects/foobar/.hsenv/cabal/share/doc\"))))) >> ++ ((haskell-mode . >> ++ ((haskell-w3m-haddock-dirs . >> ++ (\"/home/chris/Projects/foobar/.hsenv/cabal/share/doc\"))))) > Who is chris? But fair enough, the indentation should be right. In all seriousness, that is the name of the author probably. see: https://github.com/haskell/haskell-mode/blob/fe3a8046aa1e1767ddc11a74e3d45bd9c614e655/haskell.el#L3 I will submit a patch v2 soon after this. Cheers
