From patchwork Fri May 9 14:24:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: emma X-Patchwork-Id: 42482 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 DA8E727BC4B; Fri, 9 May 2025 15:25:37 +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=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E70C27BC49 for ; Fri, 9 May 2025 15:25:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDOex-0006XJ-74; Fri, 09 May 2025 10:25:07 -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 1uDOet-0006UA-HF for guix-patches@gnu.org; Fri, 09 May 2025 10:25:04 -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 1uDOet-0007N8-5s for guix-patches@gnu.org; Fri, 09 May 2025 10:25: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:From:Date:To:Subject; bh=4sblKqDdZqEN/l2gERFB6EFVLefsZYXQ44+AsBvPJPI=; b=PsO5WB2DzU36Z0CCrxIvcGCVZ7nvPTV8N7vx9EvE7m/v4p7WCl6XTZbujtI3laEImaZkn47iQki4lBMR/47WVFUzUNDTuS73hxTl66wciJTSlrw8tOJus/Q5s8rtznKtjT49YlAGUIm7MDO35A6aa3ld9S/pLUAmWvr7Jm0KyE7ODAI/L5r/V10ab2yJe9x5nxtxUy5i+/mbBPra0DFzvHWXDqd1EotYVlaJKh/BgDczjPg+FgINMZgTxBFE0QXMdZpwXQuRQIimM3yD/wdprRrZpn1qjTc+4I/ZtaIEFEDGlS2iQYbutecVBhdoQTIjfniEshT02jQtWRnIyDQb2Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDOes-0006ym-Eq for guix-patches@gnu.org; Fri, 09 May 2025 10:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78289] [PATCH] gnu: emacs-lean4-mode: add data dir to output Resent-From: emma Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 14:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78289 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves , "78289@debbugs.gnu.org" <78289@debbugs.gnu.org> Received: via spool by 78289-submit@debbugs.gnu.org id=B78289.174680065926729 (code B ref 78289); Fri, 09 May 2025 14:25:02 +0000 Received: (at 78289) by debbugs.gnu.org; 9 May 2025 14:24:19 +0000 Received: from localhost ([127.0.0.1]:38262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDOeA-0006ws-JC for submit@debbugs.gnu.org; Fri, 09 May 2025 10:24:19 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:60985) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDOe3-0006wM-PR for 78289@debbugs.gnu.org; Fri, 09 May 2025 10:24:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1746800644; x=1747059844; bh=4sblKqDdZqEN/l2gERFB6EFVLefsZYXQ44+AsBvPJPI=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=ZOBzpr7f6jkjKdAxAxLbu6+sBR+/xWoS5/xBjGrABGbkhCXZ2CUPm2fH933TN2rbl l3vic1hD59CYsIx7HkJdqLgIcIH6V7yoDeoGBEEoXpwckXZ5bY48UgNU8YDyWOWQuW qhe69Q963QZn8mXyuaCmChXUUCbNYEZMc+mcHEKejW918ku06EEcvNCFhQ8Fp4iUA9 znvvTvGniabMLR+kvY44bKpVn4TSBBtO6x6FdBrxRUsXPCAcSoEJYkik3fPbQGIdRZ P7vJz28ss1Z6uKkAcn29Udn8dfuhEV0NRy2SdqrPmmFLQthgH2zuEuKToJzC6VMYnN Um08vFdVRc9jg== Date: Fri, 09 May 2025 14:24:02 +0000 Message-ID: In-Reply-To: <8734dfnqaz.fsf@ngraves.fr> References: <1HUYNQgod6lNoiX8xtp9sYqMgPNxsmu-kvTImq7CCxolhmPs-M6Y_BBsgvVVzLDkEksi_WArDSB88myBvxMh60xJVqkC-3ZqkEtBe6t0lBQ=@proton.me> <8734dfnqaz.fsf@ngraves.fr> Feedback-ID: 84785949:user:proton X-Pm-Message-ID: 87974cb9f2053de1a3120696a46faab6184bcca5 MIME-Version: 1.0 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: emma X-ACL-Warn: , emma via Guix-patches X-Patchwork-Original-From: emma via Guix-patches via From: emma 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 hi Nicolas, thank you for the info about guix style! attaching a diff to this reply after applying the updates. my email client has a habit of chewing up patches and send-email is currently throwing errors for me emma (bigbookofbug) EF515F7D600717781DF9AB2E0FB1CF2867A117F5 Sent with Proton Mail secure email. On Thursday, May 8th, 2025 at 2:13 PM, Nicolas Graves wrote: > Hi Emma, > TY for your contribution! > > You can use elpa-directory to make this code easier to read, see for > instance : > https://issues.guix.gnu.org/issue/78315/attachment/51/ > > Also : > - arguments field usually comes after build-system > - the code is not formatted properly. If you don't use a fancy editor > with support for guile, you can always run > ./pre-inst-env guix style emacs-lean4-mode to do it for you. > > Can you submit a new version with that taken into account? Thanks! > > On 2025-05-07 02:25, emma via Guix-patches via wrote: > > > --- > > > > gnu/packages/emacs-xyz.scm | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > > index 50a6f4c386..fd919aa210 100644 > > --- a/gnu/packages/emacs-xyz.scm > > +++ b/gnu/packages/emacs-xyz.scm > > @@ -3081,6 +3081,17 @@ (define-public emacs-lean4-mode > > ;; TODO: Just emacs-magit-section instead of emacs-magit would be enough. > > (propagated-inputs > > (list emacs-compat emacs-lsp-mode emacs-dash emacs-magit)) > > + (arguments > > + (list > > + #:phases > > + #~(modify-phases %standard-phases > > + (add-after 'install 'install-data > > + (lambda _ > > + (let ((data (string-append #$output > > + "/share/emacs/site-lisp/" > > + "lean4-mode-1.1.2/data"))) > > + (mkdir-p data) > > + (copy-recursively "data" data))))))) > > (synopsis "Lean 4 major mode for Emacs") > > (description "This package provides a major mode for the Lean theorem > > prover, version 4.") > > > > base-commit: d110f7dd006f4e47aa56de3cdaf5bb4b82eb5ca2 > > -- > > 2.49.0 > > > > emma (bigbookofbug) > > EF515F7D600717781DF9AB2E0FB1CF2867A117F5 > > > > Sent with Proton Mail secure email. > > > -- > Best regards, > Nicolas Graves From d9b4625639943255cd1c56443bd3068921ece0a1 Mon Sep 17 00:00:00 2001 From: emma thompson Date: Fri, 9 May 2025 09:18:01 -0500 Subject: [PATCH] styling updated --- gnu/packages/emacs-xyz.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fd919aa210..3ec4095ecc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3079,19 +3079,17 @@ (define-public emacs-lean4-mode "1i4l614n0hs02y0a4xfnzc4xkilkp6bzx28pys4jkp96vp2ivf0c")))) (build-system emacs-build-system) ;; TODO: Just emacs-magit-section instead of emacs-magit would be enough. - (propagated-inputs - (list emacs-compat emacs-lsp-mode emacs-dash emacs-magit)) (arguments (list #:phases #~(modify-phases %standard-phases - (add-after 'install 'install-data - (lambda _ - (let ((data (string-append #$output - "/share/emacs/site-lisp/" - "lean4-mode-1.1.2/data"))) - (mkdir-p data) - (copy-recursively "data" data))))))) + (add-after 'install 'install-data + (lambda _ + (let ((data (string-append (elpa-directory #$output) "/data"))) + (mkdir-p data) + (copy-recursively "data" data))))))) + (propagated-inputs + (list emacs-compat emacs-lsp-mode emacs-dash emacs-magit)) (synopsis "Lean 4 major mode for Emacs") (description "This package provides a major mode for the Lean theorem prover, version 4.") -- 2.49.0