From patchwork Mon Feb 1 12:47:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 26806 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 D5A8D27BC1D; Mon, 1 Feb 2021 12:48:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8770E27BC1D for ; Mon, 1 Feb 2021 12:48:12 +0000 (GMT) Received: from localhost ([::1]:34554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6Yck-0000cy-Nh for patchwork@mira.cbaines.net; Mon, 01 Feb 2021 07:48:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6Ycd-0000ce-9X for guix-patches@gnu.org; Mon, 01 Feb 2021 07:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6Ycc-0003Bu-NN for guix-patches@gnu.org; Mon, 01 Feb 2021 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6Ycc-0002gh-M1 for guix-patches@gnu.org; Mon, 01 Feb 2021 07:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 12:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46235@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161218367210296 (code B ref -1); Mon, 01 Feb 2021 12:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Feb 2021 12:47:52 +0000 Received: from localhost ([127.0.0.1]:59323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6YcL-0002ft-Vd for submit@debbugs.gnu.org; Mon, 01 Feb 2021 07:47:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:56528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6YcJ-0002fi-5v for submit@debbugs.gnu.org; Mon, 01 Feb 2021 07:47:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6YcI-0000Of-Q9 for guix-patches@gnu.org; Mon, 01 Feb 2021 07:47:42 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6YcB-00031M-CA for guix-patches@gnu.org; Mon, 01 Feb 2021 07:47:41 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 583855C0117 for ; Mon, 1 Feb 2021 07:47:33 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 01 Feb 2021 07:47:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=TQfpDIRpbMLegrlBjR3SVIfhrp sO2zkQ8NO/KebpDcE=; b=oks7cmasi4Gx7Rqct5jfwCokGB1I7BVgLd6KVaGUgL GRMPfbdVxW94q17DOiAGWA7U6q+xMEuNjeLJO5Vy9H1Xsdv4KVycoaDugo/KivUD 3biDzL908ppx3Hr+XF9Awam7qwU6MX9ycig1yyxQS+HOoUIhyyk3gltJCKJ0SVlg C0i0j/VmDv4sxvZ+L3x4KJV6gzBbm0VvOVQFgm/+eOKSmDY9eosA9b5MEiTUGRl9 7WglNB4RHugpr+ijGiaJ9uk7e9aC7ZynfzhoPjOU8ldftg3LUHOCVEzbotkCuB3w jHMZk6KhrRVTGXM8SKi3sAJxZ8366zc0/VM7lfpUFf4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=TQfpDI RpbMLegrlBjR3SVIfhrpsO2zkQ8NO/KebpDcE=; b=GRHe9Nn4A3iKiWaSqouS3c 8IqT2yl2eqSYlhfshIw86AuGkwZr/R93d6WLeqH6ut+EJ6R9W2XESKi70zaRNyNw FVptZv+PAuNrkquujmkgATmG4jjLgEHpd+MKaHw44J7O9K6cqxhFPvPLiQrgG8eu ZapSga75X2ORA8EGsZYdK8HTmhuK+SK3bi5W9v+lPJTho2l27HUVAksOVmsOlkv8 98aPxiP88u88yMGzmn56dFoT/IpXmGb8aQMQHUOBVujjaPjrh0k+gfaC/RhKrIy3 Y0wjyeIXiWO+mO3V4m5qZebX1YacDdfhgo8G/5U0/Cv2FGQgV/qjSwAs073zGB4A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfeekgdeggecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghmvghnthes lhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeegvefggedtleekieevhe effeelieefieekveejvdeuffekuefgjeeitefftdfhjeenucffohhmrghinheprhgvrggu thhhvgguohgtshdrihhonecukfhppeeivddrvdefrdduieejrddukeeknecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghlvghmvghntheslhgr shhsihgvuhhrrdhorhhg X-ME-Proxy: Received: from newt.Parrot.Biz (smtp.parrot.biz [62.23.167.188]) by mail.messagingengine.com (Postfix) with ESMTPA id E099224005D for ; Mon, 1 Feb 2021 07:47:32 -0500 (EST) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Mon, 1 Feb 2021 13:47:21 +0100 Message-Id: <20210201124721.3767-1-clement@lassieur.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.29; envelope-from=clement@lassieur.org; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-rg)[inputs]: Remove. Move ripgrep to... [propagated-inputs]: ... here. This also gives access to ripgrep's manual. [arguments]: Replace the full path with the executable name. --- gnu/packages/emacs-xyz.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 28c7b41d79..ba1865d05f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -3848,19 +3848,18 @@ result.") (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'hardcode-rg-path - ;; Hardcode the path to ripgrep. + (add-after 'unpack 'remove-rg-path + ;; Remove the path to ripgrep so that it works on remote systems. (lambda _ (let ((file "rg.el")) (chmod file #o644) (emacs-substitute-sexps file - ("(defcustom rg-executable" (which "rg"))))))))) + ("(defcustom rg-executable" "rg")))))))) (propagated-inputs `(("emacs-s" ,emacs-s) ("emacs-transient" ,emacs-transient) - ("emacs-wgrep" ,emacs-wgrep))) - (inputs - `(("ripgrep" ,ripgrep))) + ("emacs-wgrep" ,emacs-wgrep) + ("ripgrep" ,ripgrep))) (home-page "https://rgel.readthedocs.io/en/latest/") (synopsis "Search tool based on @code{ripgrep}") (description