From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 UN99GzHVOWPiIwEAbAwnHQ (envelope-from ) for ; Sun, 02 Oct 2022 20:15:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4BOhGjHVOWN6XgEAG6o9tA (envelope-from ) for ; Sun, 02 Oct 2022 20:15:13 +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 E359571E1 for ; Sun, 2 Oct 2022 20:15:12 +0200 (CEST) Received: from localhost ([::1]:53524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1of3Ue-0007Ms-3h for larch@yhetil.org; Sun, 02 Oct 2022 14:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1of3UU-0007M7-N1 for guix-patches@gnu.org; Sun, 02 Oct 2022 14:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1of3UU-0003qK-Ec for guix-patches@gnu.org; Sun, 02 Oct 2022 14:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1of3UU-0003fG-86 for guix-patches@gnu.org; Sun, 02 Oct 2022 14:15: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: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Oct 2022 18:15: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: Michael Rohleder Cc: 58213@debbugs.gnu.org Received: via spool by 58213-submit@debbugs.gnu.org id=B58213.166473445214010 (code B ref 58213); Sun, 02 Oct 2022 18:15:02 +0000 Received: (at 58213) by debbugs.gnu.org; 2 Oct 2022 18:14:12 +0000 Received: from localhost ([127.0.0.1]:48017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of3Tg-0003du-00 for submit@debbugs.gnu.org; Sun, 02 Oct 2022 14:14:12 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:46047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1of3Te-0003da-6h for 58213@debbugs.gnu.org; Sun, 02 Oct 2022 14:14:10 -0400 Received: by mail-ej1-f53.google.com with SMTP id z23so1448695ejw.12 for <58213@debbugs.gnu.org>; Sun, 02 Oct 2022 11:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date; bh=cQ/aImDoW2bLdACrgPVO9XijFVlmNW4MFnrTM9QPN9I=; b=IND5fUje35uxbUcD3zYvyXpDI5D8p/KupzuTDhyZfquRL2hNPRvdp7WvX872upRihZ wyNlbsKFXeoB1U3XzuohkYRiMnSA6zfehe4feu9wxSIad/OFeg6mdZZGNI8Erdc32Zxs fDfXqFzSnkFNLqnxS7kSH5Am1s2xp7OXWlVi/MfX+j6wDPA9y7EnGdl98suPgrPEnQP1 /LaK8c2hrwZLCfurU/M0mDkq029Jp2RbyT6ZjEAl8M6RylPlQlIe9Mi0BCwZWAx9a3Gx KQK13euCYV0we7LZ5xV14EQym+IssZTCa2aQLwbrYtdjCSE+M4/NxQJDd+A/J3lV4EC5 c19w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date; bh=cQ/aImDoW2bLdACrgPVO9XijFVlmNW4MFnrTM9QPN9I=; b=0wsGwA31380uRbzGHB90MIBt2gMd9wCgzKJ8iEv521YIbfgM3xw3fAi+tw8qG978BT Z0A0I7ajlYms9ueirfynMDqHt9RFudfh50ZUjaueImUMKeaM/vUAJ5a4GuPILrVXOxcK oVyc895xCXWy/e01GjMwL5NYpdsG1HDDuX6kk280UxNq5rrY4awAZDIxN0wWLOgefLjm OFrg3RBXe8tYArkHu5ZMmtla2xHfQoC3hYlWrsiQ6fTPDqgjvJC26pYGOOhO2ZZTiwym rUcqvs3FSTQUVfCaPltQ9MeIqlD8JlbgFw4Q2m6jeHiqV3lSos9gTGaTzN13aW6UOT1p +wTg== X-Gm-Message-State: ACrzQf2noB5InKyFexaY+11ADNCvHcyJCQ0OJBVSJ0Ct97jEKHTvC/QU BZzxlXyHU1hYJLP7n3Q1NL23cHp/PxS6JP2C X-Google-Smtp-Source: AMsMyM5q78vCBdK7Wm/ZSyH366faJ+mE6xK4lUG4CIvsVj0G4+NC0Wb8wyJL8OJSwjCkm9YPVDfbJg== X-Received: by 2002:a17:906:794c:b0:783:ce42:4d2 with SMTP id l12-20020a170906794c00b00783ce4204d2mr12640070ejo.517.1664734444650; Sun, 02 Oct 2022 11:14:04 -0700 (PDT) Received: from localhost ([141.226.13.62]) by smtp.gmail.com with ESMTPSA id f8-20020a50ee88000000b00458d744898asm2158142edr.79.2022.10.02.11.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 11:14:04 -0700 (PDT) Date: Sun, 2 Oct 2022 21:14:01 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Michael Rohleder , 58213@debbugs.gnu.org References: <20221001053316.731-1-mike@rohleder.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="z4v3TEL4ONR66FYV" Content-Disposition: inline In-Reply-To: <20221001053316.731-1-mike@rohleder.de> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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=1664734513; 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: dkim-signature; bh=cQ/aImDoW2bLdACrgPVO9XijFVlmNW4MFnrTM9QPN9I=; b=rHJbNc3DCVaNy1wRgUOwa4bWpE5mMiCK40G4bAK3F8ZQ7S46nY14uo41E2zM86WfOu+s6X WJljqpRIpc+WzCyRJz5ps/MT1ouhJa+4vM82UiZfv2NxhQ1rYprswnr/dj+ieLModwyjGf nY1I/OJZxptZQWwD507YLQV1692RcsfAAakf9yy0U42dpIiSuzeneUq2QXYdKec99w0PYA IXNozQyBJsNuGszaKqRzHmUkW57dK0E5/evW2Wpc47FRNMywb9XCt7ryNcaNxJ/uFrSpKz S/RYRDpXKtp/aD7oSOAfHc3beb1Nh+NKfiTdFKy5NKk7X9Y00WUAr52l1FW3Yw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1664734513; a=rsa-sha256; cv=none; b=R8QcyBelKjKyqtfNCc9ZHbzvTBxasD5RbIuLjFo7dCFw8kK9UjS8eiEubM62jeMiWri6qZ o2EP0KtBMtApJeuvLdw1rQ1+zHHtlB1iaT//xIAE+AoFOV6DTkNePE7fY2V/R8ZF8PvSe5 IMbyWhUujbmdFbHgO34i5Icnpc02by2dQhOA+49mkgVScCr2yrcmhNCOhHz20ReS3WVobA B7hEGnIO0l0vHXDP2OJf0vrFVTOJA3bXaqABl+QJ3PXdvzOo0uucwLQsuu7S1Nv04/7GzJ 2WhW13DFSTcJ/DRksTPbdLSJU0keJ6wFhLe5eGX6OYXqIVOj95Z6VweSvhnDSw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=IND5fUje; 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: 1.06 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=IND5fUje; 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: E359571E1 X-Spam-Score: 1.06 X-Migadu-Scanner: scn1.migadu.com X-TUID: 82Zj/bokiN2n --z4v3TEL4ONR66FYV Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 01, 2022 at 07:33:16AM +0200, Michael Rohleder wrote: > * gnu/packages/emacs-xyz.scm (emacs-ag)[phases]: Use gexps. > {substitute-ag-path}: Add phase to avoid propagating ag. > {install-info}: Use gexps. > [inputs]: Add the-silver-searcher. > [propagated-inputs]: Remove the-silver-searcher. > --- > gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++++-------------- > 1 file changed, 18 insertions(+), 14 deletions(-) >=20 > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 6d9d0d6a8f..76a17da88e 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -3026,23 +3026,27 @@ (define-public emacs-ag > (base32 "1p918y24vcn2pdliaymd210xp9fvhd4a1srqbv2lfiqrh59yjidx"))= )) > (build-system emacs-build-system) > (arguments > - `(#:phases > - (modify-phases %standard-phases > - (add-before 'install 'make-info > - (lambda _ > - (with-directory-excursion "docs" > - (invoke "make" "info")))) > - (add-after 'install 'install-info > - (lambda* (#:key outputs #:allow-other-keys) > - (let* ((out (assoc-ref outputs "out")) > - (info (string-append out "/share/info"))) > - (install-file "docs/_build/texinfo/agel.info" info))))))) > + (list > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'substitute-ag-path > + (lambda _ > + (make-file-writable "ag.el") > + (emacs-substitute-sexps "ag.el" > + ("defcustom ag-executable" (which "ag"))))) > + (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"))))))) > + (inputs (list the-silver-searcher)) ;'ag' executable > (native-inputs > (list python-sphinx texinfo)) > (propagated-inputs > - (list emacs-dash > - emacs-s > - 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 > --=20 > 2.37.3 >=20 Can you split this into two patches? The first to not propagate the silver searcher and the second to switch to gexps? Thanks. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --z4v3TEL4ONR66FYV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmM51OkACgkQQarn3Mo9 g1F9ghAAgkwA7xZ7YtuQVsg4MhJaJowTCCGm6XwgDBrJPHihPnYDvW2qK8YrvM52 jGDrrzyHpHVDTnecj7BeExzBa4kn/mfDFBFek+/aGX17ExvCZaXkincbWwm+Xz05 rfJ9sywZigc9xvYMytD9je4BzD5m/zpJWqIShr7d8NbgxovBeYGX8nM8aNpeYDGq HJKyFmPkzf8fxd6xnvqwPvSYhrnS+bJ8c/7K1meResdJTWiNpZ6hIoZ+e8qCM4cr O8nQ7KRwJZ9uxfFSIB3cfXvF1Au2fl+A60kAEpbxTnmvbXAI6s6aI4irg+LVzzpR 6blgghsmCAxBcX56sI4HDjnScyteXovhZTfUpWkF0l+CmNPtYaRC3z5jbUBaC4Gh qlhik61wmDpUfl2Fk53idFN0A9/kYYUzJSb/BPrcwQynpxFS2kIHZnHgvq01YMYr ZLXFwZyEFNC6lVPadopSKJi32Fje5odDTPywZ6lqfQUPz/EKDY7tdY0r7niW5REq Ze0atvouyvAm66el5TYnf7OKEE+0QmTvVlQzUZeGZUI0zbXo9iqKuq4P1lgQx89S dADCAhMs46p6pdB0+RER7RXAzQMDy2TtkC8Ba1y68fhyQYOs4vvvUQXWL+MFKmdo aFF2GTqKTyCw+WPJio05z42WK9m60WGOdpVKVwlsMBbHFnQ6D4A= =O50R -----END PGP SIGNATURE----- --z4v3TEL4ONR66FYV--