From patchwork Sun May 18 08:16:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42724 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 95CCA27BC4B; Sun, 18 May 2025 09:20:41 +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 00A7B27BC49 for ; Sun, 18 May 2025 09:20:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGZG8-0007nN-Su; Sun, 18 May 2025 04:20:36 -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 1uGZFf-0006qE-Jv for guix-patches@gnu.org; Sun, 18 May 2025 04:20:07 -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 1uGZFf-00025K-5h for guix-patches@gnu.org; Sun, 18 May 2025 04:20:07 -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=XteLpLzjfKEt7GMAIgwuQBOadY3EKOOuw6Zfplvebps=; b=uWHr5ZXBayVN7QJXDwqF1QGkhtHoA0Zos4ToUUiVQiFNtTT6ma39PVEWNDDZIOeBdC54oM0jG9KUnPb8ZA0ao3/BSaAvBI45ECbVe5ID1JbJR/a4jHik2s4kMGAwu7muOrLj5in6YtPd5CASlfr5egACCiwWqUEz57ncl/hTNwuK+Ud5r+cbJ1UB0YQrwYe8HxGG9psAY1S7SLKpCusb0H7/U3RtDnB32I7kyhM5XOYmMF3Z74X7yu4v69P5F7ItqWckDolG1DzGVq1M96qyLsTUcQHLT/M3kjnrdw/kMd8J4qV4OBzlWDS7l/NySSvnYea14EuW1MQ7yMURaoojtg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uGZFe-0002Io-Vz for guix-patches@gnu.org; Sun, 18 May 2025 04:20:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH v3 48/53] gnu: emacs-sly-stepper: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 May 2025 08:20:06 +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.17475563698687 (code B ref 78315); Sun, 18 May 2025 08:20:06 +0000 Received: (at 78315) by debbugs.gnu.org; 18 May 2025 08:19:29 +0000 Received: from localhost ([127.0.0.1]:55257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGZF2-0002Fx-Kv for submit@debbugs.gnu.org; Sun, 18 May 2025 04:19:29 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:59387) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGZER-0002Bf-7P for 78315@debbugs.gnu.org; Sun, 18 May 2025 04:18:51 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4b0YcT6RGtz1Zrl; Sun, 18 May 2025 08:18:49 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78315@debbugs.gnu.org>; Sun, 18 May 2025 08:18:49 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.38]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4b0YcT5WrQz1xwp; Sun, 18 May 2025 08:18:49 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 4BD30D43F3B; Sun, 18 May 2025 08:18:49 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G0028f2d33f8-f59b-45c6-b3a3-dfc4483865c2, C6CD5D64AC962E3586D42D3C4756DC5C3DD92CD7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.171.108 Date: Sun, 18 May 2025 10:16:47 +0200 Message-ID: <20250518081658.11362-48-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518081658.11362-1-ngraves@ngraves.fr> References: <20250518081658.11362-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10946280370954691298 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefudektdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkeelrddvtdejrddujedurddutdeknecuvehluhhsthgvrhfuihiivgepieenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeefudehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=XteLpLzjfKEt7GMAIgwuQBOadY3EKOOuw6Zfplvebps=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1747556329; v=1; b=Wm4iIWVpJkX3aR3BcxvAwUx5MZzrvLKOI/cS3o61L61hRYHJsFxkViEKXARWpz+IFCV54TA4 pwPPJAtM99QGF3cSpjrRNimDOu7XbA87aEjEJul+x4xYSZfcK07td3LKRtsWzJw20fT4KuGtoaP D/30rp212pABRVoqXOYAkhs/VF8vcDzMdrGWvGZwEc+EGoglACKK5E2haF4uyAXo42swWtc0BNQ p2AsxUwgkvqabD6QdX8aGKABKtQ+v6ZeqVE6c1yRQpCoV728wigGNZSUBcu4lffte/UCyN7O+7E ic3gME5+OIZgqObibzGaQVAQiFexpl6+R+nP/o4KxgsSg== 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 18d26a8679..8201c7cf55 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18396,53 +18396,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