From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id wKC2Bhv4OWNSfwEAbAwnHQ (envelope-from ) for ; Sun, 02 Oct 2022 22:44:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kMGdBhv4OWNxGAAA9RJhRA (envelope-from ) for ; Sun, 02 Oct 2022 22:44:11 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D54D69F49 for ; Sun, 2 Oct 2022 22:44:10 +0200 (CEST) Received: from localhost ([::1]:38206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1of5oo-0008Gn-2A for larch@yhetil.org; Sun, 02 Oct 2022 16:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1of5og-0008FX-T0 for guix-patches@gnu.org; Sun, 02 Oct 2022 16:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1of5og-00082o-KO for guix-patches@gnu.org; Sun, 02 Oct 2022 16:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1of5og-0005bl-Ai for guix-patches@gnu.org; Sun, 02 Oct 2022 16:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58213] [PATCH] gnu: emacs-ag: Do not propagate the-silver-searcher and use gexp. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Oct 2022 20:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58213 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 58213@debbugs.gnu.org Received: via spool by 58213-submit@debbugs.gnu.org id=B58213.166474341121470 (code B ref 58213); Sun, 02 Oct 2022 20:44:02 +0000 Received: (at 58213) by debbugs.gnu.org; 2 Oct 2022 20:43:31 +0000 Received: from localhost ([127.0.0.1]:48175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of5oA-0005Zn-F4 for submit@debbugs.gnu.org; Sun, 02 Oct 2022 16:43:30 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:51118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of5o8-0005Zb-Jt for 58213@debbugs.gnu.org; Sun, 02 Oct 2022 16:43:29 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1of5o5-0007oe-U2; Sun, 02 Oct 2022 22:43:25 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1of5n9-000aky-8Y; Sun, 02 Oct 2022 22:43:25 +0200 From: Michael Rohleder References: <20221001053316.731-1-mike@rohleder.de> Date: Sun, 02 Oct 2022 22:42:27 +0200 In-Reply-To: (Efraim Flashner's message of "Sun, 2 Oct 2022 21:14:01 +0300") Message-ID: <8735c6t0ss.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1664743408;ada63807; X-HE-SMSGID: 1of5o5-0007oe-U2 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1664743451; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=ewXKCuEyDbgp1zbANIeYO8qw7KsWJJs3o5m9i1EAR/Y=; b=i6pAjvy8te+18wV4hTyJQvsKndy3TxBaWwoAarRRXI8Os2TURvnkKvCBAH8DhkE2/pLt6r hQhHRIVQsmf3Kmbtg5rf9YCuiibiPYpBfxorwMfGq4LKzPcGZyT031hDuEEBADX5aftLh7 Tzs7JWBirOgYi1PAUyqGQSUfPrk4SUneZ/Ir1RJ2Ak4xuDZIH4qYOKYMfKZmTZuZhAUx+M WI38I//M/5PJZBYUquG4e7yLDnm7ZaSPIufw0KRLjKeJiR9e4bdlF/zvNLU1GcgLMbAA+p jvVg+G0KLsHbYSGg9xrjR9U+gij2NfvmxZUlqek0gEhZa1s4Uo8vzflHLu5G/w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1664743451; a=rsa-sha256; cv=none; b=EqzIYHvc2nhk3Jus+whP8QUoxHP9D5DJ8U5GtA8ua970t6TQX6nTFfOsa+mAth9rozhaCC 01q3CCT0WZaDAJRgmJUbQJq+vCfWAzsPNVRBJ4lYsAntfub/+ZOLUIhIto0FiObjrWAGYu 3+iK9vMk0fhgqWvU72M+7GoXDswe5IXqg/u6s1Yg2/fj8vRc1FDBdTLLwlJSRHsJh1D5aA AYpni22Xc1mqVudb0sVMTllH+1ywx/edSejQEeicVdJjk1tomL5cUcT83cU2oSo39wJxFj 6OpMnr+Kig2soUGUpYBpsyl55t3YwoYl3PEmmIoSp3K75mc4l8PzMiJGeBaZdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.54 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D54D69F49 X-Spam-Score: -3.54 X-Migadu-Scanner: scn1.migadu.com X-TUID: Cuy/wVwbDXpe --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi Efraim! Thanks for reviewing! Efraim Flashner writes: > Can you split this into two patches? The first to not propagate the > silver searcher and the second to switch to gexps? Thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-ag-Use-gexps.patch Content-Transfer-Encoding: quoted-printable Content-Description: emacs-ag: Use gexps. From=20040aa27ca507032e8c02e02a90dc2e7aaecf4511 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 22:01:17 +0200 Subject: [PATCH] gnu: emacs-ag: Use gexps. * gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Use gexps. {install-info}: Adjust for gexps. =2D-- gnu/packages/emacs-xyz.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 93ad1a6fbf..f907838dc8 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3026,17 +3026,17 @@ (define-public emacs-ag (base32 "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx")))) (build-system emacs-build-system) (arguments =2D `(#:phases =2D (modify-phases %standard-phases =2D (add-before 'install 'make-info =2D (lambda _ =2D (with-directory-excursion "docs" =2D (invoke "make" "info")))) =2D (add-after 'install 'install-info =2D (lambda* (#:key outputs #:allow-other-keys) =2D (let* ((out (assoc-ref outputs "out")) =2D (info (string-append out "/share/info"))) =2D (install-file "docs/_build/texinfo/agel.info" info))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "docs" + (invoke "make" "info")))) + (add-after 'install 'install-info + (lambda _ + (install-file "docs/_build/texinfo/agel.info" + (string-append #$output "/share/info"))))))) (native-inputs (list python-sphinx texinfo)) (propagated-inputs =2D-=20 2.37.3 --=-=-= Content-Type: text/plain This applies to the first one. I changed emacs-substitute-sexps to emacs-substitute-variables. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-ag-Do-not-propagate-the-silver-searcher.patch Content-Transfer-Encoding: quoted-printable Content-Description: emacs-ag: Do not propagate the-silver-searcher. From=20f3ace8a1daa1a40c90c08043df42d0af4864e5cb Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 22:25:56 +0200 Subject: [PATCH] gnu: emacs-ag: Do not propagate the-silver-searcher. * gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Add phase substitute-ag-pa= th to avoid propagating ag. [inputs]: Add the-silver-searcher. [propagated-inputs]: Remove the-silver-searcher. =2D-- gnu/packages/emacs-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f907838dc8..ff2d45500e 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3029,6 +3029,11 @@ (define-public emacs-ag (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'substitute-ag-path + (lambda _ + (make-file-writable "ag.el") + (emacs-substitute-variables "ag.el" + ("ag-executable" (which "ag"))))) (add-before 'install 'make-info (lambda _ (with-directory-excursion "docs" @@ -3037,12 +3042,11 @@ (define-public emacs-ag (lambda _ (install-file "docs/_build/texinfo/agel.info" (string-append #$output "/share/info"))))))) + (inputs (list the-silver-searcher)) (native-inputs (list python-sphinx texinfo)) (propagated-inputs =2D (list emacs-dash =2D emacs-s =2D the-silver-searcher)) ;'ag' executable + (list emacs-dash emacs-s)) (home-page "https://github.com/Wilfred/ag.el") (synopsis "Front-end for ag (the-silver-searcher) for Emacs") (description "This package provides the ability to use the silver =2D-=20 2.37.3 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 I still maintain the point that designing a monolithic kernel in 1991 is a fundamental error. Be thankful you are not my student. You would not get a high grade for such a design :-) (Andrew Tanenbaum to Linus Torvalds) --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFFBAEBCAAvFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAmM597MRHG1pa2VAcm9o bGVkZXIuZGUACgkQfHr/vv7yyyVhNwf/dAWtCLmfP47VXGEtzGDVvlGHhk1aYjp4 31DG069Ugp7A6Rowtari0Eff9r5ctvzF9prgQXDorIxIZRM4ghbeIaqRrbMFPjIj ouL5dYTTxsFRU/aAq8E2B409W2ZlRDZHJCXKGFvOHkjVhK0qOjBCh6uC3Snh3RgE 662T9r6iOPHyKwmGo5IzexHHx76E1NJthttHoxgmTNerx2zObggUxLVU0tm5Nv2M 5j2iAk7YGCefMOUKr7MJtasRKwgRwSmD+C+Slb+QRl8OhbF9/EPxNtQYOdmxJZsa JhREYXlkJtbgAX9CLD/fFjxdmD/TfXDK9cBk7ErljZbWUezg3Wm4bg== =/Rd2 -----END PGP SIGNATURE----- --==-=-=--