GNU bug report logs - #45316
[PATCH]: Re-introduce Emacs packages specific installation prefix.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix; Reported by: Maxim Cournoyer <maxim.cournoyer@HIDDEN>; Keywords: patch; dated Fri, 18 Dec 2020 22:01:02 UTC; Maintainer for guix is bug-guix@HIDDEN.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 22 Dec 2020 19:10:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 22 14:10:47 2020
Received: from localhost ([127.0.0.1]:50925 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1krn3X-0007Uq-6y
	for submit <at> debbugs.gnu.org; Tue, 22 Dec 2020 14:10:47 -0500
Received: from mailrelay.tugraz.at ([129.27.2.202]:4140)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <leo.prikler@HIDDEN>) id 1krn3V-0007Ue-0P
 for 45316 <at> debbugs.gnu.org; Tue, 22 Dec 2020 14:10:46 -0500
Received: from nijino.local (217-149-174-13.nat.highway.telekom.at
 [217.149.174.13])
 by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4D0mBn18VYz3xRV;
 Tue, 22 Dec 2020 20:10:40 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at;
 s=mailrelay; t=1608664241;
 bh=42/OqDa9gmC486axDWnf9abCwq91RHJTI3YfnJ00iGQ=;
 h=Subject:From:To:Cc:Date:In-Reply-To:References;
 b=TIxftcZy2Y7WJLB+ZIMYi4+SCzEXfx1URvINkWMRs73QSS85WewzQ/tcX7Imq6rUp
 grxtfwWSTVPcF0nL87YU7ZcZyfvDbjhPWTyY7x/MCPfUhYwu26+p0Ay38h1BRdUWfU
 wSWnHkVxOQI3znSMIrooiHNTD3SM/0/rZCAEDGug=
Message-ID: <4f40e3fb175201b21e40718022e93eb27efab3fb.camel@HIDDEN>
Subject: Re: [PATCH]: Re-introduce Emacs packages specific installation prefix.
From: Leo Prikler <leo.prikler@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Date: Tue, 22 Dec 2020 20:10:40 +0100
In-Reply-To: <875z4tyapq.fsf@HIDDEN>
References: <87ft3ysen7.fsf@HIDDEN>
 <878dbbdf4883d509865a1049c11fbe9ae792cace.camel@HIDDEN>
 <875z4tyapq.fsf@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.34.2 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw
X-Spam-Scanner: SpamAssassin 3.003001 
X-Spam-Score-relay: -1.9
X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 45316
Cc: 45316 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi Maxim,

Am Dienstag, den 22.12.2020, 13:09 -0500 schrieb Maxim Cournoyer:
> Hi Leo,
> 
> Leo Prikler <leo.prikler@HIDDEN> writes:
> 
> > Hello Maxim,
> > 
> > As someone, who lobbied for the current status quo, I have some
> > thoughts to share.
> 
> I'm happy you're commenting :-).
> 
> > Am Montag, den 21.12.2020, 22:28 -0500 schrieb Maxim Cournoyer:
> > > The Emacs packages built with the Emacs built system used to be
> > > installed in a sub-directory under the share/emacs/guix.d/
> > > directory,
> > > but this was changed in commit
> > > 65a7dd2950ca13a8b942b2836260a2192351b271
> > > shortly after having accommodated the site-start.el machinery to
> > > enable
> > > loading packages from any profile (via the EMACSLOADPATH search
> > > path
> > > specification).
> > Won't this reintroduce <https://bugs.gnu.org/38309> then?
> 
> This bug was caused by the EMACSLOADPATH environment variable being
> too
> long.  This was because the original search path specification was
> recursively adding any directories under site-lisp/ so that package
> installed under a guix.d sub-directory could were directly added to
> the
> load path.
> 
> In the current situation, the EMACSLOADPATH contains only the site-
> lisp/
> directory of any profile, plus the versioned lisp/ directory of the
> installed Emacs package.  This patch series doesn't change that, so
> no,
> that bug wouldn't be reintroduced.
Which is also the reason why our startup code changes and people have
to accommodate to that, right?

> > > While this change allowed to expose simply and directly the
> > > packages
> > > found in EMACSLOADPATH, it does introduce the risk of file name
> > > collisions when multiple Emacs packages are joined in the same
> > > profile,
> > > especially with Emacs packages increasing in complexity (e.g.,
> > > using
> > > more than a single .el file!) and expecting to have both their
> > > sources
> > > and resources extracted under their own nested directory rather
> > > than
> > > as
> > > a flat collection (ELPA, MELPA).
> > > One recent example I stumbled on was attempting to use the
> > > emacs-yasnippet-snippets package along with emacs-elpy; both
> > > wanted
> > > to
> > > install a 'snippets' directory to share/emacs/site-lisp/snippets,
> > > collided and resulted in problems that prove difficult to
> > > understand.
> > I believe that to be a problem in those packages.  Data should not
> > be
> > installed into share/emacs/site-lisp, but share/emacs/etc.  See for
> > instance also emacs-telega, which – while not quite adhering to the
> > above – installs its data in share/emacs/{telega-contrib,telega-
> > data}.
> > 
> > Regardless of what you intend to do with site-lisp otherwise, data
> > files should *not*, I repeat *not* be installed there.  I do
> > believe
> > standardizing share/emacs/etc is the way to go, however.
> 
> While I agree that it would be more elegant the way you propose,
> that's
> not the way Emacs packages have been standardized.  So going against
> the
> single "content directory" (c.f. info "(elisp) Packaging Basics")
> would
> break many Elisp library assumptions about where there files are,
> causing more friction (thus work) to adapt them in Guix.  The content
> directory of an Elisp package can contain any kind of files (code,
> images, etc.), according to info "(elisp) Multi-file Packages".

I suppose said manual is perhaps slightly outdated.
> A package is either a “simple package” or a “multi-file package”.  A
> simple package is stored in a package archive as a single Emacs Lisp
> file, while a multi-file package is stored as a tar file (containing
> multiple Lisp files, and possibly non-Lisp files such as a manual).
When was the last time, you've installed a tar to site-lisp?  I also
feel as though the expected contents are limited very much to README,
COPYING and the like:

--8<---------------cut here--------------begin-------------->8---
$ find ~/.guix-profile/share/emacs/27.1/lisp/ -type f \
  -not -name '*.el' \
  -and -not -name '*.elc' \
  -and -not -name '*.el.gz'
~/.guix-profile/share/emacs/27.1/lisp/term/README
~/.guix-profile/share/emacs/27.1/lisp/COPYING
~/.guix-profile/share/emacs/27.1/lisp/README
--8<---------------cut here---------------end--------------->8---

Perhaps we should ask Emacs folks how they feel about separating code
and data, but bugs have already been caused here and elsewhere by
stuffing them together.  (I believe yasnippet was once already the
culprit at some point before it got reorganized.)  In the meantime,
yes, doing so might cause extra work, but
1) it only affects a subset of packages, and
2) of this subset, we can prioritize those, that do exhibit this
behaviour.

> > > This is what motivated this patch series, where the site-start.el
> > > auxiliary code used for package discovery is extended to support
> > > packages installed in their own directory under a
> > > 'share/emacs/guix'
> > > installation prefix, via Emacs' own package library!
> > > 
> > > The emacs-build-system is updated for this new installation
> > > prefix,
> > > as
> > > well as existing packages and documentation.  Parting with a
> > > directly
> > > usable EMACSLOADPATH means that site-start.el *must* run for
> > > packages
> > > to
> > > appear in the load-path; that means for running a test suite, the
> > > -Q
> > > or
> > > --quick Emacs options cannot be used, since it implies --no-site-
> > > file.
> > Having no usable EMACSLOADPATH sounds like a dealbreaker to
> > me.  Could
> > one be restored by using direct subdirectories to share/emacs/site-
> > lisp
> > or would that merely be a cosmetic change?
> 
> We have two schemes to accommodate for our Emacs packages:
> 
> 1. Those installed via their own mean, e.g. make install, using the
> gnu-build-system for example.  These would still typically install
> their
> packages directly under site-lisp, possibly multiple files (that
> could
> still collide).
Why?  Seems inconsistent, does it not?

> 2. Those installed via the emacs-build-system.  With the proposed
> changes, those now go to site-lisp/guix/.  The 'guix' sub-directory
> makes it unambiguous that anything found under is to be loaded by
> package.el; the `package-directory-list' variable can be pointed to
> it
> to have the Emacs' package library discover these self-contained
> packages.
I think you've lost me here.  Basically, instead of being able to
`(require 'my-package)` you first need to load my-package through
package.el and then can `(require 'my-package)`?  I am not sure, what
the benefit of that would be, if any. 

> Currently if you use -Q, the Elisp libraries are in the load-path,
> but
> not loaded (you need manually do M-x load-library before you can use
> it), or call M-x guix-emacs-autoload-packages to load their
> autoloads.
> For programs, this mean (require 'some-library) works, but M-x
> some-library-autoloaded-function doesn't.
> 
> After this change, if you use -Q the new style Emacs packages are not
> visible at all until you activate them with 'M-x load-library
> guix-emacs' then 'M-x guix-package-initialize', or (require 'guix-
> emacs)
> then (guix-package-initialize), programmatically.
I do think, that there are legitimate reasons to not require a full
initialization here, particularly for the use in batch scripts, but I'm
not quite sure how much work we currently put into making sure that
everything is available.

> I don't see this as a problem.  -Q is simply an alias for
> "--no-init-file" "--no-site-lisp" "--no-splash" "--no-x-resources"
> "--no-site-file".
But not "--no-load-path" "--no-nothing" ;)
Being able to load the same libraries as without is vital for debugging
and scripts.  (Granted, some distros probably break with --no-site-
lisp, but that's nothing to strive for imo.)

> [...]
> When put in perspective, that's 3 seconds to refresh about 900
> packages.  I'm guessing most users must have less than 100 Emacs
> packages in their collections (I have about 35). I think the current
> performance is good enough to not worry optimizing it at this stage.
Point taken, I don't have that many either.  I was merely interested,
given that I rarely dive that deep into runtime statistics of Elisp
code.

Regards,
Leo





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 22 Dec 2020 18:09:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 22 13:09:16 2020
Received: from localhost ([127.0.0.1]:50877 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1krm5z-0005zC-IM
	for submit <at> debbugs.gnu.org; Tue, 22 Dec 2020 13:09:16 -0500
Received: from mail-qk1-f176.google.com ([209.85.222.176]:36719)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1krm5x-0005yw-8H
 for 45316 <at> debbugs.gnu.org; Tue, 22 Dec 2020 13:09:14 -0500
Received: by mail-qk1-f176.google.com with SMTP id 186so12694211qkj.3
 for <45316 <at> debbugs.gnu.org>; Tue, 22 Dec 2020 10:09:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:references:date:in-reply-to:message-id
 :user-agent:mime-version:content-transfer-encoding;
 bh=DKMjJ5qYN3FoecamuVnPpx+7gudfvAIhYtjcfBU9fLg=;
 b=KnfV0+5iXjujvXdGp4BRHMUZ2e1b2m6f43C/4+dZaYcd8dsnK/15YOsnG7htrJCPCz
 VES8dm8gSOuI4ug6Ob2/Qoy+GfF3rrzMAKcaoLr95VVJUnvLwVEZA4HdeTIGdSZLS1sG
 5eYRRRrwTnnPR97pK2AU9qzHaHrcodMws/USlHfYd02JKFPtnzT1vQw9DkekAW+B1VVX
 zXaqeUT6JtkkVzLnJNPmRBJmSlhR59872Sa3bJChahOBexsvnosqSDPcWjExRpwkBcid
 MYl+QExGDztn0Q/layr9r50TNGJZE8sqsYBOeHMtwUW7QG79TEi5tM8rIFYmbMuIVU6l
 QV9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to
 :message-id:user-agent:mime-version:content-transfer-encoding;
 bh=DKMjJ5qYN3FoecamuVnPpx+7gudfvAIhYtjcfBU9fLg=;
 b=scSA14ujxmc49D5Tqgz58gZiv+V2F8gjy2RnHMZV2UtxaxfXYDptjBRHWwojshtivn
 jYpbXE9GAsaz5HGqxyfzIXsB7iNIUQWMO1VgXSTc+eDrmkGpMj7c5vSSCmWonrEOc7Oh
 qGt5a7uryW9y4neHVMN/IEgOfMRGIUaEHo7upprVrgZFc0NeuAJWLHmPS+NHv1QfZgdH
 aRr52rsM2KW/LX+KBq3dYGjIQHtEBhWgCydRxOO7XJmyAbdWZs2mcDhqyETozMKZpSeJ
 gvmnUkW0y1MKWVFOTdFNSyTs+T7HPTcae1bBm3otYZjhwPWoBTqftKMXhyHMnMpM29/A
 S2zw==
X-Gm-Message-State: AOAM533H4pGvFEwtWlyNX83iJXcSPFYygW9lcR6OxBsDXsSkujv8znkC
 FRMXUiGQGvr629S48dHsskQ9C2cK5FZdjA==
X-Google-Smtp-Source: ABdhPJwGmmve6GNSFvK0R/V+cgLUDBU5bfpReu0JkN3Ye/BTbPayQQR0wkbRQEV4jAJtin3tehy8cQ==
X-Received: by 2002:a37:a80f:: with SMTP id r15mr22404872qke.84.1608660547373; 
 Tue, 22 Dec 2020 10:09:07 -0800 (PST)
Received: from hurd (dsl-205-233-125-22.b2b2c.ca. [205.233.125.22])
 by smtp.gmail.com with ESMTPSA id k73sm13805710qke.63.2020.12.22.10.09.06
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 22 Dec 2020 10:09:06 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Leo Prikler <leo.prikler@HIDDEN>
Subject: Re: [PATCH]: Re-introduce Emacs packages specific installation prefix.
References: <87ft3ysen7.fsf@HIDDEN>
 <878dbbdf4883d509865a1049c11fbe9ae792cace.camel@HIDDEN>
Date: Tue, 22 Dec 2020 13:09:05 -0500
In-Reply-To: <878dbbdf4883d509865a1049c11fbe9ae792cace.camel@HIDDEN>
 (Leo Prikler's message of "Tue, 22 Dec 2020 09:51:51 +0100")
Message-ID: <875z4tyapq.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: 45316 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Leo,

Leo Prikler <leo.prikler@HIDDEN> writes:

> Hello Maxim,
>
> As someone, who lobbied for the current status quo, I have some
> thoughts to share.

I'm happy you're commenting :-).

> Am Montag, den 21.12.2020, 22:28 -0500 schrieb Maxim Cournoyer:
>> The Emacs packages built with the Emacs built system used to be
>> installed in a sub-directory under the share/emacs/guix.d/ directory,
>> but this was changed in commit
>> 65a7dd2950ca13a8b942b2836260a2192351b271
>> shortly after having accommodated the site-start.el machinery to
>> enable
>> loading packages from any profile (via the EMACSLOADPATH search path
>> specification).
> Won't this reintroduce <https://bugs.gnu.org/38309> then?

This bug was caused by the EMACSLOADPATH environment variable being too
long.  This was because the original search path specification was
recursively adding any directories under site-lisp/ so that package
installed under a guix.d sub-directory could were directly added to the
load path.

In the current situation, the EMACSLOADPATH contains only the site-lisp/
directory of any profile, plus the versioned lisp/ directory of the
installed Emacs package.  This patch series doesn't change that, so no,
that bug wouldn't be reintroduced.

>> While this change allowed to expose simply and directly the packages
>> found in EMACSLOADPATH, it does introduce the risk of file name
>> collisions when multiple Emacs packages are joined in the same
>> profile,
>> especially with Emacs packages increasing in complexity (e.g., using
>> more than a single .el file!) and expecting to have both their
>> sources
>> and resources extracted under their own nested directory rather than
>> as
>> a flat collection (ELPA, MELPA).
>
>> One recent example I stumbled on was attempting to use the
>> emacs-yasnippet-snippets package along with emacs-elpy; both wanted
>> to
>> install a 'snippets' directory to share/emacs/site-lisp/snippets,
>> collided and resulted in problems that prove difficult to understand.

> I believe that to be a problem in those packages.  Data should not be
> installed into share/emacs/site-lisp, but share/emacs/etc.  See for
> instance also emacs-telega, which =E2=80=93 while not quite adhering to t=
he
> above =E2=80=93 installs its data in share/emacs/{telega-contrib,telega-d=
ata}.
>
> Regardless of what you intend to do with site-lisp otherwise, data
> files should *not*, I repeat *not* be installed there.  I do believe
> standardizing share/emacs/etc is the way to go, however.

While I agree that it would be more elegant the way you propose, that's
not the way Emacs packages have been standardized.  So going against the
single "content directory" (c.f. info "(elisp) Packaging Basics") would
break many Elisp library assumptions about where there files are,
causing more friction (thus work) to adapt them in Guix.  The content
directory of an Elisp package can contain any kind of files (code,
images, etc.), according to info "(elisp) Multi-file Packages".

>> This is what motivated this patch series, where the site-start.el
>> auxiliary code used for package discovery is extended to support
>> packages installed in their own directory under a 'share/emacs/guix'
>> installation prefix, via Emacs' own package library!
>>
>> The emacs-build-system is updated for this new installation prefix,
>> as
>> well as existing packages and documentation.  Parting with a directly
>> usable EMACSLOADPATH means that site-start.el *must* run for packages
>> to
>> appear in the load-path; that means for running a test suite, the -Q
>> or
>> --quick Emacs options cannot be used, since it implies --no-site-
>> file.
> Having no usable EMACSLOADPATH sounds like a dealbreaker to me.  Could
> one be restored by using direct subdirectories to share/emacs/site-lisp
> or would that merely be a cosmetic change?

We have two schemes to accommodate for our Emacs packages:

1. Those installed via their own mean, e.g. make install, using the
gnu-build-system for example.  These would still typically install their
packages directly under site-lisp, possibly multiple files (that could
still collide).

2. Those installed via the emacs-build-system.  With the proposed
changes, those now go to site-lisp/guix/.  The 'guix' sub-directory
makes it unambiguous that anything found under is to be loaded by
package.el; the `package-directory-list' variable can be pointed to it
to have the Emacs' package library discover these self-contained
packages.

>> + Avoid inter-package file name collisions.
> Note: This regards data, which should not be stored in site-lisp to
> begin with.  You don't get any benefits doing this for code, because
> Emacs has no strong module system.

True.

>> + Better integration with user installed packages via M-x
>> package-install.  The Guix-installed packages are listed in M-x
>> package-list as 'external'.
> That does sounds like a genuine pro to me.
>> - Slightly more complex loader (although much of it is offloaded to
>>   package.el), thus slightly slower (see the comparison below).
> That should be bearable.
>> - Requires to ensure every package's test suite doesn't make use of
>> -Q.
> That not so much.  Note, that test cases are not the only use for -Q!

Currently if you use -Q, the Elisp libraries are in the load-path, but
not loaded (you need manually do M-x load-library before you can use
it), or call M-x guix-emacs-autoload-packages to load their autoloads.
For programs, this mean (require 'some-library) works, but M-x
some-library-autoloaded-function doesn't.

After this change, if you use -Q the new style Emacs packages are not
visible at all until you activate them with 'M-x load-library
guix-emacs' then 'M-x guix-package-initialize', or (require 'guix-emacs)
then (guix-package-initialize), programmatically.

I don't see this as a problem.  -Q is simply an alias for
"--no-init-file" "--no-site-lisp" "--no-splash" "--no-x-resources"
"--no-site-file".

>> In my opinion the benefits outweighs the cons by a comfortable
>> margin,
>> especially with the boring work of adapting the package collection
>> already done.
>>
>> To test the performance of the new approach, the following manifest
>> file
>> was used to test the rebuild of the ~900 Emacs packages making use of
>> the Emacs build system:
>>
>> A simple benchmark testing the performance of the activation of the
>> hundreds of Emacs packages was then run using:
>>
>> --8<---------------cut here---------------start------------->8---
>> $ ./pre-inst-env guix environment --pure -m emacs-packages-
>> manifest.scm \
>>                                   --ad-hoc emacs
>> [env]$ /run/setuid-programs/sudo /bin/sh -c 'echo 3 >
>> /proc/sys/vm/drop_caches'
>> [env]$ emacs --batch --no-site-file \
>>     --eval=3D"(progn (require 'guix-emacs) \
>>                    (require 'benchmark) \
>>                    (message \"(total gc-count gc-time) =3D %s\" \
>>                             (benchmark-run 1 (guix-emacs-autoload-
>> packages))))"
>> --8<---------------cut here---------------end--------------->8---
>>
>> On the master branch:
>>
>> --8<---------------cut here---------------start------------->8---
>> [...]
>> Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-
>> profile/share/emacs/site-lisp/zotxt-autoloads...
>> Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-
>> profile/share/emacs/site-lisp/zoutline-autoloads...
>> Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-
>> profile/share/emacs/site-lisp/ztree-autoloads...
>> (total gc-count gc-time) =3D (25.242400751 13 0.189669369)
>> --8<---------------cut here---------------end--------------->8---
>>
>> Or about 0.65 s on a warm cache.
>>
>> On a branch with these changes:
>>
>> --8<---------------cut here---------------start------------->8---
>> Error loading autoloads: (file-missing Cannot open load file No such
>> file or directory kotl/kotl-autoloads)
>> Error loading autoloads: (file-missing Cannot open load file No such
>> file or directory helm-easymenu)
>> Error loading autoloads: (file-missing Cannot open load file No such
>> file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-
>> profile/share/emacs/site-lisp/guix/flycheck-cpplint-0.1-
>> 1.1d8a090/flycheck-cpplint-autoloads)
>> Error loading autoloads: (file-missing Cannot open load file No such
>> file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-
>> profile/share/emacs/site-lisp/guix/evil-anzu-0.03/evil-anzu-
>> autoloads)
>> Error loading autoloads: (file-missing Cannot open load file No such
>> file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-
>> profile/share/emacs/site-lisp/guix/erc-image-0-3.82fb387/erc-image-
>> autoloads)
>> ad-handle-definition: `ido-completing-read' got redefined
>> Error loading autoloads: (file-missing Cannot open load file No such
>> file or directory tex-site)
>> (total gc-count gc-time) =3D (26.175704339 47 0.783184412)
>> --8<---------------cut here---------------end--------------->8---
>>
>> Or about 3 seconds on a warm cache.
> Looking at these, total does not seem to have changed much, but gc-
> count and gc-time more than tripled.  Any idea on how to mitigate this
> or do we have to live with that?

I don't know enough about Elisp to offer a guess.  We'd have to profile
it.  When put in perspective, that's 3 seconds to refresh about 900
packages.  I'm guessing most users must have less than 100 Emacs
packages in their collections (I have about 35). I think the current
performance is good enough to not worry optimizing it at this stage.  In
any case, performance optimizations would need to be made to Emacs'
package.el.

>> There a 6 errors that would need to be looked into, but I these look
>> like actual packaging problems rather than new issues.  The
>> previously
>> used way to load the autoloads, '(load f 'noerror)' would have masked
>> them.

> Regardless of how we handle site-lisp going forward, please do look
> into those issues and perhaps file them against the individual packages
> if they also cause (other) trouble using the current setup.

I'll try having a look, thanks for the reminder.

Thank you for commenting!

Maxim




Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 22 Dec 2020 08:52:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Dec 22 03:51:59 2020
Received: from localhost ([127.0.0.1]:48907 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1krdOh-00026R-CR
	for submit <at> debbugs.gnu.org; Tue, 22 Dec 2020 03:51:59 -0500
Received: from mailrelay.tugraz.at ([129.27.2.202]:21691)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <leo.prikler@HIDDEN>) id 1krdOe-00026F-Vr
 for 45316 <at> debbugs.gnu.org; Tue, 22 Dec 2020 03:51:59 -0500
Received: from nijino.local (217-149-174-13.nat.highway.telekom.at
 [217.149.174.13])
 by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4D0VSm4dcBz1LBMy;
 Tue, 22 Dec 2020 09:51:52 +0100 (CET)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4D0VSm4dcBz1LBMy
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at;
 s=mailrelay; t=1608627112;
 bh=mbppzh1vJx+5OxHjZFrhb48nTJWKQGHSt+PGNbQkyEo=;
 h=Subject:From:To:Cc:Date:In-Reply-To:References:From;
 b=IYplVxRi1QKofYCrYs+gh0kgySwTUp8oy9ekxRIXgPWfturqXC6AmIxe2M0cYplpb
 D87SaMWLyG/5HB+8tgcmHyJJUhugI7Wy8dJwN7KajxZMLoEDfkBeQc6u2u/cKMvk0n
 +w4XuC11Vc0U5Eifxs5tNH9LjGNJAO5G7dJROL+s=
Message-ID: <878dbbdf4883d509865a1049c11fbe9ae792cace.camel@HIDDEN>
Subject: Re: [PATCH]: Re-introduce Emacs packages specific installation prefix.
From: Leo Prikler <leo.prikler@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Date: Tue, 22 Dec 2020 09:51:51 +0100
In-Reply-To: <87ft3ysen7.fsf@HIDDEN>
References: <87ft3ysen7.fsf@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.34.2 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw
X-Spam-Scanner: SpamAssassin 3.003001 
X-Spam-Score-relay: -1.9
X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 45316
Cc: 45316 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hello Maxim,

As someone, who lobbied for the current status quo, I have some
thoughts to share.

Am Montag, den 21.12.2020, 22:28 -0500 schrieb Maxim Cournoyer:
> The Emacs packages built with the Emacs built system used to be
> installed in a sub-directory under the share/emacs/guix.d/ directory,
> but this was changed in commit
> 65a7dd2950ca13a8b942b2836260a2192351b271
> shortly after having accommodated the site-start.el machinery to
> enable
> loading packages from any profile (via the EMACSLOADPATH search path
> specification).
Won't this reintroduce <https://bugs.gnu.org/38309> then?

> While this change allowed to expose simply and directly the packages
> found in EMACSLOADPATH, it does introduce the risk of file name
> collisions when multiple Emacs packages are joined in the same
> profile,
> especially with Emacs packages increasing in complexity (e.g., using
> more than a single .el file!) and expecting to have both their
> sources
> and resources extracted under their own nested directory rather than
> as
> a flat collection (ELPA, MELPA).

> One recent example I stumbled on was attempting to use the
> emacs-yasnippet-snippets package along with emacs-elpy; both wanted
> to
> install a 'snippets' directory to share/emacs/site-lisp/snippets,
> collided and resulted in problems that prove difficult to understand.
I believe that to be a problem in those packages.  Data should not be
installed into share/emacs/site-lisp, but share/emacs/etc.  See for
instance also emacs-telega, which – while not quite adhering to the
above – installs its data in share/emacs/{telega-contrib,telega-data}.

Regardless of what you intend to do with site-lisp otherwise, data
files should *not*, I repeat *not* be installed there.  I do believe
standardizing share/emacs/etc is the way to go, however.

> This is what motivated this patch series, where the site-start.el
> auxiliary code used for package discovery is extended to support
> packages installed in their own directory under a 'share/emacs/guix'
> installation prefix, via Emacs' own package library!
> 
> The emacs-build-system is updated for this new installation prefix,
> as
> well as existing packages and documentation.  Parting with a directly
> usable EMACSLOADPATH means that site-start.el *must* run for packages
> to
> appear in the load-path; that means for running a test suite, the -Q
> or
> --quick Emacs options cannot be used, since it implies --no-site-
> file.
Having no usable EMACSLOADPATH sounds like a dealbreaker to me.  Could
one be restored by using direct subdirectories to share/emacs/site-lisp 
or would that merely be a cosmetic change?

> + Avoid inter-package file name collisions.
Note: This regards data, which should not be stored in site-lisp to
begin with.  You don't get any benefits doing this for code, because
Emacs has no strong module system.
> + Better integration with user installed packages via M-x
> package-install.  The Guix-installed packages are listed in M-x
> package-list as 'external'.
That does sounds like a genuine pro to me.
> - Slightly more complex loader (although much of it is offloaded to
>   package.el), thus slightly slower (see the comparison below).
That should be bearable.
> - Requires to ensure every package's test suite doesn't make use of
> -Q.
That not so much.  Note, that test cases are not the only use for -Q!

> In my opinion the benefits outweighs the cons by a comfortable
> margin,
> especially with the boring work of adapting the package collection
> already done.
> 
> To test the performance of the new approach, the following manifest
> file
> was used to test the rebuild of the ~900 Emacs packages making use of
> the Emacs build system:
> 
> A simple benchmark testing the performance of the activation of the
> hundreds of Emacs packages was then run using:
> 
> --8<---------------cut here---------------start------------->8---
> $ ./pre-inst-env guix environment --pure -m emacs-packages-
> manifest.scm \
>                                   --ad-hoc emacs
> [env]$ /run/setuid-programs/sudo /bin/sh -c 'echo 3 >
> /proc/sys/vm/drop_caches'
> [env]$ emacs --batch --no-site-file \
>     --eval="(progn (require 'guix-emacs) \
>                    (require 'benchmark) \
>                    (message \"(total gc-count gc-time) = %s\" \
>                             (benchmark-run 1 (guix-emacs-autoload-
> packages))))"
> --8<---------------cut here---------------end--------------->8---
> 
> On the master branch:
> 
> --8<---------------cut here---------------start------------->8---
> [...]
> Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-
> profile/share/emacs/site-lisp/zotxt-autoloads...
> Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-
> profile/share/emacs/site-lisp/zoutline-autoloads...
> Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-
> profile/share/emacs/site-lisp/ztree-autoloads...
> (total gc-count gc-time) = (25.242400751 13 0.189669369)
> --8<---------------cut here---------------end--------------->8---
> 
> Or about 0.65 s on a warm cache.
> 
> On a branch with these changes:
> 
> --8<---------------cut here---------------start------------->8---
> Error loading autoloads: (file-missing Cannot open load file No such
> file or directory kotl/kotl-autoloads)
> Error loading autoloads: (file-missing Cannot open load file No such
> file or directory helm-easymenu)
> Error loading autoloads: (file-missing Cannot open load file No such
> file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-
> profile/share/emacs/site-lisp/guix/flycheck-cpplint-0.1-
> 1.1d8a090/flycheck-cpplint-autoloads)
> Error loading autoloads: (file-missing Cannot open load file No such
> file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-
> profile/share/emacs/site-lisp/guix/evil-anzu-0.03/evil-anzu-
> autoloads)
> Error loading autoloads: (file-missing Cannot open load file No such
> file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-
> profile/share/emacs/site-lisp/guix/erc-image-0-3.82fb387/erc-image-
> autoloads)
> ad-handle-definition: `ido-completing-read' got redefined
> Error loading autoloads: (file-missing Cannot open load file No such
> file or directory tex-site)
> (total gc-count gc-time) = (26.175704339 47 0.783184412)
> --8<---------------cut here---------------end--------------->8---
> 
> Or about 3 seconds on a warm cache.
Looking at these, total does not seem to have changed much, but gc-
count and gc-time more than tripled.  Any idea on how to mitigate this
or do we have to live with that?

> There a 6 errors that would need to be looked into, but I these look
> like actual packaging problems rather than new issues.  The
> previously
> used way to load the autoloads, '(load f 'noerror)' would have masked
> them.
Regardless of how we handle site-lisp going forward, please do look
into those issues and perhaps file them against the individual packages
if they also cause (other) trouble using the current setup.

Regards,
Leo






Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:19:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:19:16 2020
Received: from localhost ([127.0.0.1]:40353 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO5i-0000F5-JG
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:19:16 -0500
Received: from mail-qt1-f177.google.com ([209.85.160.177]:46060)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO55-00008T-Al
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:38 -0500
Received: by mail-qt1-f177.google.com with SMTP id g24so2462525qtq.12
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=X3OEMwPLzEnVfjoRuj8GTVgxzX+4VcvwAOMd9bpAlCE=;
 b=lzR0x+RjylWN4o7Ghx+vOTef6KH/48r4mNXg6oAndWNaW02TqiwIPPrBdWCE5sgJBy
 4ARuTFpu9TROUS2h1yTb20bJkrgSSTWlXk4eOHUlYBKBTJeK8Qg+dRRIP/kpwEsviVGl
 c65TQmqlBJQtGt2Xz16iZ4uLMDN2+JSIVdbteOigLnnkpz8GxE0Mf+g1jztObFh6Lwv+
 wJuJpDePy8itXBSgs5etTxZcMAJ99TVmqtSqvK2v1gice+0NkGO7XdPUDjDf6Hvtq0V5
 TA2brJ+yWo0bGe6RrL1gReJR7ZBhFSU/9ujXmJfpWlDn3DMg8BSb2hUPUZ0J73FLywXq
 g9tw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=X3OEMwPLzEnVfjoRuj8GTVgxzX+4VcvwAOMd9bpAlCE=;
 b=cUs0kYSini7P1yba/3AtpKxQh7FN8G+6PvCm/qg/L7gQ2h+qLbwjc2sjDizoBeGWBa
 99HcxDTHXO/aa7Qnejz2gW88oVhr0G/iRXMxfzXAKNVIorjUg4J82bK7iulqib2KnlNM
 +XFUTILNfVanB4lXdJXhkD7xeq6S99XnEKiUJMaShTBVSahQ2E2HdwA1jx5B+w0UelJ8
 ZxcPjURbeJd/T8kVi+xTtQyFM80tPKNsCHyc3lHkWbb+7ixyLm8wU11LcxM8MuK8XNzW
 RGs2P/+gM5AGhiL07AwRn5wt8bmaNaqBLsRDAvelxaH9+f20WWkodHBk/xFbDiw08OP9
 BLlQ==
X-Gm-Message-State: AOAM530vhu06vhGMkD42xMEZan/FRe6xTk9/AJMpYdj6VBXQSQfM+uCg
 se/8Ent9A1EIIGJHxBIl2n1yr736tNWoectj
X-Google-Smtp-Source: ABdhPJxQc+bFRvamzZo2/8j5QiCP+5tE3ynxTR3rZ8sfjNF6+inp7mH4QcnWLZi+HUfza0wwEIHQzg==
X-Received: by 2002:ac8:4e4f:: with SMTP id e15mr6242996qtw.110.1608329909945; 
 Fri, 18 Dec 2020 14:18:29 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.29
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:29 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 26/26] gnu: emacs-realgud: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:23 -0500
Message-Id: <20201218221723.26829-26-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-realgud)
[phases]{strip-no-site-file-option}: New phase.
---
 gnu/packages/emacs-xyz.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 267b031be8..89914f54ab 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7130,7 +7130,12 @@ after buffer changes.")
                                "(require-relative-list \
 '(\"../../common/run\") \"realgud:\")\n")))
              #t))
-         (add-after 'unpack 'fix-autogen-script
+         (add-after 'unpack 'strip-no-site-file-option
+           (lambda _
+             (substitute* '("configure.ac" "Makefile.am" "test/Makefile.am")
+               (("--no-site-file") ""))
+             #t))
+         (add-after 'strip-no-site-file-option 'fix-autogen-script
            (lambda _
              (substitute* "autogen.sh"
                (("./configure") "sh configure"))
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:41 2020
Received: from localhost ([127.0.0.1]:40326 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO5B-0000BA-7G
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:41 -0500
Received: from mail-qv1-f50.google.com ([209.85.219.50]:42098)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO54-00008Q-LG
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:35 -0500
Received: by mail-qv1-f50.google.com with SMTP id bd6so1678208qvb.9
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=VoTeRLAjoBs4TAxbwwSwx2gK8fpwhBOuMbELj28LT3M=;
 b=hQNU3jHsD6mK+/FNkmb1N7rp8iAL6shbPCmBDto5NXF1NWalMD4TM66Y9hWNif74Xf
 pYNpahkQNLU6+FNPUUW7XI+ZzrRrNNFkgJXlZ04NDTLS8i8cfVAuGk4PRaO606V+03eU
 HZkM+a8KgMuTm90Ytsc2FRmLne35Jj0QZ1QdGcDO6rJmt2wvRmhQEn5db7dp0EhjabP/
 Kkd4ermB2ix0Q+fAaBDXtyOw9/ZmoSZuKJOqfj/9uHN9qy/HUQQExXI9HWfgtvkYM5SD
 PO6kSny8wh/cRDx/qvooGTGYK90+skm2saRZd+1Vuc/IFc3SkJOzqXeqQlvsqyAZrOtR
 WwNA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=VoTeRLAjoBs4TAxbwwSwx2gK8fpwhBOuMbELj28LT3M=;
 b=c2464fSHilqu/pFKnoJkfIC3Uq5Fk/PmlClI6eYkBxR1y2ShvyipWPg0jQ3O+mekX3
 NjB4WrIGKmVEUAL396l0geuLKcm0znEhXAChkY/yE9FmxUdUpjhmzLcb1VNLn2IyCqod
 YeZFKcF907AhaFTwGcwtBPIiYFQtMBoOIUmo3dBO2EDAThnIwKKG7QJdJshsUF40j6io
 84I/W5y03lqIVynRkHJA3Bz+rJitCjd2sALyENrMQEkob2FRSgA4rr4zKnjBb2q6VGQy
 qfcHNo20DevhqvcqU8YC6LJ0qTvQPArANTZUOVZw88uPy26i7ObVJ0jPhoklI+REFCyh
 SYKw==
X-Gm-Message-State: AOAM53338YL2bvToYpSg7eCPW46m/SFmaqw7oSV7Uq6Ezr3mqDHWv8P5
 u+TGOFiU0srei5MQUKEnif8D+WZCT+34Ep1C
X-Google-Smtp-Source: ABdhPJy5Nc40f8kbwVU2GtspE4NBn0V0i+eMZuO5KG0/j0UQbzGxgvgXp9dR7YygwrG6q2OF7sr1CA==
X-Received: by 2002:a05:6214:13e2:: with SMTP id
 ch2mr6739233qvb.57.1608329909160; 
 Fri, 18 Dec 2020 14:18:29 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.28
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:28 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 25/26] gnu: emacs-sly-named-readtables: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:22 -0500
Message-Id: <20201218221723.26829-25-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-sly-named-readtables)
[phases]{make-autoloads}: Delete phase.
---
 gnu/packages/emacs-xyz.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a1e9d6dc9e..267b031be8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9534,6 +9534,8 @@ additional support for working with ASDF projects.")
       (arguments
        '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
          #:phases (modify-phases %standard-phases
+                    ;; The package includes its own autoloads file.
+                    (delete 'make-autoloads)
                     ;; Byte compilation of the autoload file fails.
                     (delete 'enable-autoloads-compilation))))
       (synopsis "Named-readtables support for SLY")
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:41 2020
Received: from localhost ([127.0.0.1]:40324 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO5A-0000B1-Ug
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:41 -0500
Received: from mail-qt1-f172.google.com ([209.85.160.172]:41090)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO53-00008G-Vg
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:34 -0500
Received: by mail-qt1-f172.google.com with SMTP id j26so2476695qtq.8
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=eVbm79OqeLLm+O+B/ArqTkmO3ZGkl0H/QqLvUdPaWn8=;
 b=a7KHKFuD3vTWwIPk0gs9sti7eFWHp7CWKG4T5byBeDtBJiVNwjhqADOSN9VbuBUPCS
 Kkb2+IG058byYuy3KM/L/7SANOm5rItm6NwXXAsoCTqMI1X404vhVncYzw6wHX2A0Vkm
 k761BYF+yctcJ/g5FOLCXsQuPlUjGGMp+UAwUykeF80NdpuJkl+3jlEi/6OeaFLWuht9
 PrOkORFYRWe8KYtGk7qoAWJDwgpLZJLq/AvM77gbMODSwg6KeVMgfEWNMIW86dVcLgug
 fnEZ1pHRpIMLAW63n6vjG1WHdPcq3Vh/HT9Pvt3BSjAGVdwQelpUxZj3ipixdidGcSl0
 6bOw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=eVbm79OqeLLm+O+B/ArqTkmO3ZGkl0H/QqLvUdPaWn8=;
 b=lmcm0b7GS22D3pVQcBENf3YpjXPy9G+7Tm2K0BaNfZJ8hCDNyjUxvQnPj/a6br367b
 QynFNsloZOaLtgO09xUEsxOQk6tEIrn6TezsfnFauVq1LFhcqvc4u4H1ICm//5uWDXf8
 ysOI5doHxVtR8OdPPrx1/HbE10Jn3dPADAN0cmJHfOWgYGpR8gDYWcWTdb1NW9DVHYod
 U0r6+dQ85VHrw4xhXx3LrU6nwE2wnLiQs4acWYrZD2xLaaEzbBoaaDOAZ//+qehtsMDt
 WxnNJSD6klI4bX36KTL85lZOLu0b5ceTlJq4sQAGqE+TBrb3BZ5CF6Wpzjjdpn8zIlpP
 w4Ng==
X-Gm-Message-State: AOAM530qWSRplJoiVugeUiQ9UIsbwTJuXUIs5sncMJNmj75L89qVOMPG
 grszpJRPVPXQ4nmEA4FlvbR9MzxqD4KCmWET
X-Google-Smtp-Source: ABdhPJxe1g0AYZGwxHUI90kUDjhMZPa1jtxb707KPsL6/3b5hcpx1dfTYGQGE6sk0e52xsviYB4Q3w==
X-Received: by 2002:ac8:3aa6:: with SMTP id x35mr6303964qte.326.1608329908470; 
 Fri, 18 Dec 2020 14:18:28 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.27
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:27 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 24/26] gnu: emacs-sudo-edit: Update to commit 0e2c32b,
 fix tests.
Date: Fri, 18 Dec 2020 17:17:21 -0500
Message-Id: <20201218221723.26829-24-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-sudo-edit): Update to commit 0e2c32b.
[arguments]: Use the full blown emacs package, as one test fail otherwise.
[phases]{fix-makefile}: Do not use -Q.
---
 gnu/packages/emacs-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index aebe0e5bcf..a1e9d6dc9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4833,7 +4833,8 @@ Gnus, e.g., for applying patches received by email.")
            (add-before 'check 'fix-makefile
              (lambda _
                (substitute* "Makefile"
-                 (("\\$\\(CASK\\) exec ") ""))
+                 (("\\$\\(CASK\\) exec ") "")
+                 (("-Q ") ""))
                #t)))
          #:tests? #t
          #:test-command '("make" "test")))
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:40 2020
Received: from localhost ([127.0.0.1]:40322 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO5A-0000Au-Kf
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:40 -0500
Received: from mail-qt1-f177.google.com ([209.85.160.177]:37159)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO53-00008D-5D
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:33 -0500
Received: by mail-qt1-f177.google.com with SMTP id z9so2490942qtn.4
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=HZADTFaDw4pp4xljUgNrmX1f554SLkDuEypI4cmaL60=;
 b=PhPQ6WAyAlIG0CApAowufXq8kQjcNoDyrYdy+svat1FZbHPrDlBqnlpRVaa96cEdFH
 KMh+TN6tuc7BKEdub9CZKtMTPPoiuR8+xmMKNEgWDO3a4AXRnXYxAY5npf//TzJrHqQQ
 pE44W+ArvPfMlEssxJ1Qy1UyIBeIsrEJ2QoJKw30f9JevP7vfRvPfbT4bRmt65lQyiaP
 SY/r1e7URB+REAzplKya2QcsiKJFDBNvmUrs8qwNJm5kaWkpAlRSJBmwOo31iMpjUFsY
 SdN9eoCej8+87W0iILPm4EfqetmfZI3X/2A2OIpECa6FCCbPZh3e53TdSgxoUrIDW7c0
 TgIw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=HZADTFaDw4pp4xljUgNrmX1f554SLkDuEypI4cmaL60=;
 b=WraGJHrzcOH9Aw+vSNs8Q1SZZ9gdY+KODGZkaNGekQkO8+bdRcrqDxcMclzZVFcvjc
 OFwcmeP9j+Qtw9ov3aBGuFPKAYEiCVIef1RvpvWx1wE4/c7/8yS0xEatcwRST+3P8gYB
 xptjO1aJZmVUzjKpjwZbNzUhL6pR+HbmODmEQ3UcKTAtGRzKWV+l1MBFKOkaPGrP72Ar
 8APAkWO+OF+mTndT8eb2PXLXFLf/rNMCoAyNKEqPFdxvES9cCu4yO36n0LmTu3cx7Uvm
 TB3sLQ0mqpmXJd3bz/h5tOdt131bYukvQ7MxK04SEQDCUFw+b89wGSY0mkLRy9VefK4M
 fzDQ==
X-Gm-Message-State: AOAM532R40iwJUmiEeVTeRCG9YxizAl1bBENDv+CrcUNJLHRwONDoepN
 On7fVjieTQZYDI/xXvjdZCQeq2zQiXbICKXE
X-Google-Smtp-Source: ABdhPJyaU9Fm1HM0IEkA9XjOeqPTcTnH0srAykBQ7v7DDS6AqGXunI/YfT0bKDOcPCU/nH9wkTFz3Q==
X-Received: by 2002:ac8:4818:: with SMTP id g24mr6174333qtq.252.1608329907712; 
 Fri, 18 Dec 2020 14:18:27 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.26
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:27 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 23/26] gnu: emacs-rjsx-mode: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:20 -0500
Message-Id: <20201218221723.26829-23-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-rjsx-mode)
[phases]{strip-Q-option}: New phase.
---
 gnu/packages/emacs-xyz.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 446b25e502..aebe0e5bcf 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -21986,7 +21986,13 @@ definition-jumping and type-checking on demand.")
        `(("emacs-js2-mode" ,emacs-js2-mode)))
       (arguments
        `(#:tests? #t
-         #:test-command '("make" "test")))
+         #:test-command '("make" "test")
+         #:phases (modify-phases %standard-phases
+                    (add-after 'unpack 'strip-Q-option
+                      (lambda _
+                        (substitute* "Makefile"
+                          ((" -Q") ""))
+                        #t)))))
       (home-page "https://github.com/felipeochoa/rjsx-mode")
       (synopsis "Major mode for JSX files")
       (description "This package extends the parser of @code{js2-mode} to
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:40 2020
Received: from localhost ([127.0.0.1]:40320 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO5A-0000An-Ab
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:40 -0500
Received: from mail-qt1-f177.google.com ([209.85.160.177]:39948)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO52-000086-9d
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:32 -0500
Received: by mail-qt1-f177.google.com with SMTP id v5so2482486qtv.7
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=Mf2Zal3AZkz8a51K16CmXosTaRrIKNxQcO9/e91bojQ=;
 b=ICUIfyrkChTk8sgs1nJ8TQnQBy0mMoW8Yg0ftJBPmBCik11ZGYqE3EECHmgatRgjGv
 VIg4HbKe/7iEhrmT38VBkvRGSOU0sNfOq/4Ap7GjnPevfhWdFtMRcBArFbfFRjh3a686
 urgcFjCA5ikHxdn4JzDphEYzkAWi2FecrVL/nRiPv5bvCfVg0R0SKOHSlaMtrgPmPerF
 RjtKVN8ZF1tKNiXMKv9biQG9LbrTYYspyYiDLW9vH30yGhUwsHNHKpGiUWFFu/ngLriN
 QxX6EcI+TBRCZpQuewNNZ3qqzsRiybJxnXpOuyGNZBdexecemmoPhuJRE2ufElQqYoDj
 P8DQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=Mf2Zal3AZkz8a51K16CmXosTaRrIKNxQcO9/e91bojQ=;
 b=AFzoVO+2DEaMmv5UtqRvZ0H5BKBcGG8sF5MEYeRY82w5yQYj+TJJ7Dn/emmfvx9rp9
 wvMUo/QEG9u06b8LYmj9eLd5DpM245HJNlY49GeyC6BQlkGWiOqhZ7NOaIG8+PIgUSyS
 XfpgrSinDTJYrxJZM2HkAeh0TgATdWUMkO5OmgwsRkhPetx84mBDnY1P9t9ACrB0an5h
 WSKbr+h0rhcbMcukCzrURcbm7A/nkBxM3ro8sbQvaEeMexrZTQbT5kTZgFbvB77pK0Dr
 USaagnmLm/N2lPEnuhsRaW61u6SsMloloveBUw0yQpHe03cWBoRUJFQasoiuEDC1A4eW
 seqA==
X-Gm-Message-State: AOAM532WF8yT16z3nT9FDE4TkdftQcYH3IhhIx3T2GQG6p2PhuxAKWQI
 dg1nKcahyIG/YR9BhnKi0XDQT7jdU0h4MmYO
X-Google-Smtp-Source: ABdhPJyVkjeKufIgHNge7OFs/UvJdhlnEoiZQNZKsplE19EKyxE8da93JYYKXyd8UmcVy6UFauyvsQ==
X-Received: by 2002:aed:2c63:: with SMTP id f90mr6122785qtd.31.1608329906851; 
 Fri, 18 Dec 2020 14:18:26 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.26
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:26 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 22/26] gnu: emacs-howm: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:19 -0500
Message-Id: <20201218221723.26829-22-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/mail.scm (emacs-howm)[configure-flags]: Adjust installation
prefix.
[phases]{create-pkg.el}: Add phase.
---
 gnu/packages/emacs-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cc6d0f03e7..446b25e502 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2163,8 +2163,8 @@ a set of simplified face specifications and a user-supplied color palette")
      `(("emacs" ,emacs-minimal)))
     (arguments
      `(#:configure-flags
-       (list (string-append "--with-howmdir=" %output
-                            "/share/emacs/site-lisp/"))
+       (list (string-append "--with-howmdir="
+                            (emacs:outputs->elpa-install-dir %outputs)))
        #:modules ((guix build gnu-build-system)
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils))
@@ -2173,7 +2173,9 @@ a set of simplified face specifications and a user-supplied color palette")
                            (guix build emacs-utils))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'install 'make-autoloads
+         (add-after 'install 'create-pkg.el
+           (assoc-ref emacs:%standard-phases 'create-pkg.el))
+         (add-after 'create-pkg.el 'make-autoloads
            (assoc-ref emacs:%standard-phases 'make-autoloads)))))
     (home-page "https://howm.osdn.jp/")
     (synopsis "Note-taking tool for Emacs")
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:40 2020
Received: from localhost ([127.0.0.1]:40318 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO5A-0000Ag-1w
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:40 -0500
Received: from mail-qt1-f177.google.com ([209.85.160.177]:38287)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO51-000085-IL
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:31 -0500
Received: by mail-qt1-f177.google.com with SMTP id y15so2483758qtv.5
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:31 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=P4Y+znXxSILkD9MuzKJyCiymBxIeOj+o8WQKITO4hfs=;
 b=hUE79HN5yBt+xrAIA4KdGNUIkqjMuJdw8pt66l8UH0U/cWyV2puiWoNZWa2+RdOnMc
 VczO3F2h16YwWueL3UZro2WQB2RoVGBM61Qy9brpaRQ1VXUVmA6KExisOH6xkpO4Lv7D
 b88jFj4r6EqaRv3nMY7Ne2yUcaZPb9mVNUdCpRlQ9pIWB1InScR6hbIZmAcOL8c3hUoY
 p+1ydGV0nSSomCagyW6sEY6WJH2U9uvWGeTzWKIeYfE54V7g5ygWFStXO1BXTSFGlPQe
 IUEqEow3zMLyoYQOZH9JuY9CpRlxEL08vqSDSj27uaQsVgZAlONjjMotojmLHvSosaP+
 DF1Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=P4Y+znXxSILkD9MuzKJyCiymBxIeOj+o8WQKITO4hfs=;
 b=pTp3J3ZST8xWOhN1BRQD80t5BCgLgr3e2IfFHuDf+FOW4fKm//rBEhuQBsOfG2sCXA
 VSXX/Vt4axkt2oMTI3QPFbp7hWJdCgI6D33Z9GSq5vzej+Wj5cWVdptQLfyyGDRxzpXP
 MevVdXNDTwL6btasIIGmEbqKXONPZHaDCoiEUNLgBomokVvTWBNewvWNrUyIrziMXT+W
 DnEiGlk7FJ8O+Zd281kg+kwbknFDayId4CXUhwalg3nR9wtR7YjV4x/6DqLVaTEa/oSM
 OVakmu8ZQBeVt9c+OgBvX3u5txG074mWJISnQ7I7hFYlPwaJfTaQIUwdyB/uLp9YfL79
 qpdg==
X-Gm-Message-State: AOAM530luLIkeyE2CIsIW5KlYaKFRQcahBcsue5ciT+w7j+Fz1WvRo04
 YTMkXwRSN07okNEq/Vey/GxtCbAvznoqHhhy
X-Google-Smtp-Source: ABdhPJwYJXKwHpgFAvnVf5u+AZ4JSD+cBivlLPGoS02JtR07inM/nzZ4ydrINMOYuGodJXBOIS9Cjg==
X-Received: by 2002:ac8:1c38:: with SMTP id a53mr6392961qtk.70.1608329906140; 
 Fri, 18 Dec 2020 14:18:26 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.25
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:25 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 21/26] gnu: notmuch: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:18 -0500
Message-Id: <20201218221723.26829-21-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/mail.scm (notmuch)[phases]{configure}: Adjust install directory
prefix.
{create-pkg.el}: Add phase.
---
 gnu/packages/mail.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f85713433e..862b6c939a 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1280,8 +1280,7 @@ invoking @command{notifymuch} from the post-new hook.")
                       (setenv "CONFIG_SHELL" (which "sh"))
 
                       (let* ((out (assoc-ref outputs "out"))
-                             (elisp
-                              (string-append out "/share/emacs/site-lisp/")))
+                             (elisp (emacs:outputs->elpa-install-dir outputs)))
                         (invoke "./configure"
                                 (string-append "--prefix=" out)
                                 (string-append "--emacslispdir=" elisp)
@@ -1300,7 +1299,9 @@ invoking @command{notifymuch} from the post-new hook.")
                       (substitute* (find-files "test" "\\.sh$")
                         (("/bin/sh") (which "sh")))
                       #t))
-                  (add-after 'install 'make-autoloads
+                  (add-after 'install 'create-pkg.el
+                    (assoc-ref emacs:%standard-phases 'create-pkg.el))
+                  (add-after 'create-pkg.el 'make-autoloads
                     (assoc-ref emacs:%standard-phases 'make-autoloads)))))
     (native-inputs
      `(("bash-completion" ,bash-completion)
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:40 2020
Received: from localhost ([127.0.0.1]:40316 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO59-0000AY-PN
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:40 -0500
Received: from mail-qk1-f180.google.com ([209.85.222.180]:39286)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO50-00007t-R2
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:31 -0500
Received: by mail-qk1-f180.google.com with SMTP id p14so3610804qke.6
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=bVSwogSb8I2C5hNtUg5TF6zi91UhnwcejlNuZ8MfBvo=;
 b=PK9b3r8u50+t+gtgtDXNY9N/Yl293Z95Q952O1ivmf2uXd7jzTYbNVO3hlecAvItk0
 SbawrqleDMXGNWLC6d6qGMqhDmMyWwp8728HLXM5pb2TW8MwVxvPvPZPLaljOmR+hXaN
 LccFti24R+ZR6CH9wGTW+7dMTEaz+YXRstmyZjjzu0kBzQ8XOuji2XRzIY0GOL8k55Sx
 G41KAI8MhFfBw9peV6MkOniG/NzjvxrCmwm63R0amkIkPWwMUqyK3AZuLGOH1lCja0qn
 4Ga39AxfxYBuPLxikE+3qvjzJnb+Xq0orSdADnJIHDZ4UpXBZnvJh1RPpZCo74XiiAOp
 40CQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=bVSwogSb8I2C5hNtUg5TF6zi91UhnwcejlNuZ8MfBvo=;
 b=OQSB4Ifn7trHFgtuE3zRqeTT7did0AMbcPMPCJi1ZhzfSkOgrBxky/0UVSOKDLIVyZ
 yTyCLQ+uADTQ/XLg0lPsIxxFZzfErroHKGXLvsfXL9y9eTPGkqrsu9QakD04uRltRAax
 7JMghBRKY0IGyy5/yt8V28mj59gAUIuhb89t+gVctgYBSNhlvKelNGz8CH2bbwIsjPzE
 9FnYLITeQM67iCldQDclcHHHpzsvH886xYhRExC9sd7j0GNZaDP31Fj/SQnv6qqUqdLF
 LH4nRVKC4alH44XvnpRIJbdbSxC3PZDSJ5bARcLD4fc31LPqlKjUyj5rYXEnZkn/ka+L
 2yIQ==
X-Gm-Message-State: AOAM532SG+WaQLD1paYLc19C3MLnmDCqjm2qwvWJRrBkLhHb76aq6f+j
 JDP5E3rnN/iZo+qmaMQI33zJkb1CKzWwi/S2
X-Google-Smtp-Source: ABdhPJzuAzIHIWw0WL4dAZaRnIdpKOLRW05WpLpiTUYrLxnwvjYDEl3AYZJMdf27jb48rnZo1y+fIQ==
X-Received: by 2002:a37:6845:: with SMTP id d66mr4386386qkc.463.1608329905335; 
 Fri, 18 Dec 2020 14:18:25 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.24
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:24 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 20/26] gnu: emacs-org-super-agenda: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:17 -0500
Message-Id: <20201218221723.26829-20-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-org-super-agenda)
[phases]{prepare-for-tests.el}: Do not use -Q in test suite launch script.
---
 gnu/packages/emacs-xyz.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e4209fa43e..cc6d0f03e7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14925,6 +14925,8 @@ as well as functions for navigating between these headings.")
              (substitute* "test/test.el"
                ((".*org-super-agenda-test--:auto-map.*" all)
                 (string-append all "  (skip-unless nil)\n")))
+             (substitute* "test/run"
+               (("-Q ") ""))            ;to load site-start.el
              #t)))))
     (native-inputs
      `(("emacs-f" ,emacs-f)
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:39 2020
Received: from localhost ([127.0.0.1]:40314 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO59-0000AR-Gf
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:39 -0500
Received: from mail-qv1-f41.google.com ([209.85.219.41]:35391)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO50-00007n-5P
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:30 -0500
Received: by mail-qv1-f41.google.com with SMTP id l14so1692813qvh.2
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=L9pA19yz2aV+1OQs67VqtsxQudPtS3IUmO2xftLfwTM=;
 b=nsjteV1/ILBXhNl8YuHx0F1vrRa/8UBpEwh2NLQEUAEsmy231krWrEmuXwR7T7Asr1
 AB3SYcJ0OKWorpDoRSRBRUgRxvJdJ1m1tcfsnkes9a1AimgphM1tnD1WEPncoOe5chKx
 74CZbluVxqKV9HxnFKkxQkBTT+dnxM55JSBueiqiWFpF+sVod/sWMn45X6qJtQClB89T
 qAohW+J8OdaYcqm1W9FBJKiTQ1gCH1B9rg/uxwzAdPbtLm34z/ahISCouBpEyHWUnm/5
 tIzmRAAZNfzYeXxfpv8HhCFd5i1O7KO9ukVbA7Zxk07+lqCiFdobqxlyfCrnLKztw8as
 ycmA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=L9pA19yz2aV+1OQs67VqtsxQudPtS3IUmO2xftLfwTM=;
 b=oq5uxeMMwL5RPOWQCMkLoe+0K9oZusbf5T5GTRFhPFPxVt+497P7a49FFb+HqvB+4f
 l94uCcSsaDBkCj+nzzjVRkyyzqcSN/svobwPpEkTh+EJWX8ij8KCpGwF1MoCHP0S2pUr
 wNpEcPCVhKXo3vOnQllDMO9bH/pLQTdLhkGPVh+YgOsneqJrp75Ue81uKpwX0UwLfBtj
 +LKpkB2ChYlsZg48zY3W1E21M92wtpH9/3qi/pRsDWDClDCwVA6mdpvChLvU63WrTe7l
 04vCUpF61mhuC/wWFPUC+3vapSnHcU8PgJaPU9Ch6Bnt6rJmEvze/o8mIE8659Ronz4n
 ntOA==
X-Gm-Message-State: AOAM531cqCjyJ0B/9T7cXXV6TOUl1fc8q/yVlrEt5+FfWe5L6eIWgv3m
 rVZscQZ5Z3LlZ2WC3f79MmjW2xvDjXQ3FMw/
X-Google-Smtp-Source: ABdhPJxEJDEA0SUYMXkG3iELyF0aJCnAjpUaFFaOGPxN+Uqc81Yx68x7YKp8h8Gx3/bSWhrKfDuPnA==
X-Received: by 2002:a0c:a905:: with SMTP id y5mr7065444qva.55.1608329904663;
 Fri, 18 Dec 2020 14:18:24 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.23
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:24 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 19/26] gnu: emacs-magit: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:16 -0500
Message-Id: <20201218221723.26829-19-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-magit)[phases]{strip-Q-option}: New phase.
---
 gnu/packages/emacs-xyz.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 70c9a08e90..e4209fa43e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -520,7 +520,12 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.")
          #:test-command '("make" "test")
          #:phases
          (modify-phases %standard-phases
-           (add-after 'unpack 'build-info-manual
+           (add-after 'unpack 'strip-Q-option
+             (lambda _
+               (substitute* "default.mk"
+                 (("-Q ") ""))
+               #t))
+           (add-after 'strip-Q-option 'build-info-manual
              (lambda _
                (invoke "make" "info")
                ;; Copy info files to the lisp directory, which acts as
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:39 2020
Received: from localhost ([127.0.0.1]:40312 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO59-0000AK-5W
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:39 -0500
Received: from mail-qk1-f171.google.com ([209.85.222.171]:44694)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4x-00006p-12
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:30 -0500
Received: by mail-qk1-f171.google.com with SMTP id i67so3567663qkf.11
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:27 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=epVVXY1yDmxeMNEwXur4IRPxpgXLMdFCUXtJpwjNN5g=;
 b=Smg6giY953PeDuYXH/CTLPpryjygBlQbEkpCH3b6CbnWyUXxphmWx9GSQlz8Gra3FE
 zPon6lmCIuJ5frE2vQ++dBojXWvlWUTKxxxk3ZOW2Y7l8OdzOZxN94KLXqRGkTDqV94q
 DbE0kTeGtTmDFDzIhSKQAB8BdJ3Sz3om7qegEqGEjpRchkuGjxujXgp5RmPFlH2G8ppa
 HuIgEhq2HrdJo34L6CQJ4KXqWoJZBIK7dJKWCz+MNvFlFQZIKbHwT5pRy51gz1A3Rp9v
 e+577yJUFjNrsJfF039OIrZgymy1/oycADXkYYavbfCODktPKUdHgUr/DxjdDxILH8Lp
 VrlA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=epVVXY1yDmxeMNEwXur4IRPxpgXLMdFCUXtJpwjNN5g=;
 b=oDOmcOw3TivEzeZW7J2wgZSCkGN1aSXaBgmjd7x5mIQj1li/fsfFIE4sJLac/HRSRA
 ptnshVgtOKgiFv5nE5EG8cp57uw3qTf/Pgraf37uEx5VIwd2zReumcny2U1GYNpAzaNS
 kyNZbDy/dzoyZNJxYo4haBMpQydh91i+pkI34Hc0HiySHWgCKlU75/3f6LIhCpRjV0Qi
 9v5PE/dvDpvrA1JnW7sEIbTh4XZgFp99kyh/WepfG1mn3njDEimXpWe4pwNQE/NdlERb
 q9XGk0MIGiHHQw4ZNoZUBSZfhVJ6nP/fksNkSffY2j1EcpodxInNEbk5jwq5n7BHBZeT
 TY8g==
X-Gm-Message-State: AOAM531YFcirdAlqpKm8N4SS/uV39I75JruRbSTKqpclT53LDDHo8/4G
 8agybI3itVGXV/6/25krNaKBKbbvvoYezM+y
X-Google-Smtp-Source: ABdhPJx5Vil+IEBCQ5RxtzmerH6RiJNYTH/UdsTaDSiRFwspnEQaNhWdT1+8WreG6JV+tS3BPjw8AQ==
X-Received: by 2002:a37:68c:: with SMTP id 134mr7133669qkg.374.1608329901631; 
 Fri, 18 Dec 2020 14:18:21 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.20
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:21 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 15/26] gnu: guile-wisp: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:12 -0500
Message-Id: <20201218221723.26829-15-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=yes
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/guile-xyz.scm (guile-wisp)[phases]{compile-emacs-files}: Move
after 'make-autoloads.
{create-pkg.el}: New phase.
---
 gnu/packages/guile-xyz.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index dfffbfc62f..349dce73d3 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -16,7 +16,7 @@
 ;;; Copyright © 2017 Theodoros Foradis <theodoros@HIDDEN>
 ;;; Copyright © 2017 Nikita <nikita@HIDDEN>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@HIDDEN>
-;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;; Copyright © 2018, 2019, 2020 Arun Isaac <arunisaac@HIDDEN>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@HIDDEN>
 ;;; Copyright © 2018 Eric Bavier <bavier@HIDDEN>
@@ -1746,10 +1746,12 @@ The library is shipped with documentation in Info format and usage examples.")
                #t)))
          (add-after 'install 'install-emacs-files
            (assoc-ref emacs:%standard-phases 'install))
-         (add-after 'install-emacs-files 'compile-emacs-files
-           (assoc-ref emacs:%standard-phases 'build))
-         (add-after 'compile-emacs-files 'make-autoloads
-           (assoc-ref emacs:%standard-phases 'make-autoloads)))))
+         (add-after 'install-emacs-files 'create-pkg.el
+           (assoc-ref emacs:%standard-phases 'create-pkg.el))
+         (add-after 'create-pkg.el 'make-autoloads
+           (assoc-ref emacs:%standard-phases 'make-autoloads))
+         (add-after 'make-autoloads 'compile-emacs-files
+           (assoc-ref emacs:%standard-phases 'build)))))
     (home-page "https://www.draketo.de/english/wisp")
     (inputs
      `(("guile" ,guile-3.0)))
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:39 2020
Received: from localhost ([127.0.0.1]:40310 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO58-0000A8-Qn
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:39 -0500
Received: from mail-qv1-f51.google.com ([209.85.219.51]:43883)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4z-00007Y-5M
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:29 -0500
Received: by mail-qv1-f51.google.com with SMTP id et9so1668530qvb.10
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=qHGw/d+lZNDuL7fhfC3kRm/2cWbzzGk4vlHthqfFX8o=;
 b=UkTOlyc8sWV3V+MOrPmfr3IZeYYv1wyoOVaFaQJEJozLnhK7YsP6c/s45qOWr+dU8C
 7XHz/ccKLZQWuSiBzLy2EqpL83ngnTKZ0TgOZ2lOSWk65I6pyBv6O/bWqS1VThQH+p0O
 fH0IyXtT8x6WbM1brf3x/63pw5nHqbGaJI5wMuOdpp/0kUEVt0P6AVfuYDrIf6ytg39r
 d/wHBrTIr5YANlbvc7sIV+caMW8s0uPJto3dRyRTMv4otARqAiYmvYFwIfMf536Dh9l3
 Y/hins092N/Vnnw+gZM4Q+emhWJeefUPJdcNMvtvIWTYgaoVDtHOV4mXQdj8IJywxyvS
 Kc4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=qHGw/d+lZNDuL7fhfC3kRm/2cWbzzGk4vlHthqfFX8o=;
 b=hsNiCl34zMoV3KLUke1T8UeTUgk1aRalUYQG1xKuqPjNGhxgap5bujfrM7k8/ISVYs
 rdpbmJ7D4bIBvwikoFpwwkr1mAVHB55eVBSLWe14hcDV9OFSbnAYYGb/L2PhQuriMpuI
 26DxCsErlScwiWI7B0HJVLbQqs6hRDscXs8vAC5fMuaXHgCEqx0efwQUUfhuAF1Pn/qJ
 3bSzLN8RQb+zsxoMIII+PyeXLV9qjHRX9jah2m+mW6TYSXH/Nk6RtCzNahw+Z8XaU40y
 VP37NRMkdmrThiE2WOanUGQ2fr+65x824e0bCySuWyGm0ztRHS1hIs6SFT9nHuYS7VZc
 T9qg==
X-Gm-Message-State: AOAM533IayETZ4OCJNGDGUpPvmhrU94oP8aE/YBmdWLpHuiEmY9JnaY8
 +e+VPwNYs83jcdwlWSTB+/Qp69tTiCgky/Qp
X-Google-Smtp-Source: ABdhPJz/00805OC5Z3twG7V2YR6xWNVo5QiOTwCeckKZewhRYAmc9dAv9lrUhxPLymg6VGSY+vjafw==
X-Received: by 2002:a0c:9adc:: with SMTP id k28mr6762089qvf.42.1608329903793; 
 Fri, 18 Dec 2020 14:18:23 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.23
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:23 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 18/26] gnu: emacs-racer: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:15 -0500
Message-Id: <20201218221723.26829-18-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-racer)[phases]{fix-makefile}: Do not use
the -Q option.
---
 gnu/packages/emacs-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5663aff95d..70c9a08e90 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19023,7 +19023,8 @@ files.  It focuses on highlighting the document to improve readability.")
          (add-before 'check 'fix-makefile
            (lambda _
              (substitute* "Makefile"
-               (("\\$\\{CASK\\} exec ") ""))
+               (("\\$\\{CASK\\} exec ") "")
+               (("-Q ") ""))
              #t))
          ;; Two tests are failing with Emacs 27, as reported here:
          ;; <https://github.com/racer-rust/emacs-racer/issues/136>.  Disable
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:38 2020
Received: from localhost ([127.0.0.1]:40308 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO58-0000A0-IK
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:38 -0500
Received: from mail-qt1-f177.google.com ([209.85.160.177]:34635)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4y-00007F-LN
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:28 -0500
Received: by mail-qt1-f177.google.com with SMTP id 7so2512013qtp.1
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=gvZSc83Zsxa2V3CZC2f5tuK1XuqAsQPwOxg55VPZnK0=;
 b=THI9pKghzStbuhw0ir386WcQyW+aAZDkepllEFiYuFTgIbFfDCqq/rwyhR2ucgirqK
 wO89MpRGArSRDTRQ4mqz4RnTa50MQoHdGbF4fByiVAWOPEhmE6osprWYzBNnE0nJml/z
 aLxQO4rkl32TvxaVOBauVyZfxCq63H5BSHxnkPfT30kbo8z4sToMgGbOzHe9hKgJPO6r
 IT/XexUXrmp129JoqXy5AhJim5+DLrHefk1CYm4OWKR+AfYjnQ8j2KVZm8yE+S9KhB5o
 UtwIr/iXQGJ60DABp2tRC4DA5J4+DY68Cl1mpvQFNDajzo0xcbWvUTQURJd9lk8bD/OB
 3q6A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=gvZSc83Zsxa2V3CZC2f5tuK1XuqAsQPwOxg55VPZnK0=;
 b=Kv4988akE/60U3Q1B0EQCuoFbi/gtTfTn3f+oyHXDpsYKcRjd9V3BPVnUFO1F0dlpv
 FSAIVUPD4iOW+G4jbo20asT/XcqF9hy3Ikud90o3FD0oYz/a+7ssOWmDc/6JiDjdVCJs
 f3ATaxKGxkFuIYTJ4A1lmWxz+dv3vlmFL4RFR6FhhkdqXCIM0TLcjUnvAqfUF1xkKZyV
 uMNEzEt3kmqcoURYJ17GRSrHdCuscgsJP0myuwS68vsm0NkqaWbqBUieaGuEIuEWOJs3
 pkb3gjrJpyAf32w48w+y2s4RjerdlpUPkpafMfkujonl5fUfzTKSWuPfaW7/gRR8XY1F
 hqTA==
X-Gm-Message-State: AOAM533B1gG7ZT6wvVNtd1ERCbC0e33VU203IhRNJmOVGn2wHA+XAWcd
 rGH9a1fLS7gbftUIv3axBrpNCwQ8HdAFdn+M
X-Google-Smtp-Source: ABdhPJx31BLl/2nNLcFkxaRDyQRGLdmAiyxUTr8u1Z0hqr3KruSEbQspZTqJHJVkXpy3VLqKws5qAA==
X-Received: by 2002:ac8:3452:: with SMTP id v18mr6276050qtb.191.1608329903124; 
 Fri, 18 Dec 2020 14:18:23 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.22
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:22 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 17/26] gnu: emacs-emacsql: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:14 -0500
Message-Id: <20201218221723.26829-17-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-emacsql)[phases]{install}: Do not replace.
---
 gnu/packages/emacs-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a988e56c97..5663aff95d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14575,16 +14575,7 @@ object has been freed.")
                  ;; in the right place.
                  ("(defvar emacsql-sqlite-executable"
                   (string-append (assoc-ref outputs "out")
-                                 "/bin/emacsql-sqlite"))))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out")))
-               (install-file "sqlite/emacsql-sqlite"
-                             (string-append out "/bin"))
-               (for-each (cut install-file <>
-                              (string-append out "/share/emacs/site-lisp"))
-                         (find-files "." "\\.elc*$")))
-             #t)))))
+                                 "/bin/emacsql-sqlite")))))))))
     (inputs
      `(("emacs-minimal" ,emacs-minimal)
        ("mariadb" ,mariadb "lib")
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:38 2020
Received: from localhost ([127.0.0.1]:40306 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO58-00009t-9V
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:38 -0500
Received: from mail-qk1-f172.google.com ([209.85.222.172]:44696)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4x-000072-MH
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:27 -0500
Received: by mail-qk1-f172.google.com with SMTP id i67so3567686qkf.11
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:27 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=AbZ57hjl3gLbWYnWM4T9/0nxvY+Bsc7CY35D0qXZTbA=;
 b=FAZSVI9OhSpAQGGQcMkqT2DYK8Vn+GhD3Ua+NIr9k9HWlGfB+8O1emL+M1ol7YCl0J
 BOgB107ZI+hajGmWxyexe87zx0Zr/H8TIQXEztlZiRSLG3/vOKCfH81dgweCDWwep0pv
 3XuceymAUViKRhRpopvpg3ciDmcXFfZ9inkSrEKu2uUSrtz81laitgq11fyM7xepFU3h
 y2rJcsPOz+eIK/G/tMlWSEnLZTay0zothO1obeBvEh8zuNHxQaE/vn6gsX9l/9yHco4S
 Js5oUNHV7/c8TK9L7OIxOzvEW6gsVDTN1MRdd2B5WxbDd+OAoHqYbcm326IOF9VjoVE/
 ztbA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=AbZ57hjl3gLbWYnWM4T9/0nxvY+Bsc7CY35D0qXZTbA=;
 b=nrq5sBwa1jtFzqq8acy2+2YLl8WstN0Im9LvPABRPRxCqExAuVJDQk+UFpGiGHHNC5
 eL+2KsgBJDJrYMUb34r4isTPXf3Bpbza0h3sXalBfc4ybGw4ogRoVBXnSjP5WQ7E3uS/
 V1zSFHjsE0y5FwSLaYJvQ4+B1yYi+0A16cMRoRhLdAPlypZzmE7kreDohpSNkKBxo20A
 kadqxE6xa9G/caRsUGfGIjV+2H/VbVYrfdAAEzj3tZ58lHmyHBUjQ+R8y2uXEGXENadE
 kcUSGTz8EWWoYFcclS9MIPEbKpxvUsqQzvc5kOvTmYMcQXw7dDuZqJjoL49AACDI3MDE
 W+Vg==
X-Gm-Message-State: AOAM532II2rcTSMmu0K+aT4Lpa9GEiAy29mqMDmAVzwi7CsOCrzrkV/x
 3WBYzPH9JR38eMtf+qlf1y6aPZol+oqUnjfC
X-Google-Smtp-Source: ABdhPJyHuUHg2YVUthaDJUM8CzYeZ9qyOCGDH25FVHASxfLarAxFINezW1ybNnDMwWf711IN1a0R1A==
X-Received: by 2002:a37:5903:: with SMTP id n3mr6903918qkb.236.1608329902313; 
 Fri, 18 Dec 2020 14:18:22 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.21
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:21 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 16/26] gnu: emacs-pdf-tools: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:13 -0500
Message-Id: <20201218221723.26829-16-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-pdf-tools)[phases]{emacs-build}: Move
after 'emacs-make-autoloads.
{emacs-create-pkg.el}: Add phase.
---
 gnu/packages/emacs-xyz.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 17b643a287..a988e56c97 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2729,10 +2729,12 @@ during idle time, while Emacs is doing nothing else.")
              (assoc-ref emacs:%standard-phases 'add-source-to-load-path))
            (add-after 'emacs-add-source-to-load-path 'emacs-install
              (assoc-ref emacs:%standard-phases 'install))
-           (add-after 'emacs-install 'emacs-build
-             (assoc-ref emacs:%standard-phases 'build))
-           (add-after 'emacs-install 'emacs-make-autoloads
-             (assoc-ref emacs:%standard-phases 'make-autoloads)))))
+           (add-after 'emacs-install 'emacs-create-pkg.el
+             (assoc-ref emacs:%standard-phases 'create-pkg.el))
+           (add-after 'emacs-create-pkg.el 'emacs-make-autoloads
+             (assoc-ref emacs:%standard-phases 'make-autoloads))
+           (add-after 'emacs-make-autoloads 'emacs-build
+             (assoc-ref emacs:%standard-phases 'build)))))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:38 2020
Received: from localhost ([127.0.0.1]:40304 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO58-00009m-0r
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:38 -0500
Received: from mail-qk1-f178.google.com ([209.85.222.178]:34386)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4w-00006c-5s
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:26 -0500
Received: by mail-qk1-f178.google.com with SMTP id c7so3632472qke.1
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=9LYOzaxr1wYUZ6XF/aIuDdaoMm3dPjV+4UxraiyVPOk=;
 b=CstEHFne6d+DRPf/9FSCu+99Ffk8lpunPYWamcIVWctcRC6/DIkxv8gSFDmKvfv0Nf
 m3Npwt0QMV/kBq3hZSc+q07JfNNO0EHxQ6+u3PvDHimEaMKfGMJBsYC8vQoqu8/m3XRQ
 Jfek3w/f21kePRno8HcIeNGj5aU7HT0U/9rebeSrgo2g94StSfs9DtvnzK+sguP2Qg7k
 kWsGFYeot+rT8NY9izd+CeunnXwx9Ihs8juV73mpKOGHnZ3SnDbQGFmDB4Ec++ro/BtE
 FrNLj9Rv+HcVJcJyXQ4vcVlThKZyqGbf1WeYIQuNhIGoIjJwyEp8K0f+WUcu7tHxi81+
 q9Bg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=9LYOzaxr1wYUZ6XF/aIuDdaoMm3dPjV+4UxraiyVPOk=;
 b=PQo7O7UMEJiBfp1xpcQ/Nll08iz10yPISpfLGFr+C0czhK4iD7FWd3jpEtQnO/sEGw
 wu+H3Jjay3NJq2L3TAnSvz5ht6sLKjEh5vO9+36Gd5MUP5OCTTIdDr06rQeqyR3WGdnQ
 PPWCdHaf+I6mYcbvYYnwLl7iWjEb4e6CgP+DKKNcDzLKu0g6amWIycu+sSKmzVX8UIpT
 xBX9XoaKgzyJacHpCOh0aqmjhX4YnuKd3nFeHcVXipzahQZbCWaQ5UhdS+7ydkUJD6Ig
 ycz4HuhcSyNocRJfGT21T7GfUXzVT+STbrVYpmSEuT6h7idJt3P/wt/XaLiDJ1EtxHcB
 jbgw==
X-Gm-Message-State: AOAM530b+YY7kTaE0rhjykK/X7ZQgsk/bj6NFtfX/GN3czNw/vghytn5
 BRGdXvziumSrGsCmOVg5ZmFKG/z4KxpoVK3M
X-Google-Smtp-Source: ABdhPJwKQgCRTgyOU/vml0uGmsZ7qD0xL19pxs9NBPUHVqyKQi1bZUfBt8Hiv8SfvlDlUJx3PsA+Wg==
X-Received: by 2002:a37:554:: with SMTP id 81mr6931457qkf.419.1608329900790;
 Fri, 18 Dec 2020 14:18:20 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.20
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:20 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 14/26] gnu: emacs-haskell-snippets: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:11 -0500
Message-Id: <20201218221723.26829-14-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-haskell-snippets)[phases]
{install-snippets}: Remove.
[arguments]{include}: Add argument.
---
 gnu/packages/emacs-xyz.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a027fdfa8f..17b643a287 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -25248,17 +25248,7 @@ conventions.")
           (base32 "0a7y3awi9hcyahggf0ghsdwvsmrhr9yq634wy9lkqjzrm2hqj0ci"))))
       (build-system emacs-build-system)
       (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           (add-after 'install 'install-snippets
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (snippets
-                       (string-append
-                        out "/share/emacs/site-lisp/snippets/haskell-mode")))
-                 (mkdir-p snippets)
-                 (copy-recursively "snippets/haskell-mode" snippets)
-                 #t))))))
+       `(#:include (cons* "^snippets/" %default-include)))
       (propagated-inputs
        `(("emacs-yasnippet" ,emacs-yasnippet)))
       (home-page "https://github.com/haskell/haskell-snippets")
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:38 2020
Received: from localhost ([127.0.0.1]:40302 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO57-00009f-Q1
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:37 -0500
Received: from mail-qv1-f51.google.com ([209.85.219.51]:35395)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4v-00005y-Bm
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:25 -0500
Received: by mail-qv1-f51.google.com with SMTP id l14so1692689qvh.2
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=LO1V5Q4OveEE1Z/PxgeXvN/HFhnx4/AMJuGgc9e4k4s=;
 b=UnJMPIAxaQDAInxlg0LFnYpfwlRlPZQ2SY4qbhN1Arzz77vmdDBhKeaAK7RKNZI5Lf
 XaxMk9CL9vNl9bBbUGzcDpTYlvGwEMTuuUZy9hxRXMq8r3QSnduqZDz2/yS2wTNxGYRH
 +nLjzqS7J+IQ8iIBBNkDR+gTIpwL05e6necayXMPP6e1sxtZaNsMBvdHp6CLu5Gh79ft
 5aQM1seaELka5LubPz0b+LIWV4Ra0J6QUPb5FJhaCB3jW2cgilPBbhi7KfPX3SCBGobU
 lqQApDpXUmGCoK5wilwJZnzaujXQLExXEuMbEgqJGk8Zz9RxU1WFYGTiS1PtkIwHM5aW
 viKw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=LO1V5Q4OveEE1Z/PxgeXvN/HFhnx4/AMJuGgc9e4k4s=;
 b=lG2Mai0JjLpUUDf/w/IrVLisKrwufuAgwpExqPj/mgqgESetHVBVIhmSlv6B5rChp6
 CSrEraR2p/90TcIjdZ4odCoeiqriEIlAmY7XCCuXXys1LBW7sLtW8MxTuy0J+i0NrUWG
 +sqYrpcx1kjGp77ABAVxr0oCFHwUOaDTbo6Wjnoto7Aa2wuGbmiJUXCbVECgcB+664NA
 YKENSbD7jEb/MfmS0ktpSClhRPFL6HBGdPUJBme6TdzW6UGtCtcLhIwR9fy/JM0zUHXg
 YiA3XP2Bq81pi0xu45B6h0KucR2I01c7gDqK7Q3/4EHCFwL7AlgZNjm8rY3ncDb7PDTE
 R73A==
X-Gm-Message-State: AOAM530gZH/TPzUjHNmUW+NYx/zljRbC8kDRlJNcI3x42ld8RMU0j/B4
 SIXtTQ0QPBWyyUF1wT9rgCoyhK/q2lyl+8dB
X-Google-Smtp-Source: ABdhPJxV//SCY1XYg9MzLPPE8zAgoluokIwcub5cDjma0ckx4qomKBeLcXyIDA0Qem83JkC+7DxCHQ==
X-Received: by 2002:a0c:9e5a:: with SMTP id z26mr7070333qve.2.1608329899919;
 Fri, 18 Dec 2020 14:18:19 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.19
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:19 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 13/26] gnu: emacs-rime: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:10 -0500
Message-Id: <20201218221723.26829-13-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-rime)[phases]
{install-emacs-module}: Adjust installation prefix.
---
 gnu/packages/emacs-xyz.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1be2b36f04..a027fdfa8f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -24129,8 +24129,7 @@ REPL appropriate to the current major mode.")
          (add-after 'install 'install-emacs-module
            (lambda* (#:key outputs #:allow-other-keys)
              (install-file "librime-emacs.so"
-                           (string-append (assoc-ref outputs "out")
-                                          "/share/emacs/site-lisp"))
+                           (outputs->elpa-install-dir outputs))
              #t)))))
     (inputs
      `(("librime" ,librime)
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:37 2020
Received: from localhost ([127.0.0.1]:40300 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO57-00009X-Gr
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:37 -0500
Received: from mail-qk1-f181.google.com ([209.85.222.181]:35141)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4u-00005r-Mx
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:24 -0500
Received: by mail-qk1-f181.google.com with SMTP id n142so3636532qkn.2
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=v8VUbp+PygkoqdoMFTHGvBauKBeJ/neNQE7hM7EfXCI=;
 b=uOr9YWFpTRY95bn/WfMbwlOtGYuBwngqKW3toagP354B3ucMiosLysAoX93cbg4jV2
 UEBNHPEXIwOhvdaA7M3dvnGrIWPvxmU33VEMbYNM+YOZ3WXP0w6bPxr64EPmWNYv8wgU
 7apweSUk3/3b2CAfWp7rR9AOHIQe7YTnJDbDgBa5ZwWpr1jdD3CH5gyuqfem3EJvFnPF
 JKy0n3o7A8FxTwGkFD05Ih3UXOYDedmkfM0TdphTzqcYxVOZPo4WIy0YqAyfvQSzumwI
 +5diuexs8lDQBkok8BvgO5240tWIGzEGL1b6NKRme1I18vTW++vC/vFZuY3LPjEZzR8H
 XLmg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=v8VUbp+PygkoqdoMFTHGvBauKBeJ/neNQE7hM7EfXCI=;
 b=eN9RiHDM5FdnMOR9aK3hHoXZX0QLtRdE06DMD7QpXg8ap33ZwTzh4gvykHtFcs448k
 7xjYJjAnWgVX73f4MYfTQJUWjh9LUBATvoQpQjAfiMC+/SR/Y6SmkE3WDNwURWm/dfom
 aS7UagYuGfVeHXyxzRd/B6hIOV9gRpkZ45zRRVgYiUDDc2OyTlQnxvwLweUhCrLISwEm
 eUZ9zrlKW562M8pzG0bFJFA901HU3YE1XVkTI1uMdI2U76uP5PmH3Hkaa1jm2Hf3/yzJ
 MObirJGER15EIKtf3Mct72Z+BGMyinFTNiB0xnF5oZOcbDC+3ymxkPHqjkkvuTM2o3QI
 8fXw==
X-Gm-Message-State: AOAM532qkU4PAz5YwFQmTc7262w6YRLh46IgTnJszVYRPXXuyxMZPQ7F
 S2oglZNc9chYBS52LQWa33Qk1ryC+6DA4rVP
X-Google-Smtp-Source: ABdhPJz0mkubRX8jpOxaKrzMOIqzr3eLYdw6IgtKGBrgGjXvdJcJ345AhS11k8voF7eZjV15AmuPOQ==
X-Received: by 2002:a37:9304:: with SMTP id v4mr7071976qkd.137.1608329899208; 
 Fri, 18 Dec 2020 14:18:19 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.18
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:18 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 12/26] gnu: emacs-telega: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:09 -0500
Message-Id: <20201218221723.26829-12-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-telega)[phases]{create-pkg.el}: Add phase.
---
 gnu/packages/emacs-xyz.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3e4dae5314..1be2b36f04 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23837,6 +23837,8 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
 	       #t))
            (add-after 'emacs-bytecomp-contrib 'emacs-install
              (assoc-ref emacs:%standard-phases 'install))
+           (add-after 'emacs-install 'create-pkg.el
+             (assoc-ref emacs:%standard-phases 'create-pkg.el))
            ;; This step installs subdir /etc, which contains images, sounds and
            ;; various other data, next to the site-lisp dir.
            (add-after 'emacs-install 'telega-install-data
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:37 2020
Received: from localhost ([127.0.0.1]:40298 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO57-00009Q-46
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:37 -0500
Received: from mail-qk1-f177.google.com ([209.85.222.177]:33048)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4t-00005l-Uz
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:24 -0500
Received: by mail-qk1-f177.google.com with SMTP id f26so1967639qka.0
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=YMWkgYqc+kQeOzYf1iKQ08YOUDPs3+kw7l5bceqvpo0=;
 b=m1eWmL52S2f/qAyAVtmzf1haVXCqBM+yikZO3P9TLpZzWU7dQSFqsFtTfolizLKL1G
 NQjf1GURkILpvrD7Q+H1Hlpbx0M+yo98T6SEGOXgIuL21ROAPadNdhP/h2QuyLIqhpg6
 lN2aBX0Ujx1r1ECG/g8IfQSALu6MwImG5QNXkPnNhlz7lOQXdoMsRaQlBLiPteSbigx+
 mJjC/RzWtKEjeENOtuvBnpZu4uSRMkKlX7fXUcZhFUctaOcypiUeTG/J0y4xMIyVXb1l
 8EBQHZn5EK2Rm9ug7X7z2V+DHwBHT41a3EWpCT8Q15E7wr0rrFfwE0soSzjbbZy6ib3v
 oE6w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=YMWkgYqc+kQeOzYf1iKQ08YOUDPs3+kw7l5bceqvpo0=;
 b=Oq9ooQA/E1Xfb7ddnew22a2twngz27OMRxkr0HeZ9MXVHGe0wPqNrXhQkyF8p+bqqT
 izoeABAmip6iZAcI6SmGwnx6KgM52P7geLcz54h6+AyJM0c5KxQvhfQdBRfIgxaJO3zs
 6C8IsQaYK4LtP6mlJCgIuJh/5XR/JxcjTdmPPhukVTprt5ZP+R/0xWKlVixEdwpQbc+f
 2u4OMRSJW01YkCx1C4Hcf9szRVu/szN76OvsFJLAAAeZE1utbz4AQxM79MAfun87PdXh
 vFpVsz25iBxcV4GPgk5ZvAI/KBpysfDTlGBVma3s8mL7QGpHNIq4zGo50O4t8hWCjuTN
 Pnug==
X-Gm-Message-State: AOAM531rjQnzdfc5HlbB1cAA9y8EGCXhI2EFAwEeCr4+bZNPqrsZ0M9X
 OmfF6sYDNW5CnQfHnFlsWgQappw3TVgy/th6
X-Google-Smtp-Source: ABdhPJyc4XTlfwfho/V9OzLVtYY9eq7bKTNReZ/ryEk8nj+P6P5VvNBwyyRUSVuaPpwY7rCLvhtmAQ==
X-Received: by 2002:a37:a713:: with SMTP id q19mr7282200qke.23.1608329898455; 
 Fri, 18 Dec 2020 14:18:18 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.17
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:17 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 11/26] gnu: emacs-edbi: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:08 -0500
Message-Id: <20201218221723.26829-11-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-edbi)[arguments]
{include}: Extend rather than override %default-include.
[phases]{patch-path}: Adjust installation prefix.
edb#	buffering.patch
---
 gnu/packages/emacs-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0ff904af19..3e4dae5314 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20330,14 +20330,13 @@ asynchronous communications, the RPC response is fairly good.")
        `(("emacs-e2wm" ,emacs-e2wm)
          ("emacs-epc" ,emacs-epc)))
       (arguments
-       `(#:include '("\\.el$" "\\.pl$")
+       `(#:include (cons "^[^/]*\\.pl$" %default-include)
          #:phases
          (modify-phases %standard-phases
            (add-after 'install 'patch-path
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((perl (assoc-ref inputs "perl"))
-                     (dir (string-append  (assoc-ref outputs "out")
-                                          "/share/emacs/site-lisp")))
+                     (dir (outputs->elpa-install-dir outputs)))
                  (substitute* (string-append dir  "/edbi.el")
                    (("\"perl\"") (string-append "\"" perl "/bin/perl\"")))
                  (chmod (string-append dir "/edbi-bridge.pl") #o555)
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:37 2020
Received: from localhost ([127.0.0.1]:40296 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO56-00009I-RC
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:37 -0500
Received: from mail-qk1-f172.google.com ([209.85.222.172]:47037)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4t-00005X-6Y
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:23 -0500
Received: by mail-qk1-f172.google.com with SMTP id d14so3563179qkc.13
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=yHNXsayQZ9egfS9UrhVrquRA2+5uC5Jw496U8nh7TF0=;
 b=jWbgqg0QvwDDqQpKsrjgFOjxQZnVPKh+duh28u/LUD2z6utZpbSvjq5q2cfBXrFV1E
 YGKl8ETS3QEWws1xqURs94o5DoMnp4B8CskJA22X/nizQULpcZO5q1L7a1frNcZIip12
 9pTQ1zixJPY4GXVrFhvlGlZOMgEUL56fnx7wVSa15vnQe4gghRBTF+flmo8ix0+RbcLH
 g5e8ju+gAzFs6wT3vvUT6uLWOKYmnY/OJslXtcX3B/fTk7unuB7dWSIXKVTTh0CwLSm6
 Gms+5ZBYTLXtJNMeBaQrGyEG/eJqFnbM5SCJ8Jkij7FIsM7qGg4ZhD/1hikhxHky1LDq
 W7HA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=yHNXsayQZ9egfS9UrhVrquRA2+5uC5Jw496U8nh7TF0=;
 b=H/Qpv0T6onar2HqtNhpR3MaYY106zK3LgkGyLwlkWLPk3KKRA8k/0RC0DPEX0q72C4
 mH078UWMFSNX/G0ijqzpIw6OfLlW1JA9bpRq2n6wHog3RN7YTplHUGnEWcq77yzfUSa4
 5cexbZna7Iwx9TR9rxEShEAuBsePBqUsDdU1O2i2sdmHidBCxZc1tbCnjQX361Ju8v+2
 sCSmD7xxy98QACFUf3r9PYPGzW0gmquWD4jO5tvn5zMs/bgsLSGARKEu0yO8rkMO4OG4
 p2ZfcExjunVmiVvOmwp+h0vxKFAXIYvWfH2u7wsCvRiznxAMlQFzYZwOjuvmYRwP32//
 mHIQ==
X-Gm-Message-State: AOAM532WLnuqKwl6LqAB7kbpUuBNkTj65GKGM6l8gNKA+FPVl0V13fXL
 cCKmx63IRrX1p1ABFl8gKgyr9p+Xj0oO2CiD
X-Google-Smtp-Source: ABdhPJyzRfg6vIV9XFA7wYYXJcGigjiwCa0336WAQYR6Q36XDiaFTXlvfcsoC7kadTf8T34moZSLTg==
X-Received: by 2002:a37:8b81:: with SMTP id n123mr7205991qkd.242.1608329897585; 
 Fri, 18 Dec 2020 14:18:17 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.16
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:17 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 10/26] gnu: emacs-org-contrib: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:07 -0500
Message-Id: <20201218221723.26829-10-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-org-contrib)[phases]{delete-org-files}:
Adjust installation prefix.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4e6fb922c9..0ff904af19 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10308,7 +10308,7 @@ programming and reproducible research.")
                                                    contrib-files
                                                    org+contrib-files)))
                (with-directory-excursion
-                   (string-append out "/share/emacs/site-lisp")
+                   (outputs->elpa-install-dir outputs)
                  (for-each delete-file duplicates))
                #t))))))
     (propagated-inputs
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:36 2020
Received: from localhost ([127.0.0.1]:40294 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO56-00009F-EL
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:36 -0500
Received: from mail-qv1-f51.google.com ([209.85.219.51]:42089)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4s-00005U-8o
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:22 -0500
Received: by mail-qv1-f51.google.com with SMTP id bd6so1677981qvb.9
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:22 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=7GZiwil92RGBP8aTMVAo+FVS6kQbVBDFjRauay+wqwU=;
 b=iP5sVDkcTCRihjkU9fCdKbiCswT/d5Bl0IxdXbcVk/45brAqEcrnGtK/ydFNHjLrZV
 wI6v8cOGQxrhRObIkO/2V8V0lC3GwQeB/jUZUhCJQl0RXK8qTx72Tt7YD2bmnDpf06HP
 5eDAnw4tt8jkCaIIorzTT/+reYlHFFq0q5i+kG/6FHMqoDS4nOCrMqEdFJIaE4JPF0gh
 4oQ+8dpk0XHEFh9dPdh94bkleb9aMJzPPmSASEqm4H+spDmH6j/RgnzgXtXlpHUrwsOJ
 JroLBskoqoCvBikLO9K1dlTqKXwjE/3UnDq57Xe6ENbXtQsZVrA7U3eNn9q60KTohGF/
 I9Kg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=7GZiwil92RGBP8aTMVAo+FVS6kQbVBDFjRauay+wqwU=;
 b=Xv1eGRh1NVX2KVUgQXMu1R0naNH8fImatGi/E8Bx1MglVFCXHZDWjMvTL9eQ0rWk+i
 eYB2YsT2bkzXFVaMv2ZcCA+x547cDxl4P2K1ODlWKlW9gNjvjuO8I46EYI+x0SxRYPaZ
 N8tQRhrTzv2ChB4yWORfNe+peL+Ltlwa6ix8sJZlt5xZjg8VTVzRQeoEX5ym/Jzz5hZs
 kJxcRnjdYsgTOh22/KtWnAtFzTydbxr9YwydSQmpNQ3Elcjjyb+9bmG+qOdl1yLFbaLf
 OOA++RLSWvgYqB75qUhNReJYWjVEKJOQFywzWnr27p1xfy9y84+Iu1W6cYUYDaQ0LZB2
 xWAw==
X-Gm-Message-State: AOAM5315IqsFOYHiPa38U+yHOeZFgaSG+08CX/4+jzKN8jNplkUMzscf
 hhRjxtQYNZK2jh5HMZ2AIHQXF1F3/mWfJcJd
X-Google-Smtp-Source: ABdhPJxRWJUrYnQAfE0a/72alDHfDbtHrmxEJB1JCn2uARoVhh6qaLOfYkVl6T8TJ40k9mnMwLVQ9Q==
X-Received: by 2002:a05:6214:1887:: with SMTP id
 cx7mr6737443qvb.39.1608329896772; 
 Fri, 18 Dec 2020 14:18:16 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.16
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:16 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 09/26] gnu: emacs-chess: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:06 -0500
Message-Id: <20201218221723.26829-9-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-chess)[arguments]{include}: New argument.
[phases]{install-pieces}: Remove.
---
 gnu/packages/emacs-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cb58fc441a..4e6fb922c9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6676,16 +6676,7 @@ board and goal value can be customized.")
         (base32 "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-pieces
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (pieces
-                     (string-append out "/share/emacs/site-lisp/pieces")))
-               (mkdir-p pieces)
-               (copy-recursively "pieces" pieces)
-               #t))))))
+     `(#:include (cons "^pieces/" %default-include)))
     (home-page "https://elpa.gnu.org/packages/chess.html")
     (synopsis "Play chess in GNU Emacs")
     (description
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:24 2020
Received: from localhost ([127.0.0.1]:40277 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4u-00007T-25
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:24 -0500
Received: from mail-qk1-f178.google.com ([209.85.222.178]:37687)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4r-00005O-H2
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:21 -0500
Received: by mail-qk1-f178.google.com with SMTP id h4so3622509qkk.4
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:21 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=N7l/QwfPqSeNQUhMroaXQXaN+HrX6D5eoF7aoLWiAp8=;
 b=DganLFQdWVeKLGzWpoi6Tp2NRnhDEnYUIHp87QNxAtB3gRHHCd0YQ8DNVXQ/UHP4np
 snOUQ2C+jV+W4CuMcVs7/Ea8JQy4SCxH1YF/+s6ej2eTLI7aP0URBo2/5MRPNvihjfNm
 f1nHDgao4h0FTkjWKm3pEC4OD+RjrF1Afzkdv0Bveut6wB164ec/gsWApP7uSu3urAuH
 MRWn7uLepnYNVY6HYTBbHXSZdUQB3LhJ2s+xOfdhA5AWLbv5d/1YMFhSUwDGcmA2USd6
 iTrWBcy3akGWAgH55vfxiTFrJ/HPPeiko/Z40o5fp3IdhbGo+mVkImKrQ6Y2+FMn+SK4
 nXcg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=N7l/QwfPqSeNQUhMroaXQXaN+HrX6D5eoF7aoLWiAp8=;
 b=SmQYdAYQpIMDPA9//hqJoGGNE4s+BDzIK+UecmMwbbPOrg96MGn3ZY0PqhwgGyym25
 F2FnsU7RirLaeEEH0WFvpZxqvkEUOMaKtkhWD7ItbiD+QT9Z4OkGxzM0z3fOeBqxqrZy
 IRCVgaVCwUQpXJZk2lbYMJgnZe4mEnZMD7BFm3IKrVfigafMAcdrOvrqi1c7i+CKe9p4
 9k4ki7utExQJ/DM8iDkR7E7maRAWYOUWMVvrsxl3OLEZ80/pqJwoFtbqY6V6mqezeFBD
 Tg37VYsmCulR4M4l/Nomv1F3Z8cXBq42mx9yAdAY2abk9u81fKy48sc2+1YR0MHh+xN2
 nwGw==
X-Gm-Message-State: AOAM532pD9z/StUda0NqOXU9vGWpS4I/Wc86s7hwDl7CoaeM5gxrY+ZD
 TlfT+2A69CTiR96rXsEGNUR8PWKuyWUufRj0
X-Google-Smtp-Source: ABdhPJzE99dPT+mZVqNnI7m8Sf9Z39nXkm7iB/9I/VwgUXdbbbWP3GV8G9F6WYHGHTXsKpxl1e6xqA==
X-Received: by 2002:a37:9101:: with SMTP id t1mr7221841qkd.357.1608329896118; 
 Fri, 18 Dec 2020 14:18:16 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.15
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:15 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 08/26] gnu: emacs-scel: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:05 -0500
Message-Id: <20201218221723.26829-8-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-scel)[phases]{configure}: Adjust
installation prefix.
---
 gnu/packages/emacs-xyz.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 202db888d4..cb58fc441a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5663,8 +5663,7 @@ to a key in your preferred mode.")
              (lambda* (#:key outputs #:allow-other-keys)
                (substitute* "el/CMakeLists.txt"
                  (("share/emacs/site-lisp/SuperCollider")
-                  (string-append
-                   "share/emacs/site-lisp")))
+                  (outputs->elpa-install-dir outputs)))
                ((assoc-ref cmake:%standard-phases 'configure)
                 #:outputs outputs
                 #:configure-flags '("-DSC_EL_BYTECOMPILE=OFF"))))
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:24 2020
Received: from localhost ([127.0.0.1]:40274 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4t-00007H-IR
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:23 -0500
Received: from mail-qk1-f171.google.com ([209.85.222.171]:37679)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4q-00005K-Oi
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:20 -0500
Received: by mail-qk1-f171.google.com with SMTP id h4so3622479qkk.4
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=h2Dc/7sg83bMdz5CAMhuHvk3U/+TR0dK8TfnzkIaF4k=;
 b=rQJDcybo3IhfEBpSt8jjX6I77VyN/zIkYznY4bADG4ZQf2nmPmcFjyx3PQ4UPyMmHj
 UQJaryEoa611MT68TQVN0cEsurM7T1Xpf7qUBJIXxAxyzk/O+B7L+8ubitCUsJdhoV7r
 MDskCvg7eaH5VaUA/wFZPO0FjQcaRYN5kmqC33zQc7F6yCB8QuE5bQLk/yrdtMJ8Sdmg
 2HDnEDwWDk0fmgmX4105bizV6ek49eGuekp753S+RO8z83yJkloqR7sfqyhI7eHwJPSM
 fLxRxKVJ4uVofdHS/zseo3rvAp16a1I0QjkgAA3C2oQmni8yWZ4aOPnfeFpl/feCHEjF
 VSZg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=h2Dc/7sg83bMdz5CAMhuHvk3U/+TR0dK8TfnzkIaF4k=;
 b=egIwQkaGEnWKal10uVVC8LSF2/NRKzAePdVVnKby4LD2C1/3VfOKsjKNISVBx/9ocN
 Luy2I5EVsFR4YRiAMLShhsQFO2UM+B0A1DhbgvJe06Fqc4nsiOCCcLYhXvSyQJhdLxMN
 8//K7LY87euBWcYF7UJRy2li3HSN9GM1N29oJ6lbeZiu0AFQwWOhAEFNPneFwwoeQjVa
 swa1AGfyKq49Ha2xaMorH4vLFtrSNX+jsF8VrUE+Ip1qmVvCcK3UD9ebXZv7MEjtnKnW
 DQpBaMiyWH0AEiTOhmUc7oY96Wq8gUfArQC2sXz5WsaVT+01m35+Hs0qhDT8Td7wSGR5
 Ha9g==
X-Gm-Message-State: AOAM5315eRCD5uy+Hy1IGT2vOaiJkxC3lOWBHojhtjULtc/FJ+gG3opD
 FqaA1YTxznx3avWsOSdTGOPonPxNEkc3cfNn
X-Google-Smtp-Source: ABdhPJyakJe0x5cbSFsWJnGIqxraQiNzG8xfcTD/DKnh5jQTSKmD0MYgL67qIGLq7YIboe/Ecv4eTQ==
X-Received: by 2002:ae9:e219:: with SMTP id c25mr6986184qkc.443.1608329895368; 
 Fri, 18 Dec 2020 14:18:15 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.14
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:14 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 07/26] gnu: emacs-flycheck-grammalecte: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:17:04 -0500
Message-Id: <20201218221723.26829-7-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[arguments]{include}:
Extend rather than override %default-include.
{exclude}: Extend rather than override %default-exclude.
* gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Adjust the
installation directory.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2702738fc0..202db888d4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4558,8 +4558,8 @@ for Flow files.")
         (base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:include '("\\.(el|py)$")
-       #:exclude '("^test-profile.el$")
+     `(#:include (cons "^[^/]*\\.py$" %default-include)
+       #:exclude (cons "^test-profile.el$" %default-exclude)
        #:emacs ,emacs                   ;need libxml support
        #:phases
        (modify-phases %standard-phases
@@ -4583,7 +4583,7 @@ for Flow files.")
                     (grammalecte (assoc-ref inputs "grammalecte"))
                     (version ,(version-major+minor (package-version python))))
                (with-directory-excursion
-                   (string-append out "/share/emacs/site-lisp")
+                   (outputs->elpa-install-dir outputs)
                  (symlink (string-append grammalecte "/lib/"
                                          "python" version "/site-packages/"
                                          "grammalecte")
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:23 2020
Received: from localhost ([127.0.0.1]:40271 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4s-000071-KX
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:23 -0500
Received: from mail-qk1-f182.google.com ([209.85.222.182]:40719)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4q-00005I-3Q
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:20 -0500
Received: by mail-qk1-f182.google.com with SMTP id z11so3600011qkj.7
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=Ns3PfEZ/vL9FgKPXW+wIbXSmRo65V+2DKyd/Hrd1990=;
 b=cN3t/ORyvZ0XzjItC5zZ0Ov7gBP3lzmOnoCfulje1Te6RxMTXTOEu1FYoFOVbJARfl
 4IkDO8Qkru1j96AFlLE1Ny8r42Us/aRFXq7P6h3PddNowQ8/VsaQdqc845V+VBgAjUy5
 QwmXB3fReOyVBcdeU4rpaazVa/ZwUZd5GHtsBQz4VrwdurDOs0EWohzW0/QEgtJKrP2i
 iTul3Vtxx9HPVr/6kT7/OC6hQ6AiuRB+qjS7wTpbtomxuUZ8gqlJw5CThyxjMg5dkwGM
 2Wovowv0IIwsDCGYZjcU+rHdwise0tnw1fjo06fiFfBNwHJF0XmqcU0PSUcpyHFwwYTm
 beFw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=Ns3PfEZ/vL9FgKPXW+wIbXSmRo65V+2DKyd/Hrd1990=;
 b=Qxup4s1YQXZsRR4kspDT36GqyvVNeMUUFxLocyBJSGnHv3n0JRZJXbogoY2dJhhu0z
 7rQ1QZ6kPBAhmSIoOdTckeaQZbsl6cEQKv+kvHYVpr6nM8cAKpqUpxr1Rcjb9LxgZ8VH
 lEXo2e2IdZbx1BMvfFijNW7sDgjqkV7aFzvSlqZ/iZBRYibb+LlDIONnkWnYC4dUD4l0
 fr4if3TWsXeMm0o5H+nk9HzSC9si4zd7Z6ZLxNjCvACWllTw2A+mqqriu+f6HAApkJM+
 jq8PUMIsk71HYnqQEviT2P8pyXIjFXER7lpirdmAWo8pAme0jmReKE0pC2JmSwtAeZos
 96/w==
X-Gm-Message-State: AOAM531GsyCmpgfnqPL+5Egf3dG2SKMPjQvc7liipaU89sQHzuMB2rKO
 472CO2FLdhg7hiz6mOudnD8PbshxiMZ73lBW
X-Google-Smtp-Source: ABdhPJxF5AxBS+oK9jLyXYB0Y89a0xDH9yK4iKWYTFiSct/deDq7y7nfTaJ6t2IJmCQyw5hWcUkDxw==
X-Received: by 2002:a37:90c4:: with SMTP id s187mr7089983qkd.6.1608329894605; 
 Fri, 18 Dec 2020 14:18:14 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.13
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:14 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 06/26] gnu: emacs-typit: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:03 -0500
Message-Id: <20201218221723.26829-6-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-typit)[arguments]: Include "dict".
[phases]{install-dictionaries}: Remove.
---
 gnu/packages/emacs-xyz.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1a168075e3..2702738fc0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -882,17 +882,7 @@ handful of functions that are not resource-specific.")
           (base32 "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f"))))
       (build-system emacs-build-system)
       (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           (add-after 'install 'install-dictionaries
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (site-lisp
-                       (string-append
-                        out "/share/emacs/site-lisp/dict")))
-                 (mkdir-p site-lisp)
-                 (copy-recursively "dict" site-lisp)
-                 #t))))))
+       `(#:include (cons* "^dict/" %default-include)))
       (propagated-inputs
        `(("emacs-f" ,emacs-f)
          ("emacs-mmt" ,emacs-mmt)))
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:22 2020
Received: from localhost ([127.0.0.1]:40268 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4s-00006t-8c
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:22 -0500
Received: from mail-qk1-f178.google.com ([209.85.222.178]:45316)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4p-00005G-8l
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:19 -0500
Received: by mail-qk1-f178.google.com with SMTP id b64so3563834qkc.12
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:19 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=UfvP46zZXtJ+kYVT40QKckY8bM7RXIval+IY6BzArdM=;
 b=jRsfcniWWvLzGnwUCET4sETrhArkAjdhifx7LWSgXYO8D2GQrcpBkKUk6yFp6FhFMF
 OBx52P2NBr7tzbTlfoYFDXA2/6kru1UQ2ipy1L8/n6ReqMjsjrAnzTTL8dYIDTXyEtYf
 xJ3qg+1N5Ch/DHE+6PAlWV2yjfDN5ahOBpsR4UZG/WAQXp8B7y9k+5gSWuQCJ7wj0bWi
 xDL0hYfBPYrLhO0aikkQEF2bsjLgJhZgCleydCGATbFdtLI+9ZANqUESWsDvdbjRc12k
 wIRA0r4Vp01uPimvrxmX4mYi3kW9eb4vaTDraHCwUkDmd0wxhJSJSUzcPMoXZYlHoSFB
 DqCg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=UfvP46zZXtJ+kYVT40QKckY8bM7RXIval+IY6BzArdM=;
 b=Zqhs/0LP23qJjont0SNvNTaIttYVlPu36BnBVLKXTdP7JcVaAuEIrLIgkQ144UBw2W
 /GEL6iC5J/GJICfRoVvlVvwTs8YSyFTTyVD9WIVsl+YX+eOEhBkwd1eYD2qJfokDD0vz
 k+RON1xW+KSjPEW0qLOWXSiBpwJWVxFX5Hs7FPia6prpgFmB/z218sAYpKK6Yh1kvrm6
 AOBjqL8XZSWNwIMgJZOgIHnwN3aTuCR55jiJs15XhtkwpAdadczHcOC08t8IpEuF/UCS
 m9GpnAv/xMTNkwLswLwNp8Sr1/0t9qUeUHvdCcxf9e2KilKGnS4XJ3f21pZE00rAQF2J
 rFdA==
X-Gm-Message-State: AOAM531xtijdoivqDvX2ocNGNs14xpcxIUxRuoDZJqPiJR1PpJ4jqWL9
 5d4EJP0E2S22qy9l7fUx1psBkqQvcs6dpoTy
X-Google-Smtp-Source: ABdhPJxQOX3y4s0BsFHQZtmv1LeYQZEvS15319dj32+IZ60MvlwbUgDm5b1kYikdldmay1/3J6MgOQ==
X-Received: by 2002:a05:620a:1ea:: with SMTP id
 x10mr7054557qkn.90.1608329893787; 
 Fri, 18 Dec 2020 14:18:13 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.12
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:13 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 05/26] gnu: emacs-libgit: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:02 -0500
Message-Id: <20201218221723.26829-5-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-libgit)[phases]
{set-libgit--module-file}: Adjust the installation prefix.
{create-pkg.el}: New phase.
---
 gnu/packages/emacs-xyz.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 01dab957aa..1a168075e3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -457,7 +457,8 @@ on stdout instead of using a socket as the Emacsclient does.")
                  (make-file-writable "libgit.el")
                  (emacs-substitute-variables "libgit.el"
                    ("libgit--module-file"
-                    (string-append out "/share/emacs/site-lisp/libegit2.so")))
+                    (string-append (emacs:outputs->elpa-install-dir outputs)
+                                   "/libegit2.so")))
                  #t)))
            (add-before 'install 'prepare-for-install
              (lambda _
@@ -471,7 +472,9 @@ on stdout instead of using a socket as the Emacsclient does.")
                  (install #:outputs outputs
                           #:include (cons "\\.so$"
                                           emacs:%default-include)))))
-           (add-after 'install 'make-autoloads
+           (add-after 'install 'create-pkg.el
+             (assoc-ref emacs:%standard-phases 'create-pkg.el))
+           (add-after 'create-pkg.el 'make-autoloads
              (assoc-ref emacs:%standard-phases 'make-autoloads))
            (add-after 'make-autoloads 'enable-autoloads-compilation
              (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation))
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:22 2020
Received: from localhost ([127.0.0.1]:40266 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4r-00006k-Rr
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:22 -0500
Received: from mail-qk1-f171.google.com ([209.85.222.171]:41808)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4o-00005F-Fw
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:18 -0500
Received: by mail-qk1-f171.google.com with SMTP id 19so3596375qkm.8
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:18 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=MbZx+6vvp4SWhptpkz5NPLN0y+lQWxV67ZrNg2XUvMU=;
 b=nI25udVpO5wOMmamHj5gDmNLBOTYPpwnM0rVD8jXoc8dMTmWW9USN2Doz7wNHCpt7c
 9Rj2oregM7vX0f0utFRurjgi87cZtmmTOMKZxpbTRjmyFPImHQ3cOUqyV/2RgeiXeSDk
 9IfjHW/+8JwBicHVxsJk+SsHTuJkIwcAgJlahtijFvNaeErVtI4biPvHPrAZWVyg1hrS
 nO4LKpb+YOPciHb9FWH4yEVz7DAtTVZoVHqSUzL4Vu9jBNbIqKmHX4VJCx0dp1X7pmuq
 VCD0x3ele15bEHKDPc+E9MxZGnArdRO3n1y5KlnGRORNP56xVYug/4cmkMaiPxfxNOh+
 BCTA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=MbZx+6vvp4SWhptpkz5NPLN0y+lQWxV67ZrNg2XUvMU=;
 b=duWCt6YN29JcKRRhZMKOioxTeGzng3qlNTYoytnuimfHSaK13CPz/ZyijIz57j5XyS
 rW+CRWVDCmNlPB+ML3mpyCd4Z740YEbwjLq21Zk9v1VMqNYocfQ4K/p3aSohdWc1Pk2m
 OSytfCGH3+ZtQw0gB0U0IPcVKjfl3ccIMwquek97QaiIXGnUggUWZ/ug2QxhQFC5b2R1
 MK0ZNrW/8uEe+vbPLSeSoymUpV15Tm9JOW/8/v7PC5Zt+q49bgH25VIW6VgQuyDbOLYy
 ZLqmw6eASa8dout6DfPCLVMZRptYxnwhMqRjZPxiS73LBgvFqi0itIYQLSz27kj+bu50
 z5qQ==
X-Gm-Message-State: AOAM530PxrBHW/hfD7zXDOVIbl5HL62neK2dHPYDskpXiCIvcxQJYqlI
 YwLywNMKbg+eSbX9N+od2uO286U/cX0OIjji
X-Google-Smtp-Source: ABdhPJzuQua1uHNTk0LquV5k7PYpYJ9uBEzWHFg5f1YVbFP4nEJygqSmh9KE2Bvu7abF320BRKhLVw==
X-Received: by 2002:a37:6845:: with SMTP id d66mr4385518qkc.463.1608329892856; 
 Fri, 18 Dec 2020 14:18:12 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.12
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:12 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 04/26] gnu: cedille: Adjust following emacs-build-system
 changes.
Date: Fri, 18 Dec 2020 17:17:01 -0500
Message-Id: <20201218221723.26829-4-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=yes
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Also enable byte compilation for most Elisp files.

* gnu/packages/cedille.scm (cedille)[arguments]: Add the cedille-mode and
se-mode to the #:include files list, which allows to...
[phases]{copy-cedille-mode}: ...remove this phase.
{extend-load-path}: New phase.
{build}: Restore phase.
{disable-byte-compilation-on-problematic-files}: New phase.
---
 gnu/packages/cedille.scm | 50 ++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm
index d3dd576323..05eb42e9b2 100644
--- a/gnu/packages/cedille.scm
+++ b/gnu/packages/cedille.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 John Soo <jsoo1@HIDDEN>
+;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,37 +50,46 @@
        ("ghc-happy" ,ghc-happy)))
     (build-system emacs-build-system)
     (arguments
-     `(#:phases
+     `(#:include (cons* "^cedille-mode/" "^se-mode/" %default-include)
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-cedille-paths
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (substitute* "cedille-mode.el"
-                 (("/usr/share/emacs/site-lisp/cedille-mode")
-                  (string-append
-                   out "/share/emacs/site-lisp/cedille")))
+                 ;; As suggested at the top of cedille-mode.el
+                 ((".*defmacro cedille-platform-case.*" all)
+                  (string-append (format #f "(defconst cedille-path ~s)~%~%"
+                                         (outputs->elpa-install-dir outputs))
+                                 all)))
                (substitute* "cedille-mode/cedille-mode-info.el"
                  (("\\(concat cedille-path-el \"cedille-info-main.info\"\\)")
                   (string-append
                    "\"" out "/share/info/cedille-info-main.info.gz\"")))
                #t)))
-         (add-after 'patch-cedille-paths 'copy-cedille-mode
+         (add-before 'build 'extend-load-path
            (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lisp
-                     (string-append
-                      out "/share/emacs/site-lisp/cedille/")))
-               (mkdir-p (string-append lisp "cedille-mode"))
-               (copy-recursively
-                "cedille-mode"
-                (string-append lisp "cedille-mode"))
-               (mkdir-p (string-append lisp "se-mode"))
-               (copy-recursively
-                "se-mode"
-                (string-append lisp "se-mode"))
-               #t)))
-         ;; FIXME: Byte compilation fails
-         (delete 'build)
+             (let ((install-dir (outputs->elpa-install-dir outputs)))
+               (setenv "EMACSLOADPATH"
+                       (string-join
+                        (cons (getenv "EMACSLOADPATH")
+                              (map (lambda (f)
+                                     (string-append install-dir "/" f))
+                                   '("cedille-mode" "se-mode")))
+                        ":")))
+             #t))
+         (add-after 'unpack 'disable-byte-compilation-on-problematic-files
+           ;; Some files fail byte compilation (see:
+           ;; https://github.com/cedille/cedille/issues/160).
+           (lambda _
+             (let ((problematic-files '("cedille-mode.el"
+                                        "cedille-mode/cedille-mode-library.el"
+                                        "se-mode/se-hole.el")))
+               (for-each (lambda (f)
+                           (make-file-writable f)
+                           (emacs-batch-disable-compilation f))
+                         problematic-files))
+             #t))
          (replace 'check
            (lambda _
              (with-directory-excursion "cedille-tests"
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:21 2020
Received: from localhost ([127.0.0.1]:40263 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4r-00006d-E0
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:21 -0500
Received: from mail-qt1-f171.google.com ([209.85.160.171]:46033)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4n-000057-Iw
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:18 -0500
Received: by mail-qt1-f171.google.com with SMTP id g24so2462000qtq.12
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=xvRMM6h/VCWerhNXcvfit+OhDONbS72crm7FOEUO6iE=;
 b=nuiCGGVb+Wbtkl5W3Ln1pFyJWiaUAsNyLOsKF6ZRfA1y06IAiQIyv0Dy9KEGkYvGzh
 PBrxRFEratgtxJSy2Pw3dXrGBP/lmbawx7iij4YuTlUp7bgLq8MpOL6ItGTWpNNSas25
 G9KdgiLQSAHyNV7WGG3bbITsAP3KvH6eVY1rDcVkxV9Kk1PiBUJHD6U9IxGUgj+B6SFi
 yjXOx8ytZGgAhwgi1JjhvtqTr6is91WjY2rR+Q8yjj2+xmhc+wPXKJ+0KXcx68pxHfkG
 O4wyJAIGVDeEJJbrz2/8KnZJr/S+jNkTbER+ICg5kzApohG0PNuqSBjI8teGlusT5AjG
 kivg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=xvRMM6h/VCWerhNXcvfit+OhDONbS72crm7FOEUO6iE=;
 b=Ak1DYerQ0agTAbDI2MJVK1WvjStNF0XYiQlQKusJTn1kNnClwlTIWwXMVjLh8VVfPC
 nKR++7t7BfYwK5xGJbWvH19ytK6vrBORQun9dQFneaJ2mER2iKAP8oqFxqVscU5GkyNv
 IEApQojUnDirq5uEgmWTIasZeRm4RyKMrYnCzNHre3hPYT3nrquBRYpW6KF3woJ4jh0k
 vnCK+xb+5aje28Nyx+eHs9GRpYs7xQY3qUmGgjHm4REHqy0OP8vI/GsSbCz8Cp1x19VM
 jbPb02MxjV2iHkbPa/6IFDKzT3T5Alq2oHnv9DYc06AE3e+yoHKmgqALRsOnn9mmaj8w
 /PDQ==
X-Gm-Message-State: AOAM530Ef5lF7QFhxzVByta4LcvA2YbFLOEWMDbTR0KBhXoRTPm7kRTA
 MPV3jSeoa7yvmGK7Rm24xKKh4ZQcuxPa5Qb+
X-Google-Smtp-Source: ABdhPJyB7TR2ZcS9cWmd+CMceFWxFR4ca9eHvt+fkZxOB5MPSwKGOBK0gxdp1irlahzOe0qAF4+z0Q==
X-Received: by 2002:ac8:5901:: with SMTP id 1mr6225984qty.350.1608329891923;
 Fri, 18 Dec 2020 14:18:11 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.11
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:11 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 03/26] gnu: emacs-xyz: Do not use --quick or -Q.
Date: Fri, 18 Dec 2020 17:17:00 -0500
Message-Id: <20201218221723.26829-3-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

The --quick options prevents loading the site-start.el, which is now required
for the initialization of the Guix Emacs packages.

* gnu/packages/emacs-xyz.scm (emacs-flycheck)
(emacs-perspective, emacs-nodejs-repl, emacs-rainbow-delimiters)
(emacs-emacsql-sqlite3, emacs-evil-magit, emacs-adoc-mode)
(emacs-cort, emacs-vdiff, emacs-org-generate, emacs-execline): Do not use the
--quick or -Q options.  Harmonize to use --batch instead of -batch.
---
 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 6ae301aeaf..01dab957aa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1176,7 +1176,7 @@ supports type hints, definition-jumping, completion, and more.")
                #t)))
          ;; TODO: many failing tests
          #:tests? #f
-         #:test-command '("emacs" "-Q" "--batch" "-L" "."
+         #:test-command '("emacs" "--batch" "-L" "."
                           "--load" "test/flycheck-test"
                           "--load" "test/run.el"
                           "-f" "flycheck-run-tests-main")))
@@ -7006,7 +7006,7 @@ regexp that matches all known keywords.")
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-       #:test-command '("emacs" "-Q" "-batch" "-L" "."
+       #:test-command '("emacs" "--batch" "-L" "."
                         "-l" "test/test-perspective.el"
                         "-f" "ert-run-tests-batch-and-exit")))
     (home-page "https://github.com/nex3/perspective-el")
@@ -8237,7 +8237,7 @@ strings, and code folding.")
                  ("nodejs-repl-command"
                   (string-append node "/bin/node")))))))
        #:tests? #t
-       #:test-command '("emacs" "-Q" "--batch"
+       #:test-command '("emacs" "--batch"
                         "-L" "."
                         "-l" "test/test.el"
                         "-f" "ert-run-tests-batch-and-exit")))
@@ -8817,7 +8817,7 @@ completion, interactive development and more.")
     (home-page "https://github.com/Fanael/rainbow-delimiters")
     (arguments
      `(#:tests? #t
-       #:test-command '("emacs" "-Q" "-batch"
+       #:test-command '("emacs" "--batch"
                         "-l" "rainbow-delimiters-test.el"
                         "-f" "ert-run-tests-batch-and-exit")))
     (synopsis "Highlight brackets according to their depth")
@@ -14638,7 +14638,7 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.")
      `(("emacs-emacsql" ,emacs-emacsql)))
     (arguments
      `(#:tests? #t
-       #:test-command '("emacs" "-Q" "--batch" "-L" "."
+       #:test-command '("emacs" "--batch" "-L" "."
                         "--load" "emacsql-sqlite3-test.el"
                         "-f" "ert-run-tests-batch-and-exit")
        #:phases
@@ -17989,7 +17989,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
          ("magit" ,emacs-magit)))
       (arguments
        `(#:tests? #t
-         #:test-command '("emacs" "-Q" "-batch"
+         #:test-command '("emacs" "--batch"
                           "-L" "."
                           "-l" "evil-magit-tests"
                           "-f" "ert-run-tests-batch-and-exit")))
@@ -19014,7 +19014,7 @@ and 'text viewing modes' respectively.")
                                "adoctest-test-tempo-quotes")))
              #t)))
        #:tests? #t
-       #:test-command '("emacs" "-Q" "-batch"
+       #:test-command '("emacs" "--batch"
                         "-l" "adoc-mode-test.el"
                         "-f" "ert-run-tests-batch-and-exit")))
     (propagated-inputs
@@ -19982,7 +19982,7 @@ functions to ensure they are called with the right arguments during testing.")
        `(("emacs-ansi" ,emacs-ansi)))
       (arguments
        `(#:tests? #t
-         #:test-command '("emacs" "--batch" "--quick"
+         #:test-command '("emacs" "--batch"
                           "--directory=." "--load=cort-tests.el"
                           "--funcall=cort-test-run")))
       (home-page "https://github.com/conao3/cort.el")
@@ -21724,7 +21724,7 @@ compatible with Emacs' shell modes.")
        `(("emacs-hydra" ,emacs-hydra)))
       (arguments
        `(#:tests? #t
-         #:test-command '("emacs" "-Q" "-batch" "-L" "."
+         #:test-command '("emacs" "--batch" "-L" "."
                           "-l" "vdiff-test.el"
                           "-f" "ert-run-tests-batch-and-exit")))
       (home-page "https://github.com/justbur/emacs-vdiff/")
@@ -25333,7 +25333,7 @@ personal wiki.")
      `(("emacs-mustache" ,emacs-mustache)))
     (arguments
      `(#:tests? #t
-       #:test-command '("emacs" "--batch" "--quick"
+       #:test-command '("emacs" "--batch"
                         "--directory=." "--load=org-generate-tests.el"
                         "--funcall=cort-test-run")))
     (build-system emacs-build-system)
@@ -25460,7 +25460,7 @@ or region and use of locally installed binaries.")
        `(("emacs-s" ,emacs-s)))
       (arguments
        `(#:tests? #t
-         #:test-command '("emacs" "-Q" "-batch" "-L" "."
+         #:test-command '("emacs" "--batch" "-L" "."
                           "-l" "t/indent.el"
                           "-f" "ert-run-tests-batch-and-exit")))
       (home-page "https://gitlab.com/KAction/emacs-execline/")
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:18 2020
Received: from localhost ([127.0.0.1]:40257 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4o-00005W-1o
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:18 -0500
Received: from mail-qv1-f44.google.com ([209.85.219.44]:32822)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4m-000055-PD
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:17 -0500
Received: by mail-qv1-f44.google.com with SMTP id a13so1700035qvv.0
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:16 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=Y0EcIAOoMuzTb567QJpC8VcHEnJ3eAYa/aP4ToglpjU=;
 b=fvKIukD0OqBCDuLA86qhypAt4xmHAAAYP/DYoHT9JPZpS5enn9wR6grIlEEaKCC9o5
 hl6TP2kSoDRrF26BR22NRquoAos3qdRlnrwZ/d/SBcXchroAQ8BeapcDIoHsx0jaXMKR
 aW2KOTjORBcssYypVBNuevTz3hS/AnNPcJuWX+DSIknkjpjfupot0boDqvT/NpEszpKw
 PczfK1e/P/26pHXFNwjgK+KGBBlNA2PjvcAh9EKqYYAGKlFfsHF7nD54E+7b+b5fi0rA
 h+rGTn1rlVb0z5eIoKfuSFAmB0jELY4pfVF4ias3w9MOjFjKMLN1FUaNSF0Nz1d+uUWG
 Py1g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=Y0EcIAOoMuzTb567QJpC8VcHEnJ3eAYa/aP4ToglpjU=;
 b=D6FLXB/EaypAApbceWyYLaN3UB6m1uHUyEMeEO5WF6gh3z0NLS31eFfOYY34Ez+kCN
 T9ejANfcGtyR2A2XdIcGScCl7O/vhtkNRKVmJMROekArG0ddOeXfxjbUVXKEGcWXl9z+
 n842MhdcTMymy9n37eZF8MWjVbRJ1CXRdq5yi0mHdQiTfOLfCH7EqIn1lqhHsfyNHbpO
 GUqZCr/mh0WCDFKsBd0QyrbHHOor6sXjsjDPNx4k4gps06MIraeH7ElQhzArvSEA/KGQ
 xVyEXB/Hl6ckiSfJejPOErGp2FMuFiLG0EDcezpdiv0wsSrStq7f5m2+GHUeJqlJnnBX
 o9kQ==
X-Gm-Message-State: AOAM531MLMALMGpFyQiy3Mvyqss9NFHgMkqco6z2SkjtaQuBv9FiPR4y
 Im5DkKaPUaGTNuq9Bbu5gGi/MVx/d7nPqhXM
X-Google-Smtp-Source: ABdhPJwDIsxP9SoenxqsysjQtt29AOfuBcHAQHQWjEXntag2gl3Yxhi/vwHu0FsKZnqc3TJ1BxgiRw==
X-Received: by 2002:a05:6214:a03:: with SMTP id
 dw3mr6982516qvb.24.1608329891201; 
 Fri, 18 Dec 2020 14:18:11 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.10
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:18:10 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 02/26] gnu: emacs-ert-runner: Adjust following
 emacs-build-system changes.
Date: Fri, 18 Dec 2020 17:16:59 -0500
Message-Id: <20201218221723.26829-2-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
References: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/emacs-xyz.scm (emacs-ert-runner)[phases]{patch-launcher}: New
phase.
{install-executable}: Adjust.
---
 gnu/packages/emacs-xyz.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e242bcf5a8..6ae301aeaf 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12367,6 +12367,14 @@ one if it fails.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-launcher
+           ;; Do not use -Q, as this implies not loading site-start.el, which
+           ;; is required to make Guix Elisp library packages discoverable.
+           (lambda _
+             (substitute* "bin/ert-runner"
+               (("-Q")
+                (string-join %emacs-quick-arguments)))
+             #t))
 	 (add-after 'install 'install-executable
 	   (lambda* (#:key inputs outputs #:allow-other-keys)
 	     (let ((out (assoc-ref outputs "out"))
@@ -12374,8 +12382,8 @@ one if it fails.")
 				      (getenv "TMPDIR") "/source")))
 	       (substitute* "bin/ert-runner"
 		 (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
-		  (string-append "ERT_RUNNER=\"" out
-				 "/share/emacs/site-lisp")))
+		  (string-append "ERT_RUNNER=\""
+                                 (outputs->elpa-install-dir outputs))))
 	       (install-file "bin/ert-runner" (string-append out "/bin"))
 	       (wrap-program (string-append out "/bin/ert-runner")
 		 (list "EMACSLOADPATH" ":" 'prefix
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at 45316 <at> debbugs.gnu.org:


Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:18:10 2020
Received: from localhost ([127.0.0.1]:40253 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqO4e-00004t-U6
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:09 -0500
Received: from mail-qt1-f180.google.com ([209.85.160.180]:41065)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqO4c-0008Vc-IM
 for 45316 <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:18:08 -0500
Received: by mail-qt1-f180.google.com with SMTP id j26so2475884qtq.8
 for <45316 <at> debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:mime-version
 :content-transfer-encoding;
 bh=NESyMhfqxmai85BSD9xGmigqdIcvXYsMw5OU092prq0=;
 b=ai9iCrKRql+dnMCqyYM5ERvK2IQS6L7iqnRVk+BZYxFN8aK8vjMWliWQEaDGm3BCKa
 R0A4nL93Vi9fXcu2S875rL4468Ql9MjojA9YxuOOftcqxxei3OjBjzyTMBYsTXhhjtUz
 WaD4Gc/jRkuKg4oIrAYFTkK0P2HRV+QSIoLa2EhJXAYFfuxF2ZW0S29J6TerrViI9hLc
 j+bTaxx02IADomjf+8KO8P675rAiEaMgpv4HDJ8mFYCQvFBzJj1YHW++YvEURvC5HY1B
 THGzCNK4EzM3wmelbxCp1YtGaKEooCyH7VbHGoS3Cjb23glsL8wklKOv+ZKLjcEfwler
 TX9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
 :content-transfer-encoding;
 bh=NESyMhfqxmai85BSD9xGmigqdIcvXYsMw5OU092prq0=;
 b=dha7fj1lFNpEemV0Pgoh8E9ii+qH7X5KSwSNF6ucIF8cpUqB41Y/KMRyApLsMqQTFc
 vuE+Cz2RTcrIvQcnIj2ybhM/fknxCLTaSroe8aF5zT2JMgYDOfgXzgMzMRoHQDSn8KvX
 G8KXLkkHZ5FbfcHJST4vwsdq2sYrrKgGDm3zGr89JIEgGa5z+iEbL/qHd1VNJnz70I/N
 w1k++PRelDgir+cw6WRaapfyZfPBGERkBn6bdNsTsEXz5GtNZPCWVG3vU8OqnNuMevp6
 2XgUBkO9lKl5ecSAgqSDkM7z4ZiDorWpEMFFhXCDzC5WBLvFvrpZp7dnAPl+/JyGxIAz
 mitQ==
X-Gm-Message-State: AOAM531tDmXEmn3dzmGYGCDjJZajaksl0VgKe6tyxb2eeDjYwVPlWw9L
 obVxNQhl3qHpcpDS82CePvRSM86pCMb2A+tZ
X-Google-Smtp-Source: ABdhPJyAVJMP/0WcB5PJc/5EdNtLlFejsFCv0DE7k56qHWu8rjwVK8241AuJDYwZK9AIIVBj1Qh82w==
X-Received: by 2002:ac8:3aa7:: with SMTP id x36mr6186542qte.206.1608329880116; 
 Fri, 18 Dec 2020 14:18:00 -0800 (PST)
Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.17.59
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:17:59 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45316 <at> debbugs.gnu.org
Subject: [PATCH 01/26] build-systems/emacs: Install packages in their own
 directory.
Date: Fri, 18 Dec 2020 17:16:58 -0500
Message-Id: <20201218221723.26829-1-maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.29.2
MIME-Version: 1.0
Content-Type: text/plain; charset=yes
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45316
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

This avoids the risk of file name collisions between Emacs packages installed
to a profile.  One example of such a clash is the 'snippets' directory
installed by both the emacs-elpy and emacs-yasnippet-snippets packages.

* guix/build/emacs-build-system.scm (%install-prefix): Append '/guix' to the
existing %install-dir prefix.
(version->elpa-version): New procedure.
(build, patch-el-files, install, move-doc, make-autoloads): Adjust phases.
(create-pkg.el): New phase.
(outputs->elpa-install-dir): New procedure.
(%standard-phases): Register the new 'create-pkg.el phase.
* guix/build/emacs-utils.scm (%emacs-quick-arguments): New variable.
(emacs-batch-eval): Remove the "--quick" option, and use
%emacs-quick-arguments instead.
(emacs-batch-edit-file): Likewise.
* gnu/packages/aux-files/emacs/guix-emacs.el: Update various comments.
(guix-emacs-package-initialize-ran-p): New variable.
(guix-emacs-package-initialize): New procedure, to replace
guix-emacs-autoload-packages.  Use 'package-initialize' from the 'package'
library of Emacs to do the initialization (load path configuration and
autoloads loading) of the Emacs packages.  Use the same autoload invocation as
'package-initialize', to harmonize the output.
(guix-package-initialize): New alias.
(guix-emacs-autoload-packages): New deprecated alias.
* gnu/packages/emacs.scm (emacs)[phases]{install-site-start}: Adjust for the
auxiliary file name change and new procedure name.  Streamline the require
directive: the 'guix-emacs library is shipped with our Emacs package; it
cannot be missing.  Fix typo in a comment.  Do not use the "--quick" option
when byte compiling.
* doc/guix.texi: Update doc.
---
 doc/contributing.texi                      |   7 +-
 doc/guix.texi                              |  37 ++++---
 gnu/packages/aux-files/emacs/guix-emacs.el |  79 +++++++++++----
 gnu/packages/emacs.scm                     |  13 ++-
 guix/build/emacs-build-system.scm          | 109 +++++++++++++++------
 guix/build/emacs-utils.scm                 |  20 ++--
 6 files changed, 186 insertions(+), 79 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 4195cb4105..1081ddc6d6 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -652,7 +652,12 @@ enabled by setting the @code{#:tests?} argument to @code{#true}.  By
 default, the command to run the test is @command{make check}, but any
 command can be specified via the @code{#:test-command} argument.  The
 @code{#:test-command} argument expects a list containing a command and
-its arguments, to be invoked during the @code{check} phase.
+its arguments, to be invoked during the @code{check} phase.  The Elisp
+libraries discovery mechanism used in Guix relies on the site file being
+run.  For this reason, scripts or Makefile recipes must not invoke Emacs
+with the @option{--no-site-file}, @option{--quick} or @option{-Q}
+options as this would cause the Elisp dependencies added as inputs to
+appear unavailable.
 
 The Elisp dependencies of Emacs packages are typically provided as
 @code{propagated-inputs} when required at run time.  As for other
diff --git a/doc/guix.texi b/doc/guix.texi
index 392baf5910..74713b1331 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1887,19 +1887,27 @@ information.
 @subsection Emacs Packages
 
 @cindex @code{emacs}
-When you install Emacs packages with Guix, the Elisp files are placed
-under the @file{share/emacs/site-lisp/} directory of the profile in
-which they are installed.  The Elisp libraries are made available to
-Emacs through the @env{EMACSLOADPATH} environment variable, which is
-set when installing Emacs itself.
-
-Additionally, autoload definitions are automatically evaluated at the
-initialization of Emacs, by the Guix-specific
-@code{guix-emacs-autoload-packages} procedure.  If, for some reason, you
-want to avoid auto-loading the Emacs packages installed with Guix, you
-can do so by running Emacs with the @option{--no-site-file} option
-(@pxref{Init File,,, emacs, The GNU Emacs Manual}).
-
+When you install Emacs packages with Guix, the Elisp files are placed in
+their own directory under the @file{share/emacs/site-lisp/guix}
+installation prefix of the profile in which they are installed.  The
+Elisp libraries are made available to Emacs through the
+@env{EMACSLOADPATH} environment variable, which is set when installing
+Emacs itself.
+
+@cindex package activation, emacs
+@cindex guix-package-initialize
+Additionally, the packages are ``activated'', that is, their autoload
+definitions are evaluated and their specific installation directory
+added to the load path at the initialization of Emacs, by the
+Guix-specific @code{guix-package-initialize} procedure.  This procedure
+can also be called interactively in Emacs to refresh the list of
+available packages, for example, after installing new Emacs packages to
+the user profile.
+
+If, for some reason, you want to avoid auto-loading the Emacs packages
+installed with Guix, you can do so by running Emacs with the
+@option{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs
+Manual}).
 
 @node Upgrading Guix
 @section Upgrading Guix
@@ -7940,7 +7948,8 @@ It first creates the @code{@code{package}-autoloads.el} file, then it
 byte compiles all Emacs Lisp files.  Differently from the Emacs
 packaging system, the Info documentation files are moved to the standard
 documentation directory and the @file{dir} file is deleted.  The Elisp
-package files are installed directly under @file{share/emacs/site-lisp}.
+package files are installed in their own directory under the
+@file{share/site-lisp/guix} installation prefix.
 @end defvr
 
 @defvr {Scheme Variable} font-build-system
diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el
index ca9146c535..a3c0eaa6fc 100644
--- a/gnu/packages/aux-files/emacs/guix-emacs.el
+++ b/gnu/packages/aux-files/emacs/guix-emacs.el
@@ -1,8 +1,8 @@
-;;; guix-emacs.el --- Emacs packages installed with Guix
+;;; guix-emacs.el --- Autoload Emacs packages installed with Guix
 
 ;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@HIDDEN>
 ;; Copyright © 2017 Kyle Meyer <kyle@HIDDEN>
-;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 
 ;; This file is part of GNU Guix.
 
@@ -21,43 +21,84 @@
 
 ;;; Commentary:
 
-;; This file provides auxiliary code to autoload Emacs packages
+;; This file provides auxiliary code to initialize the Emacs packages
 ;; installed with Guix.
 
 ;;; Code:
+(require 'package)
 (require 'seq)
 
 (defvar guix-emacs-autoloads-regexp
   (rx (* any) "-autoloads.el" (zero-or-one "c") string-end)
-  "Regexp to match Emacs 'autoloads' file.")
+  "Regexp to match 'autoloads' file.")
 
 (defun guix-emacs-find-autoloads (directory)
-  "Return a list of Emacs 'autoloads' files in DIRECTORY.
+  "Return a list of 'autoloads' files in DIRECTORY.
 The files in the list do not have extensions (.el, .elc)."
   ;; `directory-files' doesn't honor group in regexp.
   (delete-dups (mapcar #'file-name-sans-extension
                        (directory-files directory 'full-name
                                         guix-emacs-autoloads-regexp))))
 
+(defvar guix-emacs-package-initialize-ran-p nil
+  "Non-nil if `guix-emacs-package-initialize' has run.")
+
 ;;;###autoload
-(defun guix-emacs-autoload-packages ()
-  "Autoload Emacs packages found in EMACSLOADPATH.
+(defun guix-emacs-package-initialize ()
+  "Initialize the Emacs packages.
 
-'Autoload' means to load the 'autoloads' files matching
-`guix-emacs-autoloads-regexp'."
+Load the autoloads files of the packages, and add their directory
+to the Emacs load path if they aren't already."
   (interactive)
-  (let* ((emacs-non-core-load-path-directories
-          ;; Filter out core Elisp directories, which are already autoloaded
-          ;; by Emacs.
-          (seq-filter (lambda (dir)
-                        (string-match-p "/share/emacs/site-lisp" dir))
-                      load-path))
-         (autoloads (mapcan #'guix-emacs-find-autoloads
-                            emacs-non-core-load-path-directories)))
+  (let* (;; Filter out core Elisp directories, which have already been
+         ;; autoloaded by Emacs.
+         (load-path* (seq-filter (lambda (f)
+                                   (string-match-p "/share/emacs/site-lisp" f))
+                                 load-path))
+         (autoloads (mapcan #'guix-emacs-find-autoloads load-path*))
+         (package-directory-list* (mapcar (lambda (f)
+                                            (expand-file-name "guix" f))
+                                          load-path*))
+         (user-emacs-directory-warning nil) ;squelch extraneous warnings
+         (package-user-dir ""))      ;do not activate package.el user packages
+
+    ;; Autoload packages installed without using 'emacs-build-system'; these
+    ;; are found directly under the site-lisp directory (flat hierarchy).
     (mapc (lambda (f)
-            (load f 'noerror))
-          autoloads)))
+            (with-demoted-errors "Error loading autoloads: %s"
+              (load f nil t)))
+          autoloads)
+
+    ;; Set the package-directory-list variable to a meaningful default value
+    ;; on Guix, which for 'package.el' is akin to system packages.  It's
+    ;; important that this variable contains the correct value to see the
+    ;; Guix packages listed (as 'external') in M-x package-list.
+    (setq-default package-directory-list package-directory-list*)
+
+    ;; Initialize the Guix-installed Emacs packages.
+    (package-initialize)
+
+    (unless guix-emacs-package-initialize-ran-p
+      ;; If this is running the first time, hide the fact that
+      ;; `'package-initialization' has run in order to leave the default
+      ;; behavior of package.el unchanged for its users (that is, to run
+      ;; automatically after the early-init.el file but before the user init
+      ;; file -- this can be useful if they configured their `'package-user-dir'
+      ;; variable).
+      (setq package--initialized nil)
+      (setq package--activated nil))
+
+    (setq guix-emacs-package-initialize-ran-p t)))
+
+;;;###autoload
+(defalias 'guix-package-initialize #'guix-emacs-package-initialize)
+
+;;;###autoload
+(define-obsolete-function-alias
+  'guix-emacs-autoload-packages 'guix-package-initialize "20201218")
 
+;;; The symbol name is suffixed by -emacs to avoid a name clash with
+;;; Emacs-Guix's guix.el.
 (provide 'guix-emacs)
 
 ;;; guix-emacs.el ends here
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ca14584ada..98f886278a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -145,8 +145,8 @@
                 "pwd"))
              #t))
          (add-after 'install 'install-site-start
-           ;; Use 'guix-emacs' in "site-start.el", which is used autoload the
-           ;; Elisp packages found in EMACSLOADPATH.
+           ;; Use 'guix-emacs' in "site-start.el", which is used to activate
+           ;; the Elisp packages found in EMACSLOADPATH.
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out      (assoc-ref outputs "out"))
                     (lisp-dir (string-append out "/share/emacs/site-lisp"))
@@ -158,18 +158,17 @@
                                (setq byte-compile-debug t)
                                (byte-recompile-directory
                                 (file-name-as-directory ,dir) 0 1))))
-                   (invoke emacs "--quick" "--batch"
-                           (format #f "--eval=~s" expr))))
+                   (invoke emacs "--batch" (format #f "--eval=~s" expr))))
 
                (copy-file (assoc-ref inputs "guix-emacs.el")
                           (string-append lisp-dir "/guix-emacs.el"))
                (with-output-to-file (string-append lisp-dir "/site-start.el")
                  (lambda ()
                    (display
-                    (string-append "(when (require 'guix-emacs nil t)\n"
-                                   "  (guix-emacs-autoload-packages))\n"))))
+                    (string-append "(require 'guix-emacs)\n"
+                                   "(guix-package-initialize)\n"))))
                ;; Remove the extraneous subdirs.el file, as it causes Emacs to
-               ;; add recursively all the the sub-directories of a profile's
+               ;; add recursively all the sub-directories of a profile's
                ;; share/emacs/site-lisp union when added to EMACSLOADPATH,
                ;; which leads to conflicts.
                (delete-file (string-append lisp-dir "/subdirs.el"))
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index 26ea59bc25..2846926298 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015 Federico Beffa <beffa@HIDDEN>
 ;;; Copyright © 2016 David Thompson <davet@HIDDEN>
 ;;; Copyright © 2016 Alex Kost <alezost@HIDDEN>
-;;; Copyright © 2018, 2019 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,7 +32,8 @@
   #:export (%standard-phases
             %default-include
             %default-exclude
-            emacs-build))
+            emacs-build
+            outputs->elpa-install-dir))
 
 ;; Commentary:
 ;;
@@ -40,10 +41,13 @@
 ;;
 ;; Code:
 
-;;; All the packages are installed directly under site-lisp, which means that
-;;; having that directory in the EMACSLOADPATH is enough to have them found by
-;;; Emacs.
-(define %install-dir "/share/emacs/site-lisp")
+;;; All the packages are installed under their own directory under
+;;; site-lisp/guix, to prevent file name collisions in profiles.  This means
+;;; that some machinery is needed to activate the packages, since they aren't
+;;; directly on the load path.  This is taken care of by the
+;;; 'guix-package-initialize' procedure called from the site-start.el file
+;;; shipped with Emacs from Guix.
+(define %install-prefix "/share/emacs/site-lisp/guix")
 
 ;; These are the default inclusion/exclusion regexps for the install phase.
 (define %default-include '("^[^/]*\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))
@@ -62,6 +66,26 @@ name that has been stripped of the hash and version number."
                     (strip-store-file-name file) suffix))))
       (string-append name suffix))))
 
+(define (version->elpa-version version)
+  "Sanitize VERSION into an ELPA-compatible version.
+
+package.el uses the 'version-to-list' procedure from the 'subr' Emacs library,
+which supports a very limited set of version snapshot annotations, defined in
+the 'version-regexp-alist' variable of the same library.
+
+Strip the least significant components of a version string, so that a Guix
+version such as \"0.4.1-1.a41d5cc\" becomes the valid ELPA version \"0.4.1\".
+In case a valid ELPA version cannot be derived from VERSION, \"0.0.0\" is
+returned."
+  (let ((m (string-match "[0-9]+(\\.[0-9]+)*" version)))
+    (if m
+        (match:substring m)
+        (begin
+          (format (current-error-port)
+                  "warning: failed producing an ELPA-compatible \
+version string from ~s; using \"0.0.0\"~%" version)
+          "0.0.0"))))
+
 (define* (unpack #:key source #:allow-other-keys)
   "Unpack SOURCE into the build directory.  SOURCE may be a compressed
 archive, a directory, or an Emacs Lisp file."
@@ -93,13 +117,12 @@ archive, a directory, or an Emacs Lisp file."
 environment variable\n" source-directory)))
 
 (define* (build #:key outputs inputs #:allow-other-keys)
-  "Compile .el files."
-  (let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))
-         (out (assoc-ref outputs "out"))
-         (site-lisp (string-append out %install-dir)))
+  "Byte compile .el files."
+  (let ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))
+        (install-dir (outputs->elpa-install-dir outputs)))
     (setenv "SHELL" "sh")
     (parameterize ((%emacs emacs))
-      (emacs-byte-compile-directory site-lisp))))
+      (emacs-byte-compile-directory install-dir))))
 
 (define* (patch-el-files #:key outputs #:allow-other-keys)
   "Substitute the absolute \"/bin/\" directory with the right location in the
@@ -115,13 +138,12 @@ store in '.el' files."
            (else (loop (read-line in 'concat))))))
       #:binary #t))
 
-  (let* ((out (assoc-ref outputs "out"))
-         (site-lisp (string-append out %install-dir))
-         ;; (ice-9 regex) uses libc's regexp routines, which cannot deal with
-         ;; strings containing NULs.  Filter out such files.  TODO: Remove
-         ;; this workaround when <https://bugs.gnu.org/30116> is fixed.
-         (el-files (remove file-contains-nul-char?
-                           (find-files (getcwd) "\\.el$"))))
+  (let ((install-dir (outputs->elpa-install-dir outputs))
+        ;; (ice-9 regex) uses libc's regexp routines, which cannot deal with
+        ;; strings containing NULs.  Filter out such files.  TODO: Remove
+        ;; this workaround when <https://bugs.gnu.org/30116> is fixed.
+        (el-files (remove file-contains-nul-char?
+                          (find-files (getcwd) "\\.el$"))))
     (define (substitute-program-names)
       (substitute* el-files
         (("\"/bin/([^.]\\S*)\"" _ cmd-name)
@@ -130,7 +152,7 @@ store in '.el' files."
              (error "patch-el-files: unable to locate " cmd-name))
            (string-append "\"" cmd "\"")))))
 
-    (with-directory-excursion site-lisp
+    (with-directory-excursion install-dir
       ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still
       ;; ISO-8859-1-encoded.
       (unless (false-if-exception (substitute-program-names))
@@ -180,15 +202,14 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make TEST-COMMAND."
       (and (any (cut match-stripped-file "included" <>) include)
            (not (any (cut match-stripped-file "excluded" <>) exclude)))))
 
-  (let* ((out (assoc-ref outputs "out"))
-         (site-lisp (string-append out %install-dir))
+  (let ((install-dir (outputs->elpa-install-dir outputs))
          (files-to-install (find-files source install-file?)))
     (cond
      ((not (null? files-to-install))
       (for-each
        (lambda (file)
          (let* ((stripped-file (string-drop file (string-length source)))
-                (target-file (string-append site-lisp stripped-file)))
+                (target-file (string-append install-dir stripped-file)))
            (format #t "`~a' -> `~a'~%" file target-file)
            (install-file file (dirname target-file))))
        files-to-install)
@@ -199,15 +220,31 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make TEST-COMMAND."
                            (install-file? file stat #:verbose? #t)))
       #f))))
 
+(define* (create-pkg.el #:key outputs #:allow-other-keys)
+  "Generate the name-pkg.el file required by package.el."
+  (let*-values (((install-dir)   (outputs->elpa-install-dir outputs))
+                ((elpa-name-ver) (store-directory->elpa-name-version
+                                  (assoc-ref outputs "out")))
+                ((name version)  (package-name->name+version elpa-name-ver))
+                ((elpa-version)  (version->elpa-version version)))
+    (call-with-output-file (string-append install-dir "/" name "-pkg.el")
+      (lambda (port)
+        ;; Note: the file cannot be byte compiled, as the loader expects a
+        ;; single form present, which leaves no option to include (require
+        ;; 'package).
+        (display ";; Generated by Guix -*- no-byte-compile: t -*-\n" port)
+        (write `(define-package ,name ,elpa-version) port)
+        (display "\n" port)
+        #t))))
+
 (define* (move-doc #:key outputs #:allow-other-keys)
   "Move info files from the ELPA package directory to the info directory."
-  (let* ((out (assoc-ref outputs "out"))
-         (site-lisp (string-append out %install-dir))
-         (info-dir (string-append out "/share/info/"))
-         (info-files (find-files site-lisp "\\.info$")))
+  (let* ((install-dir (outputs->elpa-install-dir outputs))
+         (info-dir (string-append (assoc-ref outputs "out") "/share/info/"))
+         (info-files (find-files install-dir "\\.info$")))
     (unless (null? info-files)
       (mkdir-p info-dir)
-      (with-directory-excursion site-lisp
+      (with-directory-excursion install-dir
         (when (file-exists? "dir") (delete-file "dir"))
         (for-each (lambda (f)
                     (copy-file f (string-append info-dir "/" (basename f)))
@@ -218,12 +255,12 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make TEST-COMMAND."
 (define* (make-autoloads #:key outputs inputs #:allow-other-keys)
   "Generate the autoloads file."
   (let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))
-         (out (assoc-ref outputs "out"))
-         (site-lisp (string-append out %install-dir))
-         (elpa-name-ver (store-directory->elpa-name-version out))
+         (install-dir (outputs->elpa-install-dir outputs))
+         (elpa-name-ver (store-directory->elpa-name-version
+                         (assoc-ref outputs "out")))
          (elpa-name (package-name->name+version elpa-name-ver)))
     (parameterize ((%emacs emacs))
-      (emacs-generate-autoloads elpa-name site-lisp))))
+      (emacs-generate-autoloads elpa-name install-dir))))
 
 (define* (enable-autoloads-compilation #:key outputs #:allow-other-keys)
   "Remove the NO-BYTE-COMPILATION local variable embedded in the generated
@@ -258,6 +295,13 @@ second hyphen.  This corresponds to 'name-version' as used in ELPA packages."
             strip-store-file-name)
    store-dir))
 
+(define (outputs->elpa-install-dir outputs)
+  "Given OUTPUTS, a package outputs, return the ELPA-like Guix installation
+directory of the Emacs package."
+  (let ((out (assoc-ref outputs "out")))
+    (string-append out %install-prefix "/"
+                   (store-directory->elpa-name-version out))))
+
 (define %standard-phases
   (modify-phases gnu:%standard-phases
     (replace 'unpack unpack)
@@ -267,7 +311,8 @@ second hyphen.  This corresponds to 'name-version' as used in ELPA packages."
     (delete 'build)
     (replace 'check check)
     (replace 'install install)
-    (add-after 'install 'make-autoloads make-autoloads)
+    (add-after 'install 'create-pkg.el create-pkg.el)
+    (add-after 'create-pkg.el 'make-autoloads make-autoloads)
     (add-after 'make-autoloads 'enable-autoloads-compilation
       enable-autoloads-compilation)
     (add-after 'enable-autoloads-compilation 'patch-el-files patch-el-files)
diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm
index 5f7ba71244..485218d040 100644
--- a/guix/build/emacs-utils.scm
+++ b/guix/build/emacs-utils.scm
@@ -23,6 +23,7 @@
   #:use-module (guix build utils)
   #:use-module (ice-9 format)
   #:export (%emacs
+            %emacs-quick-arguments
             emacs-batch-eval
             emacs-batch-edit-file
             emacs-batch-disable-compilation
@@ -42,6 +43,11 @@
   ;; The `emacs' command.
   (make-parameter "emacs"))
 
+(define %emacs-quick-arguments
+  ;; Like --quick (-Q), except the site-start.el file is loaded since it is
+  ;; required to load packages.
+  '("--no-init-file" "--no-site-lisp" "--no-splash" "--no-x-resources"))
+
 (define (expr->string expr)
   "Converts EXPR, an expression, into a string."
   (if (string? expr)
@@ -51,15 +57,17 @@
 (define* (emacs-batch-eval expr #:key dynamic?)
   "Run Emacs in batch mode, and execute the Elisp code EXPR.  If DYNAMIC? is
 true, evaluate using dynamic scoping."
-  (invoke (%emacs) "--quick" "--batch"
-          (format #f "--eval=(eval '~a ~:[t~;nil~])"
-                  (expr->string expr) dynamic?)))
+  (apply invoke (%emacs) "--batch"
+         (format #f "--eval=(eval '~a ~:[t~;nil~])"
+                 (expr->string expr) dynamic?)
+         %emacs-quick-arguments))
 
 (define (emacs-batch-edit-file file expr)
   "Load FILE in Emacs using batch mode, and execute the elisp code EXPR."
-  (invoke (%emacs) "--quick" "--batch"
-          (string-append "--visit=" file)
-          (string-append "--eval=" (expr->string expr))))
+  (apply invoke (%emacs) "--batch"
+         (string-append "--visit=" file)
+         (string-append "--eval=" (expr->string expr))
+         %emacs-quick-arguments))
 
 (define (emacs-batch-disable-compilation file)
   (emacs-batch-edit-file file
-- 
2.29.2





Information forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 18 Dec 2020 22:00:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Dec 18 17:00:20 2020
Received: from localhost ([127.0.0.1]:40237 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kqNnP-00083M-Ua
	for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:00:20 -0500
Received: from lists.gnu.org ([209.51.188.17]:57304)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kqNnO-00083C-Qn
 for submit <at> debbugs.gnu.org; Fri, 18 Dec 2020 17:00:19 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:38946)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
 id 1kqNnO-000836-IK
 for bug-guix@HIDDEN; Fri, 18 Dec 2020 17:00:18 -0500
Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:37083)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
 id 1kqNnK-0000LD-8X
 for bug-guix@HIDDEN; Fri, 18 Dec 2020 17:00:17 -0500
Received: by mail-qt1-x836.google.com with SMTP id z9so2455026qtn.4
 for <bug-guix@HIDDEN>; Fri, 18 Dec 2020 14:00:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:subject:date:message-id:mime-version;
 bh=e/lVmjLLeCvEinWyi9JYGM5h7izbLSoXjALespNWLnc=;
 b=fZYroZQ8JINPpiC/nTonO/PhFEZqtEH5ZH4pW+2SuytLgaNDa/cwuwcue8nNawS5kc
 iAu/b2udU8NKLup1QPM0nbNnz2RRYqIZDyFMGBAo1HRS6QvvBkjfybM3E3WNwlz2gZFz
 KQPdosbrj7XO8EeTYk7o1TJbMW6SoyV9rdHiTAU8WQ1dGv2O1YkD3Ek+xle8BCc5wUFa
 IsfS13EPADmR9WukpzqaRwVKwpHj6Vs9FZL9kOlhaIucmjS8ZbaTV9LP4GwQ8qjjEtj5
 YqWr+z7fdKS0tVSW4QfOVkMuYY8vglC+GolLkhcLe1ePuDwRBYX7bn6FUEzo2IX1rdV8
 SZUg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:subject:date:message-id:mime-version;
 bh=e/lVmjLLeCvEinWyi9JYGM5h7izbLSoXjALespNWLnc=;
 b=MoPUxKmZyaWNM7d+Ex+1TBLliMExKWjsm7wW6J3t+pfFLAQqW0uVnFgigf/5wlmhJr
 SwrjyBm5fGhi7ARLIxEtpk7oFZ9OQdq/NjxcJooWuUqS0yRl3B+VGsRVUrgMsvTCj9HI
 /VeHDIWELnCRRCbjOOrjci+Ny3t6Um/9XaIbEa3N2sJwL5GqM0cBirjpsP9CwpeE5sQt
 X6VTCe3146QCcAZr8ztZSpmFhQPtJy1OYIhyh7PpAGHbFsmmR81cvPRBY/GnUXLkcwtO
 uJZT+faD5YbKJ+kb9q1++ryjzg4u9sS/AJyEbhC6+ChxEFJpyLrir93JrtIQIG3FcZcL
 mD9w==
X-Gm-Message-State: AOAM532vN/mqGGxvzTVYwtCrjjOZchoESte4I87cp1taI3S8qBmLPm9j
 9Np6/Gi0T4D/hxSdJPL6EWWS5N1rHCJyxQ==
X-Google-Smtp-Source: ABdhPJyJCaNLj5arx6l3U0senJJ+xdhSGZIqPLthIwIkOk9X+Yz09mPGhOKfLX4X/XwEFAvYp01tBQ==
X-Received: by 2002:ac8:6651:: with SMTP id j17mr6216446qtp.176.1608328812088; 
 Fri, 18 Dec 2020 14:00:12 -0800 (PST)
Received: from hurd (dsl-10-146-235.b2b2c.ca. [72.10.146.235])
 by smtp.gmail.com with ESMTPSA id f5sm428387qto.67.2020.12.18.14.00.11
 for <bug-guix@HIDDEN>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 18 Dec 2020 14:00:11 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: bug-guix <bug-guix@HIDDEN>
Subject: [PATCH]: Re-introduce Emacs packages specific installation prefix.
Date: Fri, 18 Dec 2020 17:00:10 -0500
Message-ID: <87y2huepw5.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Received-SPF: pass client-ip=2607:f8b0:4864:20::836;
 envelope-from=maxim.cournoyer@HIDDEN; helo=mail-qt1-x836.google.com
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, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

--=-=-=
Content-Type: text/plain

Hello Guix!

tl;dr: The Emacs build system and site-start.el loader are modified so
that Emacs packages are installed in their own distinct installation
directory.

The Emacs packages built with the Emacs built system used to be
installed in a sub-directory under the share/emacs/guix.d/ directory,
but this was changed in commit 65a7dd2950ca13a8b942b2836260a2192351b271
shortly after having accommodated the site-start.el machinery to enable
loading packages from any profile (via the EMACSLOADPATH search path
specification).

While this change allowed to expose simply and directly the packages
found in EMACSLOADPATH, it does introduce the risk of file name
collisions when multiple Emacs packages are joined in the same profile,
especially with Emacs packages increasing in complexity (e.g., using
more than a single .el file!) and expecting to have both their sources
and resources extracted under their own nested directory rather than as
a flat collection (ELPA, MELPA).

One recent example I stumbled on was attempting to use the
emacs-yasnippet-snippets package along with emacs-elpy; both wanted to
install a 'snippets' directory to share/emacs/site-lisp/snippets,
collided and resulted in problems that prove difficult to understand.

This is what motivated this patch series, where the site-start.el
auxiliary code used for package discovery is extended to support
packages installed in their own directory under a 'share/emacs/guix'
installation prefix, via Emacs' own package library!

The emacs-build-system is updated for this new installation prefix, as
well as existing packages and documentation.  Parting with a directly
usable EMACSLOADPATH means that site-start.el *must* run for packages to
appear in the load-path; that means for running a test suite, the -Q or
--quick Emacs options cannot be used, since it implies --no-site-file.

Benefits of using this approach:

+ Avoid inter-package file name collisions.

+ Better integration with user installed packages via M-x
package-install.  The Guix-installed packages are listed in M-x
package-list as 'external'.

Cons include:

- Slightly more complex loader (although much of it is offloaded to
  package.el), thus slightly slower (see the comparison below).

- Requires to ensure every package's test suite doesn't make use of -Q.

In my opinion the benefits outweighs the cons by a comfortable margin,
especially with the boring work of adapting the package collection
already done.

To test the performance of the new approach, the following manifest file
was used to test the rebuild of the ~900 Emacs packages making use of
the Emacs build system:


--=-=-=
Content-Type: text/plain
Content-Disposition: inline; filename=emacs-packages-manifest.scm

(use-modules (gnu packages)
             (guix build-system)
             (guix packages)
             (srfi srfi-1))

(define %broken-emacs-packages
  (map specification->package
       '("emacs-picpocket"              ;tests fail
         "emacs-twittering-mode"        ;build fails

         ;; Broken only on current master, without new changes.
         "emacs-md4rd"
         "emacs-el-patch"
         "emacs-flymake-shellcheck"
         )))

(define %emacs-packages
  (fold-packages (lambda (package lst)
                   (if (eq? (build-system-name (package-build-system package))
                            'emacs)
                       (cons package lst)
                       lst))
                 '()))

(packages->manifest
 (lset-difference eqv? %emacs-packages %broken-emacs-packages))

--=-=-=
Content-Type: text/plain


A simple benchmark testing the performance of the activation of the
hundreds of Emacs packages was then run using:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix environment --pure -m emacs-packages-manifest.scm \
                                  --ad-hoc emacs
[env]$ /run/setuid-programs/sudo /bin/sh -c 'echo 3 > /proc/sys/vm/drop_caches'
[env]$ emacs --batch --no-site-file \
    --eval="(progn (require 'guix-emacs) \
                   (require 'benchmark) \
                   (message \"(total gc-count gc-time) = %s\" \
                            (benchmark-run 1 (guix-emacs-autoload-packages))))"
--8<---------------cut here---------------end--------------->8---

On the master branch:

--8<---------------cut here---------------start------------->8---
[...]
Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-profile/share/emacs/site-lisp/zotxt-autoloads...
Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-profile/share/emacs/site-lisp/zoutline-autoloads...
Loading /gnu/store/qajc70c7nqycs1301ram8s3x7k9ibg5f-profile/share/emacs/site-lisp/ztree-autoloads...
(total gc-count gc-time) = (25.242400751 13 0.189669369)
--8<---------------cut here---------------end--------------->8---

Or about 0.65 s on a warm cache.

On a branch with these changes:

--8<---------------cut here---------------start------------->8---
Error loading autoloads: (file-missing Cannot open load file No such file or directory kotl/kotl-autoloads)
Error loading autoloads: (file-missing Cannot open load file No such file or directory helm-easymenu)
Error loading autoloads: (file-missing Cannot open load file No such file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-profile/share/emacs/site-lisp/guix/flycheck-cpplint-0.1-1.1d8a090/flycheck-cpplint-autoloads)
Error loading autoloads: (file-missing Cannot open load file No such file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-profile/share/emacs/site-lisp/guix/evil-anzu-0.03/evil-anzu-autoloads)
Error loading autoloads: (file-missing Cannot open load file No such file or directory /gnu/store/ryh0rasi9frm98dkd3kbck6hya6hn2qr-profile/share/emacs/site-lisp/guix/erc-image-0-3.82fb387/erc-image-autoloads)
ad-handle-definition: `ido-completing-read' got redefined
Error loading autoloads: (file-missing Cannot open load file No such file or directory tex-site)
(total gc-count gc-time) = (26.175704339 47 0.783184412)
--8<---------------cut here---------------end--------------->8---

Or about 3 seconds on a warm cache.

There a 6 errors that would need to be looked into, but I these look
like actual packaging problems rather than new issues.  The previously
used way to load the autoloads, '(load f 'noerror)' would have masked
them.

Thanks,

Maxim

--=-=-=--




Acknowledgement sent to Maxim Cournoyer <maxim.cournoyer@HIDDEN>:
New bug report received and forwarded. Copy sent to bug-guix@HIDDEN. Full text available.
Report forwarded to bug-guix@HIDDEN:
bug#45316; Package guix. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Tue, 22 Dec 2020 19:15:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.