From patchwork Thu May 8 12:50:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42437 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 A18A827BC4A; Thu, 8 May 2025 13:54:01 +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=unavailable 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 280C027BC49 for ; Thu, 8 May 2025 13:53:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD0jt-0007Vs-9T; Thu, 08 May 2025 08:52:37 -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 1uD0jY-0007Eb-2H for guix-patches@gnu.org; Thu, 08 May 2025 08:52:16 -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 1uD0jX-0005tc-Oc for guix-patches@gnu.org; Thu, 08 May 2025 08:52:15 -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=j/2QDltEQc2t/MUjn5X7NVnr3Fkihk3o1aMi2OHT+5M=; b=kQbMzGpMnQjQN0hJK2hzFRe8rss+h8jLr6sqtmeiPH7i6TyS7WnoB8iJCb4erwUSkePdTbR8nTX+C1W96IPOPCx0zzxTgxVc/jHqetC9jlJtdrjpz5rQAdZkjx8Shcjbi8jaVNP34Xrpw0CFR+jAW2MSVdhdTQ6/LcuvAasCCZ/hbxcDtE7LtuLbp3wqUbuLXxRREPm9VpD+0ImvvZCsE64wY9chD28se/A63d5+NTiAGnxJs/9pSVYuDFrLr2w9ZWkY5LRAGzhnbh4kXHggdQ9xhTBbms4rT0qgOaQijI4T09JMVeketHi1k1/mb6Szz5I0rXDdOaiUjMWydO8/XA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uD0jX-0001Wn-Ey for guix-patches@gnu.org; Thu, 08 May 2025 08:52:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78315] [PATCH 17/53] gnu: emacs-emacsql: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 12:52:15 +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.17467087145416 (code B ref 78315); Thu, 08 May 2025 12:52:15 +0000 Received: (at 78315) by debbugs.gnu.org; 8 May 2025 12:51:54 +0000 Received: from localhost ([127.0.0.1]:55404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uD0jB-0001P7-US for submit@debbugs.gnu.org; Thu, 08 May 2025 08:51:54 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:39791) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uD0ip-0001L1-Qx for 78315@debbugs.gnu.org; Thu, 08 May 2025 08:51:32 -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 4ZtX7k2q4Rz1gjP; Thu, 8 May 2025 12:51:30 +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:30 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.113]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZtX7k1b1fz5xKr; Thu, 8 May 2025 12:51:30 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.1]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E7075D43CF5; Thu, 8 May 2025 12:51:29 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005203a1762-557a-458a-90cb-0b96d6e0d16f, DDC873FDB2A8922E808BA1EA95701B978C004A90) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 8 May 2025 14:50:19 +0200 Message-ID: <20250508125104.26530-17-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: 12164785544361403106 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeljeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=j/2QDltEQc2t/MUjn5X7NVnr3Fkihk3o1aMi2OHT+5M=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1746708690; v=1; b=UqEZ9KGoV6gK204fhL7WAh7WDIFqyMyDiGsPzzeeIjUMbH+SBuVbJLAEYwZMyj1goGqWn8hJ S+iIeLMAaXj5Gymie9ntrBhzSJ2hMonbCF6eqJZgVUZUlJumGn+e1Amw54V0imxYn4tMLLX8531 KJxD7pqo8ApEaZj5uw/ZFYu1+Q60Fuc+567b141ohhwK0gUJ9q3C0OkqUMIux8QT1H4hYO2HTun hn4PEuG1ahZn3//UyeUbmyA9iY6yHgdJwAQh07Wn9KV2W7u4rgysLMEzJQnVEJeNPscqkMvnQdh cQHugr3cPSu1KstwRyTKqOgs1ZKlHlXdmcI0/bb7ksNnA== 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-emacsql): [arguments]: Improve style of 'fix-executable-paths. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cfd0a951fa..6af0109b5d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25919,12 +25919,12 @@ (define-public emacs-emacsql #~(modify-phases %standard-phases (add-after 'unpack 'fix-executable-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((mdb (assoc-ref inputs "mariadb")) - (psql (assoc-ref inputs "postgresql"))) - (emacs-substitute-variables "emacsql-psql.el" - ("emacsql-psql-executable" (string-append psql "/bin/psql"))) - (emacs-substitute-variables "emacsql-mysql.el" - ("emacsql-mysql-executable" (string-append mdb "/bin/mysql"))))))))) + (emacs-substitute-variables "emacsql-psql.el" + ("emacsql-psql-executable" + (search-input-file inputs "bin/psql"))) + (emacs-substitute-variables "emacsql-mysql.el" + ("emacsql-mysql-executable" + (search-input-file inputs "/bin/mysql")))))))) (inputs (list mariadb postgresql)) (native-inputs (list emacs-sqlite3-api)) (home-page "https://github.com/magit/emacsql")