From patchwork Sat Nov 26 10:09:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44864 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 C7D8827BBED; Sat, 26 Nov 2022 10:10:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BAACB27BBEC for ; Sat, 26 Nov 2022 10:10:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oys8K-0004Pc-Rs; Sat, 26 Nov 2022 05:10:04 -0500 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 1oys8I-0004PB-Gz for guix-patches@gnu.org; Sat, 26 Nov 2022 05:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oys8I-0004Cv-7X for guix-patches@gnu.org; Sat, 26 Nov 2022 05:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oys8I-0003we-2t for guix-patches@gnu.org; Sat, 26 Nov 2022 05:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59604] [PATCH] gnu: emacs-rec-mode: Patch executable paths. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Nov 2022 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59604 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59604@debbugs.gnu.org Cc: "\(" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166945736115111 (code B ref -1); Sat, 26 Nov 2022 10:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Nov 2022 10:09:21 +0000 Received: from localhost ([127.0.0.1]:37868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oys7d-0003vf-B8 for submit@debbugs.gnu.org; Sat, 26 Nov 2022 05:09:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:53678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oys7b-0003vX-Ao for submit@debbugs.gnu.org; Sat, 26 Nov 2022 05:09:20 -0500 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 1oys7a-0004I2-E2 for guix-patches@gnu.org; Sat, 26 Nov 2022 05:09:18 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oys7Y-00048f-1D for guix-patches@gnu.org; Sat, 26 Nov 2022 05:09:18 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 35E684111D; Sat, 26 Nov 2022 11:09:12 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CZkECYvt6Hb7; Sat, 26 Nov 2022 11:09:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1669457350; bh=m6pQHAhp5yHWpWkMjXkDCJ1w45irExmYOLppom75iVs=; h=From:To:Cc:Subject:Date:From; b=Pv/yqGfZxFI/BOPs6un60wouoyJB+uph+SPxFZxwH7cf5y+d39EkgXtG5WkOYd5HO 5bCesJigyeWvak1uGFHDg4W/0Y14hKkR4JxN74yO0UOBd1eI34LdsbwFSKnzesQ4l/ //eJCCf8WtqCvX+lMt/YtnuwJb6SunwxG01+auoyX5NegRdoyVNgfzP32BUm4xH23f BumebifFRoMHx8CmAYAokfwLqQMHVVV7XyXVQhkfssmPpb8owYO0pb7sEVovqeZIYI 2a6ArD2N4QmR3lh8h/gFbpKdn8tRmUjY8Erw2SLBq8GlrX26S/yPiLw+pQd7n1iQio MZX718NgiLcRw== Date: Sat, 26 Nov 2022 10:09:05 +0000 Message-Id: <20221126100905.2835-1-paren@disroot.org> MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" 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/databases.scm (emacs-rec-mode)[source]: Add FILE-NAME. [arguments]: Use G-expressions. <#:phases>{'patch-program-paths}: New phase. [inputs]: Add RECUTILS. --- gnu/packages/databases.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) base-commit: 4a97591d0a13e88037b3073bd891bcdf35352f87 diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e4dde1b22b..d9930de8fd 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1625,24 +1625,32 @@ (define-public emacs-rec-mode (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "rec-mode-" version ".tar")) + (file-name (string-append name "-" version ".tar")) + (snippet #~(delete-file "rec-mode.info")) (sha256 (base32 - "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x")) - (snippet '(begin (delete-file "rec-mode.info"))))) + "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x")))) (build-system emacs-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (invoke "makeinfo" "--no-split" - "-o" "rec-mode.info" "rec-mode.texi")))))) - (native-inputs - (list texinfo)) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-program-paths + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "rec-mode.el" + ("rec-recfix" (search-input-file inputs "bin/recfix")) + ("rec-recinf" (search-input-file inputs "bin/recinf")) + ("rec-recsel" (search-input-file inputs "bin/recsel"))))) + (add-before 'install 'make-info + (lambda _ + (invoke "makeinfo" "--no-split" + "-o" "rec-mode.info" "rec-mode.texi")))))) + (inputs (list recutils)) + (native-inputs (list texinfo)) (home-page "https://www.gnu.org/software/recutils/") (synopsis "Emacs mode for working with recutils database files") - (description "This package provides an Emacs major mode @code{rec-mode} -for working with GNU Recutils text-based, human-editable databases. It + (description + "This package provides an Emacs major mode @code{rec-mode} for +working with GNU Recutils text-based, human-editable databases. It supports editing, navigation, and querying of recutils database files including field and record folding.") (license license:gpl3+)))