Subject: [PATCH 02/28] gnu: emacs-haskell-mode: Update to 17.5-0.e9c3567.

From: Nicolas Graves <[email-masked]>
Date: Sun, 27 Apr 2025 16:52:36 +0200

* gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.5-0.e9c3567.
---
 gnu/packages/emacs-xyz.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ad9add40f5..8be4705c87 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2966,18 +2966,20 @@ (define-public emacs-unpackaged-el
       (license license:gpl3+))))
 
 (define-public emacs-haskell-mode
-  (package
+  (let ((commit "e9c356739310332afe59b10ffa2e6c3e76f124e3")
+        (revision "0"))
+    (package
     (name "emacs-haskell-mode")
-    (version "17.5")
+    (version (git-version "17.5" revision commit))
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/haskell/haskell-mode")
-             (commit (string-append "v" version))))
+             (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf"))))
+        (base32 "1mkp9b31ai1z6sccx8cff40viryamw7dm85acig3q82dwlbmxx98"))))
     (propagated-inputs
      (list emacs-dash))
     (native-inputs
@@ -3056,7 +3058,7 @@ (define (copy-to-dir dir files)
     (description
      "This is an Emacs mode for editing, debugging and developing Haskell
 programs.")
-    (license license:gpl3+)))
+    (license license:gpl3+))))
 
 (define-public emacs-lean4-mode
   (package
@@ -12191,6 +12193,7 @@ (define-public emacs-jedi
     (build-system emacs-build-system)
     (arguments
      (list
+      #:test-command #~(list "make" "test" "CASK=")
       #:imported-modules `(,@%emacs-build-system-modules
                            (guix build python-build-system))
       #:modules '((guix build emacs-build-system)
@@ -12199,6 +12202,11 @@ (define-public emacs-jedi
                   (guix build utils))
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'avoid-server-installation-for-tests
+            (lambda _
+              (substitute* "Makefile"
+                (("env: .*$")
+                 (string-append "env: " #$output "/bin/jediepcserver\n")))))
           (add-after 'unpack 'ensure-no-mtimes-pre-1980
             (assoc-ref python:%standard-phases
                        'ensure-no-mtimes-pre-1980))
-- 
2.49.0