From patchwork Thu May 8 12:50:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42449 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 0F19E27BC4B; Thu, 8 May 2025 13:54:15 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 6F17327BC49 for ; Thu, 8 May 2025 13:54:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD0kv-0008N7-Hh; Thu, 08 May 2025 08:53:41 -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 1uD0kK-0007r0-7F for guix-patches@gnu.org; Thu, 08 May 2025 08:53:09 -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 1uD0kJ-00067R-RK for guix-patches@gnu.org; Thu, 08 May 2025 08:53: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=Mlk3+o/+zZgEUOrrf8R8UcoJwzwRJDqRbfgf9eka9EA=; b=N4Oovqj5ZOITn9sQt+acLWI6WztHB7GEfBPxTbCrp10pz+hfPMpLxbph/qYgKCF8Ib76VUMSXZ9Mtmu3AUo6RK7Pmy3z1iwyQdEzypICxjUzHav8Q4Xhcs5qWm3dSblvA+RBtixtnHWlkTuSBrNmmzY+nUOojUxW4DRhGpMkKiBK+b7XP80qGaxEvye8CaxpCBwyh8DcbJ9SmPdqIK4PbppHWe1vbimpWryGXAVyj9yMBx5K1RoMnTlvnekynJISHNbvGhnxRkNvONRYhau2G3i87kvNpfaHkqwHvP1IBbO8IFQ+XCkehr+eMRIrMASDUfDP3om7bHxv7KCCfnCDDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uD0kJ-0001d1-Ja for guix-patches@gnu.org; Thu, 08 May 2025 08:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH 49/53] gnu: emacs-sly-stepper: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 12:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78315@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78315-submit@debbugs.gnu.org id=B78315.17467087746206 (code B ref 78315); Thu, 08 May 2025 12:53:03 +0000 Received: (at 78315) by debbugs.gnu.org; 8 May 2025 12:52:54 +0000 Received: from localhost ([127.0.0.1]:55540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uD0k9-0001bx-H8 for submit@debbugs.gnu.org; Thu, 08 May 2025 08:52:53 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:40753) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uD0jI-0001Qq-62 for 78315@debbugs.gnu.org; Thu, 08 May 2025 08:52:02 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX8G37Tyz1gjm; Thu, 8 May 2025 12:51:58 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78315@debbugs.gnu.org>; Thu, 8 May 2025 12:51:58 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.118]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX8G1np9z5xL6; Thu, 8 May 2025 12:51:58 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E66B4DA3AE0; Thu, 8 May 2025 12:51:57 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G00424345258-ca2e-4c2c-bc6d-7b1af4eb5fea, DDC873FDB2A8922E808BA1EA95701B978C004A90) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 8 May 2025 14:50:51 +0200 Message-ID: <20250508125104.26530-49-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508125104.26530-1-ngraves@ngraves.fr> References: <20250508125104.26530-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12172666845544506082 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeljeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpeejnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Mlk3+o/+zZgEUOrrf8R8UcoJwzwRJDqRbfgf9eka9EA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746708718; v=1; b=MPitx8Q8psjHXOL9ynDlsAqcm3yh6WaPUetYxNcfO51ktnniC8BPSfjuvX4rT/P/9DF3hEVs TmxcCe8k1mgMQfE7QughL5YhjKN+TLDZubydv1HC1BDk4u9YyucnfzBXxHG/GPJIEZkr2wS9auv 63nPZExzTEB3hTpkNHvg+M/ZKGrle1N8KnrBcdKUol27skR95LFpfCcAO/KxGn0A9suKzvfwU0y fdegvA/XgGANuj0pgVtDVuaH1xvZHdkftB3Eycye6tBM2TBqA1c1q3XueYZ8kGElsZfTHkkX8w7 1iW2GVrrIctgvwTXTcx7sfJhWU7m5VJ+qoZFCN3MXFOFw== 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-sly-stepper): Improve style. [source]: Use gexps, use for-each instead of map. [arguments]: Use gexps, elpa-directory, emacs-substitute-sexps. --- gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 404316f0c5..de36ff5e0b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18397,53 +18397,44 @@ (define-public emacs-sly-stepper (package (name "emacs-sly-stepper") (version (git-version "0.0.0" "2" commit)) - (home-page "https://github.com/joaotavora/sly-stepper") (source (origin (method git-fetch) (uri (git-reference - (url home-page) + (url "https://github.com/joaotavora/sly-stepper") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "07p0k797fagn1qha191p6g2b55hsqqkcj59mh0ms9id0ildydil0")) + (base32 "07p0k797fagn1qha191p6g2b55hsqqkcj59mh0ms9id0ildydil0")) (modules '((guix build utils))) - (snippet - '(begin - (map delete-file (find-files "." ".*-autoloads\\.elc?$")) - #t)))) + (snippet #~(for-each delete-file + (find-files "." ".*-autoloads\\.elc?$"))))) (build-system emacs-build-system) - (inputs - (list cl-agnostic-lizard)) - (propagated-inputs - (list emacs-sly)) (arguments - `(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) - #:phases - (modify-phases %standard-phases - (add-after 'expand-load-path 'expand-sly-contrib - (lambda* (#:key inputs #:allow-other-keys) - (let* ((sly (assoc-ref inputs "emacs-sly")) - (contrib (find-files sly "^contrib$" #:directories? #t))) - (setenv "EMACSLOADPATH" - (string-append (string-join contrib ":") - ":" - (getenv "EMACSLOADPATH")))))) - (add-after 'install 'find-agnostic-lizard - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append (elpa-directory out) - "/slynk-stepper.lisp")) - (asd (search-input-file inputs "\ -share/common-lisp/systems/agnostic-lizard.asd"))) - ;; agnostic-lizard is found at runtime. - (substitute* file - (("\\(require :asdf\\)") - (string-append - "(require :asdf)\n" - " (funcall (read-from-string \"asdf:load-asd\")\n" - " \"" asd "\")\n"))))))))) + (list + #:include + #~(cons* "\\.lisp$" "\\.asd$" %default-include) + #:phases + #~(modify-phases %standard-phases + (add-after 'expand-load-path 'expand-sly-contrib + (lambda _ + (setenv "EMACSLOADPATH" + (string-append (elpa-directory + #$(this-package-input "emacs-sly")) + "/contrib:" (getenv "EMACSLOADPATH"))))) + (add-after 'install 'find-agnostic-lizard + (lambda* (#:key inputs #:allow-other-keys) + (let ((file (string-append (elpa-directory #$output) + "/slynk-stepper.lisp"))) + ;; agnostic-lizard is found at runtime. + (emacs-substitute-sexps file + ("(require :asdf)" + `(funcall (read-from-string "asdf:load-asd") + ,(search-input-file inputs "\ +share/common-lisp/systems/agnostic-lizard.asd")))))))))) + (inputs (list cl-agnostic-lizard)) + (propagated-inputs (list emacs-sly)) + (home-page "https://github.com/joaotavora/sly-stepper") (synopsis "Portable Common Lisp stepper interface for Emacs") (description "This package features a new, portable, visual stepping facility for