diff mbox series

[bug#78095,22/28] gnu: emacs-plantuml-mode: Refresh package.

Message ID 20250427145307.16022-22-ngraves@ngraves.fr
State New
Headers
Series More emacs-team updates. |

Commit Message

Nicolas Graves April 27, 2025, 2:52 p.m. UTC 
  * gnu/packages/emacs-xyz.scm (emacs-plantuml-mode):
  [arguments]: Improve style, rewrite using gexps.
  <phases>: Add symlink for tests in phase 'use-local-plantuml.
  <tests?>: Disable them for now.
  <test-command>: Set it.
  [native-inputs]: Add emacs-ert-runner, icedtea.
---
 gnu/packages/emacs-xyz.scm | 54 ++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 26 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7dac9b2c02..d93727cb1b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -40950,32 +40950,34 @@  (define-public emacs-plantuml-mode
        (sha256
         (base32 "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc"))))
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'use-local-plantuml
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((plantuml (assoc-ref inputs "plantuml"))
-                   (file "plantuml-mode.el"))
-               (chmod file #o644)
-               (emacs-substitute-variables file
-                 ("plantuml-jar-path"
-                  (string-append plantuml "/share/java/plantuml.jar"))
-                 ("plantuml-executable-path"
-                  (string-append plantuml "/bin/plantuml"))
-                 ("plantuml-server-url" 'nil)
-                 ("plantuml-default-exec-mode" ''executable))
-               (emacs-batch-edit-file file
-                 `(progn (progn
-                          (goto-char (point-min))
-                          (re-search-forward "(defun plantuml-download-jar")
-                          (beginning-of-line)
-                          (kill-sexp))
-                         (basic-save-buffer)))
-               #t))))))
-    (inputs
-     (list plantuml))
-    (propagated-inputs
-     (list emacs-dash))
+     (list
+      #:tests? #f  ; Unclear why tests fail.
+      #:test-command #~(list "ert-runner")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'use-local-plantuml
+            (lambda* (#:key inputs #:allow-other-keys)
+              (symlink (search-input-file inputs "/bin/plantuml")
+                       "bin/plantuml")
+              (let ((file "plantuml-mode.el"))
+                (chmod file #o644)
+                (emacs-substitute-variables file
+                  ("plantuml-jar-path"
+                   (search-input-file inputs "/share/java/plantuml.jar"))
+                  ("plantuml-executable-path"
+                   (search-input-file inputs "/bin/plantuml"))
+                  ("plantuml-server-url" 'nil)
+                  ("plantuml-default-exec-mode" ''executable))
+                (emacs-batch-edit-file file
+                  `(progn (progn
+                           (goto-char (point-min))
+                           (re-search-forward "(defun plantuml-download-jar")
+                           (beginning-of-line)
+                           (kill-sexp))
+                          (basic-save-buffer)))))))))
+    (inputs (list plantuml))
+    (native-inputs (list emacs-ert-runner icedtea))
+    (propagated-inputs (list emacs-dash))
     (build-system emacs-build-system)
     (home-page "https://github.com/skuro/plantuml-mode")
     (synopsis "Major mode for editing PlantUML sources")