From patchwork Sun Apr 27 14:52:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42081 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A1DBC27BC4D; Sun, 27 Apr 2025 15:55:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 68B1627BC4A for ; Sun, 27 Apr 2025 15:55:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u93Pf-0007x2-G9; Sun, 27 Apr 2025 10:55:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u93PM-0007am-66 for guix-patches@gnu.org; Sun, 27 Apr 2025 10:55:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u93PL-0001WL-Sm for guix-patches@gnu.org; Sun, 27 Apr 2025 10:55:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=wA67jOCikkpkj27ocUMd5G4mCNxqBKiqvPBjNK6BqTY=; b=qDsvBMVpGDURYCYfe4oY9v52qzFHNd2c9d1uCHhu7bGoDIlw23stf2H53pGjnpBJhyDtzeKmDSQkJWg3WXWDSA3R7QEQ85HjfFYuXzdAzsATYmD09h2H+Q5FdGJPmRfDT6UEz6znfP0J3+yxl/eAeu09yJkDsB3oUy3e38pu0iN4wo0YiE8MWdX89DBPw/k6k0/+kaXoCUqnKroh4DHyFh/GnHk7jvYYbyM3CrmFXCv99zcI3Unh/B1Ms6oYGMnAYwoiLB74NdCnPoutyfVwL3JGMC0OSKCHzURvFfkjGTy/Bggu8sgdPT4ykaz1Lj9+YLPnCgX8Cq5JAI1H5bRjQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u93PL-00068N-OK for guix-patches@gnu.org; Sun, 27 Apr 2025 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78095] [PATCH 22/28] gnu: emacs-plantuml-mode: Refresh package. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Apr 2025 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78095 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78095@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78095-submit@debbugs.gnu.org id=B78095.174576565323407 (code B ref 78095); Sun, 27 Apr 2025 14:55:03 +0000 Received: (at 78095) by debbugs.gnu.org; 27 Apr 2025 14:54:13 +0000 Received: from localhost ([127.0.0.1]:43464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u93OX-00065N-2I for submit@debbugs.gnu.org; Sun, 27 Apr 2025 10:54:13 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:53675) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u93OD-00060T-Gz for 78095@debbugs.gnu.org; Sun, 27 Apr 2025 10:53:54 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZlqN00QWDz1Tx4; Sun, 27 Apr 2025 14:53:52 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78095@debbugs.gnu.org>; Sun, 27 Apr 2025 14:53:51 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.140.31]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZlqMz5Vb3zHZcS; Sun, 27 Apr 2025 14:53:51 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id ECE48263A62; Sun, 27 Apr 2025 14:53:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-95G00121179db7-4e28-4900-b119-e8979ee9f4da, 9AB25D737CCC7858AAE0948041C432A519AE1DDE) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.145.66.100 Date: Sun, 27 Apr 2025 16:52:56 +0200 Message-ID: <20250427145307.16022-22-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250427145307.16022-1-ngraves@ngraves.fr> References: <20250427145307.16022-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4971692514944738018 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheekfeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpudejiedrudeghedrieeirddutddtnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=wA67jOCikkpkj27ocUMd5G4mCNxqBKiqvPBjNK6BqTY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745765632; v=1; b=igFgKTNhV6raVGi829SmIKB+RYuiUSoA9jqiHf1Pole/V0y4/8GIYDxg+aZRykEKbjuau1jm Q9fk5Pu8HZ6ZqyIRD1+dvfG5D6IDfZkWcok+Hc/iRaUfquyhiscjxs3canJ+jUoE7wRKGYad5fo r2ZAfuO57EPHfMdOxnkxtyuBbtypGOU31Q2MWLM+xJ65bibnrziAzx7hZvFp4v6NFLR1tQyNyIT 2ymlYvk2XJsv2ntyF01PQDDUhbFIYRTsyp/E6CJtIQxQd4yfzhibKBGDDwxd3OgcyoFfWNyLR3V VHC6YwaN0qJqvVHn4ttJJsAbQBXtiftSw2hGttoj/tP8w== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-plantuml-mode): [arguments]: Improve style, rewrite using gexps. : Add symlink for tests in phase 'use-local-plantuml. : Disable them for now. : Set it. [native-inputs]: Add emacs-ert-runner, icedtea. --- gnu/packages/emacs-xyz.scm | 54 ++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 26 deletions(-) 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")