bug#65924: git searches coreutils and util-linux commands in PATH

[Liliana Marie Prikler]

Am Montag, dem 09.10.2023 um 23:03 +0200 schrieb b...@bokr.com:
> Hi,
> 
> On +2023-10-09 20:33:38 +0200, Liliana Marie Prikler wrote:
> > I don't necessarily agree, but it's not a hard disagree either. 
> > I'll try to keep that in mind at least when reviewing your patches
> > to not cause confusion.
> > 
> > Cheers
> > 
> 
> TL;DR: Would it make sense to anticipate that LLM-bots will be used
> to automate gathering of info for reviewers?
> 
> If so, what would a style guide for english in posts (like
> a coding style guide, but for LLM-bot consumption) look like?
> Some kind of literate programming for LLM-bot and human use?
Let's not rely on large language models.  If we are going to automate
this, it ought to be through interpretable, "rule-based" systems. 
Like, imagine that on top of telling debbugs to close a bug etc., you
could tell debbugs (or some other tool) that some patch or a series
looks good to you.  We could then add an interface to allow filtering
for "looks good" series for quick patch application, the rationale
being that committers have to do less or no review of their own as they
commit to a patch or series.*

Cheers

* They should still check that the series actually looks good to enough
folks.

bug#65858: mumi crashes

[Maxim Cournoyer]

Hi Arun,

Arun Isaac  writes:

> Hi Maxim,
>
> Thanks for monitoring mumi. I'm not sure why these mumi crashes are
> happening. I can think of two leads to start working on.
>
> 1. I see many lines such as those below that warn of garbage collection
> issues with "repeated allocations of large blocks". I am not sure, but
> this sounds like some limitation of the guile garbage collector. I
> suspect these warnings arise because the guile-email parser thrashes the
> garbage collector too much. I could look into rewriting parts of
> guile-email to be more careful with memory use.
>
> 2023-09-09 16:21:00 GC Warning: Repeated allocation of very large block 
> (appr. size 16777216):
> 2023-09-09 16:21:00   May lead to memory leak and poor performance
> 2023-09-09 16:30:24 GC Warning: Repeated allocation of very large block 
> (appr. size 16138240):
> 2023-09-09 16:30:24   May lead to memory leak and poor performance
> 2023-09-09 16:39:11 GC Warning: Repeated allocation of very large block 
> (appr. size 16781312):
> 2023-09-09 16:39:11   May lead to memory leak and poor performance

Perhaps that could be related, but I have no such experience to
corroborate unfortunately.

> 2. If there is a specific query that causes mumi to crash, I'd like to
> find out. This could be a GraphQL query. Unfortunately the actual
> GraphQL document lives in the query part of the URI, and we don't log
> the query part. I can patch mumi to log the query part.
>
> WDYT?

I think adding more logging to narrow where the problem is happening
would be a fine action to take here!

-- 
Thanks,
Maxim

bug#63115: match-record cryptic error message on unbound record type

[Maxim Cournoyer]

Hello,

"("  writes:

> Maxim Cournoyer  writes:
>> When a record type is not in scope, the error message produced by the
>> match-record macro from (guix records) reads something like:
>>
>> --8<---cut here---start->8---
>> guix/records.scm:598:32: map-fields: bad use of syntactic keyword in subform 
>> map-fields of map-fields
>> --8<---cut here---end--->8---
>
> Josselin made a patch, which I adapted and submitted at
> .

Which has since been merged, thank you!  Closing.

-- 
Thanks,
Maxim

bug#65858: mumi crashes

[Arun Isaac]

Hi Maxim,

Thanks for monitoring mumi. I'm not sure why these mumi crashes are
happening. I can think of two leads to start working on.

1. I see many lines such as those below that warn of garbage collection
issues with "repeated allocations of large blocks". I am not sure, but
this sounds like some limitation of the guile garbage collector. I
suspect these warnings arise because the guile-email parser thrashes the
garbage collector too much. I could look into rewriting parts of
guile-email to be more careful with memory use.

--8<---cut here---start->8---
2023-09-09 16:21:00 GC Warning: Repeated allocation of very large block (appr. 
size 16777216):
2023-09-09 16:21:00 May lead to memory leak and poor performance
2023-09-09 16:30:24 GC Warning: Repeated allocation of very large block (appr. 
size 16138240):
2023-09-09 16:30:24 May lead to memory leak and poor performance
2023-09-09 16:39:11 GC Warning: Repeated allocation of very large block (appr. 
size 16781312):
2023-09-09 16:39:11 May lead to memory leak and poor performance
--8<---cut here---end--->8---

2. If there is a specific query that causes mumi to crash, I'd like to
find out. This could be a GraphQL query. Unfortunately the actual
GraphQL document lives in the query part of the URI, and we don't log
the query part. I can patch mumi to log the query part.

WDYT?

Regards,
Arun

bug#65924: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.

[Maxim Cournoyer]

Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
| xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
---
 gnu/packages/acl.scm|  2 +-
 gnu/packages/axoloti.scm|  4 +--
 gnu/packages/backup.scm |  2 +-
 gnu/packages/base.scm   |  2 +-
 gnu/packages/benchmark.scm  |  2 +-
 gnu/packages/bioinformatics.scm |  4 +--
 gnu/packages/boost.scm  |  4 +--
 gnu/packages/bootloaders.scm|  6 ++---
 gnu/packages/bqn.scm|  2 +-
 gnu/packages/commencement.scm   |  8 +++---
 gnu/packages/cpp.scm|  2 +-
 gnu/packages/cross-base.scm |  2 +-
 gnu/packages/cups.scm   |  6 ++---
 gnu/packages/curl.scm   |  4 +--
 gnu/packages/debian.scm |  2 +-
 gnu/packages/dezyne.scm |  2 +-
 gnu/packages/dictionaries.scm   |  2 +-
 gnu/packages/djvu.scm   |  4 +--
 gnu/packages/docker.scm |  2 +-
 gnu/packages/emacs-xyz.scm  | 20 +++
 gnu/packages/emulators.scm  |  2 +-
 gnu/packages/engineering.scm|  4 +--
 gnu/packages/esolangs.scm   |  2 +-
 gnu/packages/firmware.scm   |  2 +-
 gnu/packages/fonts.scm  |  4 +--
 gnu/packages/freedesktop.scm|  2 +-
 gnu/packages/game-development.scm   |  4 +--
 gnu/packages/gcc.scm|  6 ++---
 gnu/packages/gdb.scm|  2 +-
 gnu/packages/genimage.scm   |  2 +-
 gnu/packages/geo.scm|  2 +-
 gnu/packages/gimp.scm   |  2 +-
 gnu/packages/gnome.scm  |  2 +-
 gnu/packages/gnucash.scm|  2 +-
 gnu/packages/gnupg.scm  |  2 +-
 gnu/packages/gnuzilla.scm   |  6 ++---
 gnu/packages/graph.scm  |  4 +--
 gnu/packages/guile-xyz.scm  | 38 ++---
 gnu/packages/ibus.scm   |  2 +-
 gnu/packages/image.scm  |  2 +-
 gnu/packages/instrumentation.scm|  2 +-
 gnu/packages/java.scm   |  4 +--
 gnu/packages/language.scm   |  2 +-
 gnu/packages/linux.scm  |  6 ++---
 gnu/packages/machine-learning.scm   |  4 +--
 gnu/packages/mail.scm   |  6 ++---
 gnu/packages/make-bootstrap.scm |  2 +-
 gnu/packages/maths.scm  |  8 +++---
 gnu/packages/messaging.scm  |  2 +-
 gnu/packages/mpd.scm|  2 +-
 gnu/packages/mpi.scm|  2 +-
 gnu/packages/music.scm  |  2 +-
 gnu/packages/networking.scm |  2 +-
 gnu/packages/ocaml.scm  |  2 +-
 gnu/packages/openldap.scm   |  2 +-
 gnu/packages/package-management.scm |  8 +++---
 gnu/packages/password-utils.scm |  2 +-
 gnu/packages/plotutils.scm  |  4 +--
 gnu/packages/qt.scm |  6 ++---
 gnu/packages/racket.scm |  2 +-
 gnu/packages/ratpoison.scm  |  2 +-
 gnu/packages/scheme.scm |  2 +-
 gnu/packages/selinux.scm|  2 +-
 gnu/packages/shellutils.scm |  2 +-
 gnu/packages/simh.scm   |  2 +-
 gnu/packages/speech.scm |  2 +-
 gnu/packages/stb.scm|  2 +-
 gnu/packages/telegram.scm   |  4 +--
 gnu/packages/texinfo.scm|  2 +-
 gnu/packages/text-editors.scm   |  2 +-
 gnu/packages/version-control.scm|  4 +--
 gnu/packages/video.scm  |  2 +-
 gnu/packages/virtualization.scm |  8 +++---
 gnu/packages/web-browsers.scm   |  2 +-
 gnu/packages/web.scm|  2 +-
 gnu/packages/xdisorg.scm|  2 +-
 gnu/packages/xorg.scm   |  2 +-
 guix/build-system/agda.scm  |  2 +-
 guix/build-system/android-ndk.scm   |  2 +-
 guix/build-system/ant.scm   |  2 +-
 guix/build-system/asdf.scm  |  2 +-
 guix/build-system/cargo.scm |  2 +-
 guix/build-system/chicken.scm   |  2 +-
 guix/build-system/cmake.scm |  2 +-
 guix/build-system/copy.scm  |  2 +-
 guix/build-system/dub.scm   |  2 +-
 guix/build-system/elm.scm   |  2 +-
 guix/build-system/emacs.scm |  2 +-
 guix/build-system/font.scm  |  2 +-
 guix/build-system/glib-or-gtk.scm   |  2 +-
 guix/build-system/gnu.scm   | 13 +-
 guix/build-system/go.scm|  2 +-
 guix/build-system/guile.scm |  2 +-
 guix/build-system/haskell.scm   |  2 +-
 guix/build-system/julia.scm | 

bug#65924: git searches coreutils and util-linux commands in PATH

[bokr]

Hi,

On +2023-10-09 20:33:38 +0200, Liliana Marie Prikler wrote:
> Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer:
> > Hello,
> > 
> > Liliana Marie Prikler  writes:
> > 
> > > [...]
> > > If you need me to reduce it to four letters, yes, LGTM.
> > 
> > Explicit is better than implicit.  I've been thinking to document
> > this in our contributing section; e.g. a reviewed commit must have
> > the 'LGTM' from the reviewer.  If a series is LGTM, it needs to be
> > implicitly mentioned with 'this series LGTM'.  That may sound silly,
> > but I think it'd simplify reviewer/submitters interactions.
> s/implicitly/explicitly/?
> 
> I don't necessarily agree, but it's not a hard disagree either.  I'll
> try to keep that in mind at least when reviewing your patches to not
> cause confusion.
> 
> Cheers
>

TL;DR: Would it make sense to anticipate that LLM-bots will be used
to automate gathering of info for reviewers?

If so, what would a style guide for english in posts (like
a coding style guide, but for LLM-bot consumption) look like?
Some kind of literate programming for LLM-bot and human use?

(I assume experiments have been going on by now, though perhaps
not yet for guile or guix)
--
Regards,
Bengt Richter

bug#66297: guix-daemon not starting after boot

[Sharlatan Hellseher]

Hi,

I think I just get used to kick it manually and forgot to replay on
this issue =)

No Herd/Shepherd logs since Sept 30 in messages

 sudo grep -i "shepherd\|herd" /var/log/messages  | tail
grep: /var/log/messages: binary file matches
Sep 30 21:16:03 localhost shepherd[1]: Service console-font-tty3
running with value #t.
Sep 30 21:16:03 localhost shepherd[1]: Service console-font-tty4 started.
Sep 30 21:16:03 localhost vmunix: [2.427621] shepherd[1]:
Sep 30 21:16:03 localhost vmunix: [2.428262] shepherd[1]:
Sep 30 21:16:03 localhost vmunix: [2.429207] shepherd[1]: Service
sysctl has been started.
Sep 30 21:16:03 localhost vmunix: [2.429434] shepherd[1]: Service
sysctl started.
Sep 30 21:16:03 localhost vmunix: [2.429666] shepherd[1]: Service
sysctl running with value #t.
Sep 30 21:16:03 localhost vmunix: [2.430082] shepherd[1]: Starting
service virtual-terminal...
Sep 30 21:16:03 localhost vmunix: [2.430416] shepherd[1]: Service
virtual-terminal started.
Sep 30 21:16:03 localhost vmunix: [2.430649] shepherd[1]: Service
virtual-terminal running with value #t.

There this no track of guix-daemon was starting in herd log

herd log | grep daemon
10 Oct 2023 00:03:30service upower-daemon is being started
10 Oct 2023 00:03:30service upower-daemon is running
10 Oct 2023 00:03:30service ssh-daemon is being started
10 Oct 2023 00:03:30service ssh-daemon is running

Thanks,
Oleg

On Thu, 5 Oct 2023 at 14:39, Ludovic Courtès  wrote:
>
> Hi,
>
> Sharlatan Hellseher  skribis:
>
> > After the recent pull and system reconfigure I've started experiencing
> > guix-daemon not starting up after the system boot.
>
> Anything in /var/log/messages?
>
> What does ‘herd log’ say?
>
> Thanks,
> Ludo’.



-- 

… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.

bug#66339: [PATCH gnome-team v6] gnu: dbus-service: make the session available under /run/dbus

[Liliana Marie Prikler]

Am Sonntag, dem 08.10.2023 um 16:53 +0200 schrieb Liliana Marie
Prikler:
> [...]
> Otherwise LGTM.  I'd commit it, but my machine is currently busy
> building half of core-updates for no reason.
No longer busy, time to commit.

Thanks

bug#65924: git searches coreutils and util-linux commands in PATH

[Maxim Cournoyer]

Hello,

Liliana Marie Prikler  writes:

> Am Montag, dem 09.10.2023 um 15:25 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana,
>> 
>> Liliana Marie Prikler  writes:
>> 
>> > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer:
>> > > Hello,
>> > > 
>> > > Liliana Marie Prikler  writes:
>> > > 
>> > > > [...]
>> > > > If you need me to reduce it to four letters, yes, LGTM.
>> > > 
>> > > Explicit is better than implicit.  I've been thinking to document
>> > > this in our contributing section; e.g. a reviewed commit must
>> > > have the 'LGTM' from the reviewer.  If a series is LGTM, it needs
>> > > to be implicitly mentioned with 'this series LGTM'.  That may
>> > > sound silly, but I think it'd simplify reviewer/submitters
>> > > interactions.
>> > s/implicitly/explicitly/?
>> 
>> Explicit, indeed.
>> 
>> > I don't necessarily agree, but it's not a hard disagree either. 
>> > I'll try to keep that in mind at least when reviewing your patches
>> > to not cause confusion.
>> 
>> OK.  One place where this becomes more important is when the send-
>> email cc hook includes people partially to a series. A LGTM on a
>> single message in this case could be misinterpreted for the whole
>> series.  It's best to document the expectations and codify these
>> often used signals, in my opinion.
> I personally prefer to comment to all individual patches or use the
> series starter for "this series LGTM", but to recap; 1 and 2 L'd GTM
> (with a small caveat for 1) already and we discussed 3 in IRC, so LGTM
> for the series.

That's a good idea.

Thanks for the heads-up!  I've now installed this series to
core-updates.  Closing!

-- 
Thanks,
Maxim

bug#65924: git searches coreutils and util-linux commands in PATH

[Liliana Marie Prikler]

Am Montag, dem 09.10.2023 um 15:25 -0400 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> Liliana Marie Prikler  writes:
> 
> > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer:
> > > Hello,
> > > 
> > > Liliana Marie Prikler  writes:
> > > 
> > > > [...]
> > > > If you need me to reduce it to four letters, yes, LGTM.
> > > 
> > > Explicit is better than implicit.  I've been thinking to document
> > > this in our contributing section; e.g. a reviewed commit must
> > > have the 'LGTM' from the reviewer.  If a series is LGTM, it needs
> > > to be implicitly mentioned with 'this series LGTM'.  That may
> > > sound silly, but I think it'd simplify reviewer/submitters
> > > interactions.
> > s/implicitly/explicitly/?
> 
> Explicit, indeed.
> 
> > I don't necessarily agree, but it's not a hard disagree either. 
> > I'll try to keep that in mind at least when reviewing your patches
> > to not cause confusion.
> 
> OK.  One place where this becomes more important is when the send-
> email cc hook includes people partially to a series. A LGTM on a
> single message in this case could be misinterpreted for the whole
> series.  It's best to document the expectations and codify these
> often used signals, in my opinion.
I personally prefer to comment to all individual patches or use the
series starter for "this series LGTM", but to recap; 1 and 2 L'd GTM
(with a small caveat for 1) already and we discussed 3 in IRC, so LGTM
for the series.

Cheers

bug#65924: git searches coreutils and util-linux commands in PATH

[Maxim Cournoyer]

Hi Liliana,

Liliana Marie Prikler  writes:

> Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer:
>> Hello,
>> 
>> Liliana Marie Prikler  writes:
>> 
>> > [...]
>> > If you need me to reduce it to four letters, yes, LGTM.
>> 
>> Explicit is better than implicit.  I've been thinking to document
>> this in our contributing section; e.g. a reviewed commit must have
>> the 'LGTM' from the reviewer.  If a series is LGTM, it needs to be
>> implicitly mentioned with 'this series LGTM'.  That may sound silly,
>> but I think it'd simplify reviewer/submitters interactions.
> s/implicitly/explicitly/?

Explicit, indeed.

> I don't necessarily agree, but it's not a hard disagree either.  I'll
> try to keep that in mind at least when reviewing your patches to not
> cause confusion.

OK.  One place where this becomes more important is when the send-email
cc hook includes people partially to a series. A LGTM on a single
message in this case could be misinterpreted for the whole series.  It's
best to document the expectations and codify these often used signals,
in my opinion.

-- 
Thanks,
Maxim

bug#65924: git searches coreutils and util-linux commands in PATH

[Maxim Cournoyer]

Hi Liliana,

Liliana Marie Prikler  writes:

> Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana :-)
>> 
>> Liliana Marie Prikler  writes:
>> 
>> > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer:
>> > > It's simpler to add features on top of a minimal variant than to
>> > > remove them, and helps avoiding mistakenly changing git-minimal,
>> > > which has many dependents.
>> > > 
>> > > * gnu/packages/version-control.scm (git-minimal): Move above git
>> > > and severe inheritance.  Remove input label.  Repatriate most
>> > > fields from...
>> > > (git): ... here.  Define as package/inherit to inherit from git-
>> > > minimal.
>> > > Extend minimal values instead of overriding them whole.
>> > > ---
>> > Having done the same to Emacs recently, I fully agree with this
>> > move.
>> 
>> Great; does this mean a LGTM on your side for this one?  Please be
>> explicit :-).
> If you need me to reduce it to four letters, yes, LGTM.

Just to make sure, the LGTM is for the whole series?

-- 
Thanks,
Maxim

bug#65924: git searches coreutils and util-linux commands in PATH

[Liliana Marie Prikler]

Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler  writes:
> 
> > [...]
> > If you need me to reduce it to four letters, yes, LGTM.
> 
> Explicit is better than implicit.  I've been thinking to document
> this in our contributing section; e.g. a reviewed commit must have
> the 'LGTM' from the reviewer.  If a series is LGTM, it needs to be
> implicitly mentioned with 'this series LGTM'.  That may sound silly,
> but I think it'd simplify reviewer/submitters interactions.
s/implicitly/explicitly/?

I don't necessarily agree, but it's not a hard disagree either.  I'll
try to keep that in mind at least when reviewing your patches to not
cause confusion.

Cheers

bug#65924: git searches coreutils and util-linux commands in PATH

[Maxim Cournoyer]

Hello,

Liliana Marie Prikler  writes:

> Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana :-)
>> 
>> Liliana Marie Prikler  writes:
>> 
>> > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer:
>> > > It's simpler to add features on top of a minimal variant than to
>> > > remove them, and helps avoiding mistakenly changing git-minimal,
>> > > which has many dependents.
>> > > 
>> > > * gnu/packages/version-control.scm (git-minimal): Move above git
>> > > and severe inheritance.  Remove input label.  Repatriate most
>> > > fields from...
>> > > (git): ... here.  Define as package/inherit to inherit from git-
>> > > minimal.
>> > > Extend minimal values instead of overriding them whole.
>> > > ---
>> > Having done the same to Emacs recently, I fully agree with this
>> > move.
>> 
>> Great; does this mean a LGTM on your side for this one?  Please be
>> explicit :-).
> If you need me to reduce it to four letters, yes, LGTM.

Explicit is better than implicit.  I've been thinking to document this
in our contributing section; e.g. a reviewed commit must have the 'LGTM'
from the reviewer.  If a series is LGTM, it needs to be implicitly
mentioned with 'this series LGTM'.  That may sound silly, but I think
it'd simplify reviewer/submitters interactions.

-- 
Thanks,
Maxim

bug#66358: Now what about firmware?

[Perry, Daniel J]

Okay, great! I didn't think that they were mutually exclusive.
However, I still have a problem. You see, the reason why I'm using "guix 
archive" in the first place is because I don't have the wifi drivers for my 
laptop and I'm trying to install it without any Internet.

I don't think that simply adding the files to the store will work in this case, 
so I'll probably have to copy the source code, copy gcc-toolchain, copy the 
lisp code that describes the firmware package, and build there.

In any case, thanks a lot.

bug#65924: git searches coreutils and util-linux commands in PATH

[Liliana Marie Prikler]

Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer:
> Hi Liliana :-)
> 
> Liliana Marie Prikler  writes:
> 
> > Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer:
> > > It's simpler to add features on top of a minimal variant than to
> > > remove them, and helps avoiding mistakenly changing git-minimal,
> > > which has many dependents.
> > > 
> > > * gnu/packages/version-control.scm (git-minimal): Move above git
> > > and severe inheritance.  Remove input label.  Repatriate most
> > > fields from...
> > > (git): ... here.  Define as package/inherit to inherit from git-
> > > minimal.
> > > Extend minimal values instead of overriding them whole.
> > > ---
> > Having done the same to Emacs recently, I fully agree with this
> > move.
> 
> Great; does this mean a LGTM on your side for this one?  Please be
> explicit :-).
If you need me to reduce it to four letters, yes, LGTM.

bug#65924: [PATCH core-updates 35/65] gnu: guile-hall: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-hall) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ifce9b013fbcff59031659bb727ec1c9cdd06ea40
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index effde03cee..0e6a4de52f 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1983,7 +1983,7 @@ (define-public guile-hall
   `(#:modules
 ((ice-9 match)
  (ice-9 ftw)
- ,@%default-gnu-imported-modules)
+ ,@%default-gnu-modules)
 #:phases
 (modify-phases
   %standard-phases
-- 
2.41.0

bug#65924: [PATCH core-updates 57/65] gnu: boxes: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/shellutils.scm (boxes) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I5272366ead3929e0ce2311ca2a5e4c5138523927
---
 gnu/packages/shellutils.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 29ea0e4dd9..13c340b664 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -122,7 +122,7 @@ (define-public boxes
  "/etc/boxes-config"))
#:modules
((ice-9 match)
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (delete 'configure)
-- 
2.41.0

bug#65924: [PATCH core-updates 47/65] gnu: %gcc-static: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/make-bootstrap.scm (%gcc-static) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I44bf99a8f1a7836352478b6f7dadc27ffb81bb51
---
 gnu/packages/make-bootstrap.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 45fc2ac002..1b6fdd902e 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -472,7 +472,7 @@ (define %gcc-static
  (outputs '("out"))   ; all in one
  (arguments
   (substitute-keyword-arguments (package-arguments gcc-7)
-((#:modules modules %default-gnu-imported-modules)
+((#:modules modules %default-gnu-modules)
  `((srfi srfi-1)
(srfi srfi-26)
(ice-9 regex)
-- 
2.41.0

bug#65924: [PATCH core-updates 53/65] gnu: python-sip-4: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/qt.scm (python-sip-4) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I069c93f3fb11f53f73e1d0301d45f104155695be
---
 gnu/packages/qt.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c0abf7f391..e6ce9f1774 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3527,7 +3527,7 @@ (define-public python-sip-4
,@%default-gnu-imported-modules)
#:modules ((srfi srfi-1)
   ((guix build python-build-system) #:select (python-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (replace 'configure
-- 
2.41.0

bug#65924: [PATCH core-updates 31/65] gnu: artanis: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (artanis) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I477450215d69c84247c4d80612eb6ba9b4d7870b
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 212741b5c5..b5bce7aff1 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -195,7 +195,7 @@ (define-public artanis
 (arguments
  `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:make-flags
-- 
2.41.0

bug#65924: [PATCH core-updates 34/65] gnu: guile-di: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-dbi) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ia7c27cc9c05e8818218e4e57b2e8c0c90210b109
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fac0fce394..effde03cee 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1799,7 +1799,7 @@ (define-public guile-dbi
 (arguments
  `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:configure-flags
-- 
2.41.0

bug#65924: [PATCH core-updates 59/65] gnu: stb: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/stb.scm (stb) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I22000458e9b09aef9b645553f555dc0235a6ff1a
---
 gnu/packages/stb.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm
index 1e2f6a1f15..64c13225eb 100644
--- a/gnu/packages/stb.scm
+++ b/gnu/packages/stb.scm
@@ -47,7 +47,7 @@ (define stb
`(#:modules ((ice-9 ftw)
 (ice-9 regex)
 (srfi srfi-26)
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
  #:phases (modify-phases %standard-phases
 (delete 'configure)
 (delete 'build)
-- 
2.41.0

bug#65924: [PATCH core-updates 52/65] gnu: nar-herder: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/package-management.scm (nar-herder) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ic93a7e15a5be6671bd08280a257cbfeacf2fcbe1
---
 gnu/packages/package-management.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 2dedee3b8c..8ab5c72a64 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1773,7 +1773,7 @@ (define-public nar-herder
(list
 #:modules `(((guix build guile-build-system)
  #:select (target-guile-effective-version))
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
 #:imported-modules `((guix build guile-build-system)
  ,@%default-gnu-imported-modules)
 #:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 33/65] gnu: guile-dsv: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-dsv) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I216f8f05596fd9e836c5ab6b05d22593ce9d1b5c
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 2aa8370652..fac0fce394 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -753,7 +753,7 @@ (define-public guile-dsv
 (arguments
  `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases
-- 
2.41.0

bug#65924: [PATCH core-updates 12/65] gnu: dpkg: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/debian.scm (dpkg) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I5c5b087088abfe1ba14ba166d9a5071c20598058
---
 gnu/packages/debian.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 7f41dc8128..3c7d3304f0 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -355,7 +355,7 @@ (define-public dpkg
 (arguments
  (list #:modules
`((srfi srfi-71)
- ,@%default-gnu-imported-modules)
+ ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(add-before 'bootstrap 'patch-version
-- 
2.41.0

bug#65924: [PATCH core-updates 22/65] gnu: custom-gcc: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gcc.scm (custom-gcc) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I133daad4e05d5daa98fadd5acf2d0f4606b6e056
---
 gnu/packages/gcc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index fb8cd2d108..5d7f78d38a 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1042,7 +1042,7 @@ (define* (custom-gcc gcc name languages
 (properties (alist-delete 'hidden? (package-properties gcc)))
 (arguments
  (substitute-keyword-arguments (package-arguments gcc)
-   ((#:modules modules %default-gnu-imported-modules)
+   ((#:modules modules %default-gnu-modules)
 `(,@modules
   (srfi srfi-1)
   (srfi srfi-26)
-- 
2.41.0

bug#65924: [PATCH core-updates 39/65] gnu: guile-gitlab: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-gitlab) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Icef920ffd3e7363a6a6c789a63498c5ab19396f5
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 67d6601364..e207776899 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5315,7 +5315,7 @@ (define-public guile-gitlab
  `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 58/65] gnu: simh: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/simh.scm (simh) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I11a5cd3619ada3a280e990741b513f6c20a1713a
---
 gnu/packages/simh.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index 7be6d934de..b3ded715d8 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -53,7 +53,7 @@ (define-public simh
#:make-flags
#~(list (string-append "GCC=" #$(cc-for-target) " -fcommon"))
#:modules `((ice-9 string-fun)
-   ,@%default-gnu-imported-modules)
+   ,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
-- 
2.41.0

bug#65924: [PATCH core-updates 48/65] gnu: mumps: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/maths.scm (mumps) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I61e06ba8df29a833124940a1a4e55cb063c66e4b
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 62bbdc274a..2740bf7e5b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3894,7 +3894,7 @@ (define-public mumps
  `(#:modules ((ice-9 match)
   (ice-9 popen)
   (srfi srfi-1)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (replace 'configure
-- 
2.41.0

bug#65924: [PATCH core-updates 36/65] gnu: haunt: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (haunt) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I23433de93e07e390ca8ae155718692926633
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 0e6a4de52f..0f8d56a22d 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2813,7 +2813,7 @@ (define-public haunt
 (build-system gnu-build-system)
 (arguments
  `(#:modules ((ice-9 match) (ice-9 ftw)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:tests? #f ; test suite is non-deterministic :(
#:phases (modify-phases %standard-phases
   (add-after 'install 'wrap-haunt
-- 
2.41.0

bug#65924: [PATCH core-updates 49/65] gnu: hypre: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/maths.scm (hypre) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Iad7958af53360f83e7b04c5b6f8e2ccc8e87e27c
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 2740bf7e5b..b00b250081 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5883,7 +5883,7 @@ (define-public hypre
  (list openblas lapack))
 (arguments
  `(#:modules ((srfi srfi-1)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:configure-flags '("--enable-shared"
"--disable-fortran"
"--without-MPI"
-- 
2.41.0

bug#65924: [PATCH core-updates 44/65] gnu: mdadm-static: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/linux.scm (mdadm-static) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I785a8378bea7529488dc7b8851e83746e4debd96
---
 gnu/packages/linux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bc0f3ca38a..3f705aaea9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5636,7 +5636,7 @@ (define-public mdadm-static
 (for-each delete-file-recursively directories)
 (remove-store-references "sbin/mdadm")
 (delete-file "sbin/mdmon")))
-   ((#:modules modules %default-gnu-imported-modules)
+   ((#:modules modules %default-gnu-modules)
 `((ice-9 ftw) ,@modules))
((#:strip-flags _ '())
 ''("--strip-all"));strip a few extra KiB
-- 
2.41.0

bug#65924: [PATCH core-updates 54/65] gnu: ratpoison: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/ratpoison.scm (ratpoison) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I75acbee62734233a0f037837ecf83fa0ec1bc8f5
---
 gnu/packages/ratpoison.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index b39b679b7e..6c8915f06e 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -48,7 +48,7 @@ (define-public ratpoison
 (arguments
  (list
   #:modules `((ice-9 format)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   ;; Specify the absolute location of xterm, as the user experience sucks
   ;; when no terminal is available (can't consult help with 'C-t ?', for
   ;; example).
-- 
2.41.0

bug#65924: [PATCH core-updates 63/65] gnu: qemu: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/virtualization.scm (qemu) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I0d7274af400d9d24046ac6ab0466482c2690f2e5
---
 gnu/packages/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5398c8116c..f7bde3a344 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -237,7 +237,7 @@ (define-public qemu
   (srfi srfi-26)
   (ice-9 ftw)
   (ice-9 match)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   ;; Since we removed the bundled firmwares above, many tests
-- 
2.41.0

bug#65924: [PATCH core-updates 19/65] gnu: tsukundere: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/game-development.scm (tsukundere) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I57fcb0ef5ef418e5bc5f6c8466f2ff1c5ffc7b37
---
 gnu/packages/game-development.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 9d956359bd..69b5380598 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -649,7 +649,7 @@ (define-public tsukundere
   (srfi srfi-1)
   ((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 46/65] gnu: ghmm: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/machine-learning.scm (ghmm) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I317b9eb60afd63eeb4643556e94cb26a1162abb4
---
 gnu/packages/machine-learning.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/machine-learning.scm 
b/gnu/packages/machine-learning.scm
index 17b0c35f6a..7a9605bb3b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -282,7 +282,7 @@ (define-public ghmm
`(#:imported-modules (,@%default-gnu-imported-modules
  (guix build python-build-system))
  #:modules  ((guix build python-build-system)
- ,@%default-gnu-imported-modules)
+ ,@%default-gnu-modules)
  #:phases
  (modify-phases %standard-phases
(add-after 'unpack 'enter-dir
-- 
2.41.0

bug#65924: [PATCH core-updates 64/65] gnu: ganeti: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/virtualization.scm (ganeti) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I986d3713ed80116863eee30e0b4e3dd445eed59b
---
 gnu/packages/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f7bde3a344..bdbc523043 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -681,7 +681,7 @@ (define-public ganeti
  `(#:imported-modules (,@%default-gnu-imported-modules
(guix build haskell-build-system)
(guix build python-build-system))
-   #:modules (,@%default-gnu-imported-modules
+   #:modules (,@%default-gnu-modules
   ((guix build haskell-build-system) #:prefix haskell:)
   ((guix build python-build-system) #:select (site-packages))
   (srfi srfi-1)
-- 
2.41.0

bug#65924: [PATCH core-updates 62/65] gnu: ffmpeg-3.4: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/video.scm (ffmpeg-3.4) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I190d9fb3bc372e87ac7eec4c0b05fd3d0b4f5b12
---
 gnu/packages/video.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 90623edfc1..076d67f34f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1822,7 +1822,7 @@ (define-public ffmpeg-3.4
"1rijdvcx8xjqwh084qchwz91vcj8wsvb4diax0g8miywpir00ccw"
 (arguments
  (substitute-keyword-arguments (package-arguments ffmpeg-4)
-   ((#:modules modules %default-gnu-imported-modules)
+   ((#:modules modules %default-gnu-modules)
 `((srfi srfi-1)
   ,@modules))
((#:configure-flags flags)
-- 
2.41.0

bug#65924: [PATCH core-updates 28/65] gnu: icecat-minimal: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (icecat-minimal) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I178519f7f4199748294305b7094e17c7daec6622
---
 gnu/packages/gnuzilla.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 0e66605781..b31ee58c84 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -876,7 +876,7 @@ (define-public icecat-minimal
   (rnrs io ports)
   (guix elf)
   (guix build gremlin)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   (add-after 'unpack 'apply-guix-specific-patches
-- 
2.41.0

bug#65924: [PATCH core-updates 60/65] gnu: info-reader: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/texinfo.scm (info-reader) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I30e38d2282e19801ce865c6ba59c9e6b915e9b39
---
 gnu/packages/texinfo.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 2080f97f47..ab4583071e 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -230,7 +230,7 @@ (define-public info-reader
#:disallowed-references ,(assoc-ref (package-inputs texinfo)
"perl")
#:modules ((ice-9 ftw) (srfi srfi-1)
-  ,@%default-gnu-imported-modules)))
+  ,@%default-gnu-modules)))
 (synopsis "Standalone Info documentation reader")
 (inputs (modify-inputs (package-inputs texinfo)
   (prepend gzip)
-- 
2.41.0

bug#65924: [PATCH core-updates 45/65] gnu: ecryptfs-utils: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/linux.scm (ecryptfs-utils) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I02251b4b687f9308fb8ab446a66d3bf73bbdb3df
---
 gnu/packages/linux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3f705aaea9..1cb65a13f2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6994,7 +6994,7 @@ (define-public ecryptfs-utils
 (build-system gnu-build-system)
 (arguments
  `(#:configure-flags (list "--disable-pywrap")
-   #:modules (,@%default-gnu-imported-modules
+   #:modules (,@%default-gnu-modules
   (ice-9 binary-ports)
   (rnrs bytevectors)
   (srfi srfi-26))
-- 
2.41.0

bug#65924: [PATCH core-updates 37/65] gnu: guile-studio: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-studio) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I0c2cee834ec38b583169916bd5f6bc2e7d9a57f2
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 0f8d56a22d..60dda94be0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3098,7 +3098,7 @@ (define-public guile-studio
`(#:modules
  ((ice-9 match)
   (srfi srfi-1)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
  #:tests? #f; there are none
  #:make-flags
  (list (string-append "PICT_DIR="
-- 
2.41.0

bug#65924: [PATCH core-updates 42/65] gnu: jbigkit: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/image.scm (jbigkit) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Idbc9fc336409f73b784b111da61fc5bf957ecf52
---
 gnu/packages/image.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1967715bc4..f6e1e0cc01 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -882,7 +882,7 @@ (define-public jbigkit
 (outputs (list "out" "pbmtools"))
 (arguments
  `(#:modules ((srfi srfi-26)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (delete 'configure); no configure script
-- 
2.41.0

bug#65924: [PATCH core-updates 55/65] gnu: stklos: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/scheme.scm (stklos) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Iee99f93cfa5c7fa80694c2ad2ce6f93ccc0c44bf
---
 gnu/packages/scheme.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index eee39a55a5..93fdb6d7c2 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -1252,7 +1252,7 @@ (define-public stklos
 (arguments
  (list
   #:modules `((ice-9 ftw)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   (add-before 'configure 'patch-sh-references
-- 
2.41.0

bug#65924: [PATCH core-updates 11/65] gnu: guile-curl: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/curl.scm (guile-curl) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I32afb143c4f747874d0e8dd1e53aee7481356ef1
---
 gnu/packages/curl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 5c8d88692e..59bebe29db 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -238,7 +238,7 @@ (define-public guile-curl
(arguments
 `(#:modules (((guix build guile-build-system)
   #:select (target-guile-effective-version))
- ,@%default-gnu-imported-modules)
+ ,@%default-gnu-modules)
   #:imported-modules ((guix build guile-build-system)
   ,@%default-gnu-imported-modules)
   #:configure-flags (list (string-append
-- 
2.41.0

bug#65924: [PATCH core-updates 23/65] gnu: gdb: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gdb.scm (gdb) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I0bf897af81c09ab7d00c1d06fb527633ed4c9bd8
---
 gnu/packages/gdb.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index eb90a01c53..23cf2ba791 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -64,7 +64,7 @@ (define-public gdb/pinned
  `(#:tests? #f  ;FIXME: 217 unexpected failures
#:out-of-source? #t
#:modules ((srfi srfi-1)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases (modify-phases %standard-phases
   (add-after 'unpack 'patch-paths
 (lambda* (#:key inputs #:allow-other-keys)
-- 
2.41.0

bug#65924: [PATCH core-updates 38/65] gnu: guile-libyaml: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-libyaml) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I4046a3f189564c2694b31b71379c10cee004915f
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 60dda94be0..67d6601364 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5127,7 +5127,7 @@ (define-public guile-libyaml
   (arguments
`(#:modules (((guix build guile-build-system)
  #:prefix guile:)
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
  #:imported-modules ((guix build guile-build-system)
  ,@%default-gnu-imported-modules)
  #:tests? #false ; there are none
-- 
2.41.0

bug#65924: [PATCH core-updates 30/65] gnu: python-graph-tool: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/graph.scm (python-graph-tool) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I9d0d70a386e1131250feb16ab23089c66f6dec8e
---
 gnu/packages/graph.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 9b558ae2cc..97ad8ed18c 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -638,7 +638,7 @@ (define-public python-graph-tool
 (arguments
  `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
-   #:modules (,@%default-gnu-imported-modules
+   #:modules (,@%default-gnu-modules
   ((guix build python-build-system) #:select (site-packages)))
#:configure-flags
(list (string-append "--with-boost="
-- 
2.41.0

bug#65924: [PATCH core-updates 51/65] gnu: guix-build-coordinator: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/package-management.scm (guix-build-oordinator) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Iceeb14b22359b626aa3b0712a3d701ed7211c4be
---
 gnu/packages/package-management.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 3bcb9a5867..2dedee3b8c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1529,7 +1529,7 @@ (define-public guix-build-coordinator
(list
 #:modules `(((guix build guile-build-system)
  #:select (target-guile-effective-version))
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
 #:imported-modules `((guix build guile-build-system)
  ,@%default-gnu-imported-modules)
 #:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 43/65] gnu: uftrace: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/instrumentation.scm (uftrace) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ic56ac45a2f8aa6a90cabe0810b08a02fdce2520a
---
 gnu/packages/instrumentation.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 45ce747f70..5404f7b714 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -572,7 +572,7 @@ (define-public uftrace
  (list
   #:modules
   `((ice-9 match)
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
   #:make-flags
   #~(list
  (string-append "CC=" #$(cc-for-target)))
-- 
2.41.0

bug#65924: [PATCH core-updates 20/65] gnu: gcc-4.9: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gcc.scm (gcc-4.9) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I8482661bd49a94adefc772fda0449023bdd5927e
---
 gnu/packages/gcc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index ffc7166349..8fbb0a2915 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -448,7 +448,7 @@ (define-public gcc-4.9
;; For native builds of GCC 4.9 and GCC 5, the C++ include path 
needs
;; to be adjusted so it does not interfere with GCC's own build 
processes.
(substitute-keyword-arguments (package-arguments parent)
- ((#:modules modules %default-gnu-imported-modules)
+ ((#:modules modules %default-gnu-modules)
   `((srfi srfi-1)
 ,@modules))
  ((#:phases phases)
-- 
2.41.0

bug#65924: [PATCH core-updates 41/65] gnu: rime-data: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/ibus.scm (rime-data) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ifb5a008b91908beb62566731f097c0616796b583
---
 gnu/packages/ibus.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index f2ca06a66e..e3dfeada3c 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -519,7 +519,7 @@ (define-public rime-data
 (build-system gnu-build-system)
 (arguments
  `(#:modules ((ice-9 match)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:tests? #f  ; no tests
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 24/65] gnu: genimage: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/genimage.scm (genimage) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I65a2e2b371ae9b6f822ba54d09ba6741e403432b
---
 gnu/packages/genimage.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index 94a85ce2e4..13f3dd67b0 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -61,7 +61,7 @@ (define-public genimage
   (arguments
`(#:modules
  ((ice-9 match)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
  #:phases
  (modify-phases %standard-phases
(add-after 'unpack 'guixify
-- 
2.41.0

bug#65924: [PATCH core-updates 56/65] gnu: python-sepolgen: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/selinux.scm (python-sepolgen) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I1383ff8bb77d07fa4ee05f8d670af00458ec78cb
---
 gnu/packages/selinux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 2405fccc8c..0d1a114cf5 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -258,7 +258,7 @@ (define-public python-sepolgen
 (name "python-sepolgen")
 (arguments
  (substitute-keyword-arguments (package-arguments libsepol)
-   ((#:modules _ #~%default-gnu-imported-modules)
+   ((#:modules _ #~%default-gnu-modules)
 '((srfi srfi-1)
   (guix build gnu-build-system)
   (guix build utils)))
-- 
2.41.0

bug#65924: [PATCH core-updates 65/65] gnu: criu: Import the correct set of modules.

[Maxim Cournoyer]

Partially fixes bug #66425.

* gnu/packages/virtualization.scm (criu) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Iec94d9eadd149d9a735965f78b432ad4e0d7c5dd
---
 gnu/packages/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index bdbc523043..f721147c28 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1753,7 +1753,7 @@ (define-public criu
 (search-input-file %build-inputs
"/bin/xmlto")))
#:modules ((ice-9 ftw)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (delete 'configure); no configure script
-- 
2.41.0

bug#65924: [PATCH core-updates 32/65] gnu: guilescript: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guilescript) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I87d29358c50194d4f4564c7b18924a52c12d6020
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b5bce7aff1..2aa8370652 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -284,7 +284,7 @@ (define-public guilescript
  `(#:make-flags '("GUILE_AUTO_COMPILE=0")
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases
-- 
2.41.0

bug#65924: [PATCH core-updates 61/65] gnu: git: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/version-control.scm (git) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I0e3c4990920c1d3de0d0afea41cb27723ac28da7
---
 gnu/packages/version-control.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 38efff4d7b..266b92b4b2 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -340,7 +340,7 @@ (define-public git
#:modules ((srfi srfi-1)
   (srfi srfi-26)
   ((guix build gnu-build-system) #:prefix gnu:)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  ,@(if (%current-target-system)
-- 
2.41.0

bug#65924: [PATCH core-updates 18/65] gnu: xdg-utils: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/freedesktop.scm (xdg-utils) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: If3131a88423d49ab688f397f59b9c8d760ac2ebc
---
 gnu/packages/freedesktop.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index e05720ab16..396865109c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -498,7 +498,7 @@ (define-public xdg-utils
  (list
   #:tests? #f   ;no check target
   #:modules `((srfi srfi-26)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
 (add-after 'unpack 'patch-hardcoded-paths
-- 
2.41.0

bug#65924: [PATCH core-updates 50/65] gnu: lingeling: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/maths.scm (lingeling) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I9293cf6798395d9c9cf3fde5adac5439d02884df
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b00b250081..8cd10a7ab3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7888,7 +7888,7 @@ (define-public lingeling
  (arguments
   (list #:test-target "test"
 #:modules `((ice-9 match)
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
 #:configure-flags #~(list "--aiger=.")
 #:phases
 #~(modify-phases %standard-phases
-- 
2.41.0

bug#65924: [PATCH core-updates 29/65] gnu: icedove-minimal: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (icedove-minimal) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I63c3789c620b11acbbf8db23ef416fc02cfdc00e
---
 gnu/packages/gnuzilla.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index b31ee58c84..cba62a4050 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1625,7 +1625,7 @@ (define-public icedove-minimal
   #:modules `((guix build utils)  ;find-files
   (sxml simple)
   (ice-9 regex)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   (add-after 'patch-source-shebangs 'patch-cargo-checksums
-- 
2.41.0

bug#65924: [PATCH core-updates 27/65] gnu: mozjs: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gnuzilla.scm (mozjs) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I2e5f210a95aa04ffeb3046b9bd5738cac13ce377
---
 gnu/packages/gnuzilla.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 3a3e477d7f..0e66605781 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -117,7 +117,7 @@ (define-public mozjs
  (list
   #:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
   #:modules `((guix build cargo-utils)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:test-target "check-jstests"
   #:configure-flags
   #~(list
-- 
2.41.0

bug#65924: [PATCH core-updates 40/65] gnu: guile-smc: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/guile-xyz.scm (guile-smc) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ifb649d6b1700556d5c4c263f8f90e023c8ab5d67
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e207776899..8acb81bd6c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5378,7 +5378,7 @@ (define-public guile-smc
  `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 25/65] gnu: gimp: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gimp.scm (gimp) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I6fbe2d8ee94c51673a527487ca6f83a6d17d1dd2
---
 gnu/packages/gimp.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 54fbcdcee8..86422d6272 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -304,7 +304,7 @@ (define-public gimp
  (list
   #:modules `((ice-9 popen)
   (ice-9 rdelim)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   (add-after 'unpack 'remove-gcc-reference
-- 
2.41.0

bug#65924: [PATCH core-updates 21/65] gnu: make-libstdc++: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gcc.scm (make-libstdc++) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I3fe29766f767765e966c189395f618b7779f1e0d
---
 gnu/packages/gcc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 8fbb0a2915..fb8cd2d108 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -901,7 +901,7 @@ (define-public (make-libstdc++ gcc)
   #:out-of-source? #t
   #:modules `((srfi srfi-1)
   (srfi srfi-26)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   #$@(if (version>=? (package-version gcc) "11")
-- 
2.41.0

bug#65924: [PATCH core-updates 26/65] gnu: pinentry-rofi: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/gnupg.scm (pinentry-rofi) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Id9191cbe2fc870e58a637043d09c09dcd6cf63b0
---
 gnu/packages/gnupg.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 80ffe2d1b8..0950cd4115 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -930,7 +930,7 @@ (define-public pinentry-rofi
  `(#:modules
((ice-9 match)
 (ice-9 ftw)
-,@%default-gnu-imported-modules)
+,@%default-gnu-modules)
#:phases
(modify-phases
%standard-phases
-- 
2.41.0

bug#65924: [PATCH core-updates 16/65] gnu: seabios-qemu: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/engineering.scm (seabios-qemu) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I83e0768198c81020245b9281c678733803824236
---
 gnu/packages/firmware.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 7734b3ef51..d853cd32cc 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -647,7 +647,7 @@ (define-public seabios-qemu
 (supported-systems %supported-systems)
 (arguments
  (substitute-keyword-arguments (package-arguments seabios)
-   ((#:modules modules %default-gnu-imported-modules)
+   ((#:modules modules %default-gnu-modules)
 `((ice-9 match)
   (ice-9 threads)
   ,@modules))
-- 
2.41.0

bug#65924: [PATCH core-updates 13/65] gnu: dezyne: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/dezyne.scm (dezyne) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I958d326f2907b2a4e07d0897b0e008224c125dc9
---
 gnu/packages/dezyne.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm
index dc2453b521..5e33f3d9b1 100644
--- a/gnu/packages/dezyne.scm
+++ b/gnu/packages/dezyne.scm
@@ -51,7 +51,7 @@ (define-public dezyne
 (arguments
  (list
   #:modules `((ice-9 popen)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:phases
   #~(modify-phases %standard-phases
   (add-before 'configure 'setenv
-- 
2.41.0

bug#65924: [PATCH core-updates 15/65] gnu: fasthenry: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/engineering.scm (fasthenry) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I8e49c7ae4d430a4f6531bfdcc7f36edacd2d0508
---
 gnu/packages/engineering.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index fe29a8a366..94df543fd2 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -686,7 +686,7 @@ (define-public fasthenry
#:parallel-build? #f
#:tests? #f ;; no tests-suite
#:modules ((srfi srfi-1)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (delete 'configure)
-- 
2.41.0

bug#65924: [PATCH core-updates 17/65] gnu: font-amiri: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/fonts.scm (font-amiri) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I12612a6257b626a0089798d9c1192cf2ef15d798
---
 gnu/packages/fonts.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f50c8e6a1d..1f5ac5b727 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -857,7 +857,7 @@ (define-public font-amiri
  (list
   #:imported-modules `(,@%default-gnu-imported-modules
(guix build font-build-system))
-  #:modules `(,@%default-gnu-imported-modules
+  #:modules `(,@%default-gnu-modules
   ((guix build font-build-system) #:prefix font:))
   #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source
-- 
2.41.0

bug#65924: [PATCH core-updates 14/65] gnu: fastcap: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/engineering.scm (fastcap) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Ia1b6bbb2b4fa28ac22e129c83bc9ad2043ff755f
---
 gnu/packages/engineering.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 365434fa2f..fe29a8a366 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -589,7 +589,7 @@ (define-public fastcap
#:parallel-build? #f
#:tests? #f ;; no tests-suite
#:modules ((srfi srfi-1)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
(modify-phases %standard-phases
  (add-after 'build 'make-doc
-- 
2.41.0

bug#65924: git searches coreutils and util-linux commands in PATH

[Maxim Cournoyer]

Hi,

Maxim Cournoyer  writes:

> This series introduces default variable bindings for the default
> gnu-build-system IMPORTED-MODULES and MODULES values.  The lack of a
> %default-gnu-modules caused enough confusion, as made apparent by this series.
>
> Maxim Cournoyer (65):

Nevermind the above mis-sent series; it should have been sent to a new
issue.  Apologies for the noise!  Your review on 'git searches
coreutils and util-linux commands in PATH' in this series is still
needed, though :-)

-- 
Thanks,
Maxim

bug#65924: [PATCH core-updates 09/65] gnu: epson-inkjet-printer-escpr: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/cups.scm (epson-inkjet-printer-escpr) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I1066d14e8000e0edf90f0d66886de0505018efb8
---
 gnu/packages/cups.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index e43215d726..af15372a00 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -880,7 +880,7 @@ (define-public epson-inkjet-printer-escpr
 (arguments
  (list #:modules
`((srfi srfi-26)
- ,@%default-gnu-imported-modules)
+ ,@%default-gnu-modules)
#:configure-flags
#~(list "--disable-static"
(string-append "--prefix=" #$output)
-- 
2.41.0

bug#65924: [PATCH core-updates 07/65] gnu: boost: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/boost.scm (boost) [arguments] : Replace
%default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Idb491a2b7cae3a52783a2c92b78b362de0adf49e
---
 gnu/packages/boost.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index e8fc1503de..0f2da3fb83 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -115,7 +115,7 @@ (define-public boost
   #:imported-modules `((guix build python-build-system)
,@%default-gnu-imported-modules)
   #:modules `(((guix build python-build-system) #:select (python-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
   #:tests? #f
   #:configure-flags
   #~(let ((icu (dirname (dirname (search-input-file
-- 
2.41.0

bug#65924: [PATCH core-updates 08/65] gnu: gcc-final: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/commencement.scm (gcc-final) [arguments] : Replace
%default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I581dd9cb1ee2cc1747982b4a34277b80fa1cc0f7
---
 gnu/packages/commencement.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 421f3fe050..3a96e24a48 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3236,7 +3236,7 @@ (define gcc-final
   ;; Additional modules for the libstdc++ phase below.
   #:modules `((srfi srfi-1)
   (srfi srfi-26)
-  ,@%default-gnu-imported-modules)
+  ,@%default-imported-modules)
 
   (substitute-keyword-arguments (package-arguments gcc)
 ((#:make-flags flags)
-- 
2.41.0

bug#65924: [PATCH core-updates 10/65] gnu: splix: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/cups.scm (splix) [arguments]
: Replace %default-gnu-imported-modules with %default-gnu-modules.

Change-Id: Id510a57db2bd6cabb3fcbd0d1dd6c55ed65b6219
---
 gnu/packages/cups.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index af15372a00..12fd26e7ba 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -941,7 +941,7 @@ (define-public splix
   (arguments
`(#:modules
  ((srfi srfi-26)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
  #:make-flags
  (list (string-append "CUPSDRV="
   (assoc-ref %outputs "out") "/share/cups/drv")
-- 
2.41.0

bug#65924: [PATCH core-updates 05/65] gnu: fio: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/benchmark.scm (fio) [arguments] : Replace
%default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I95d0115b139f9cd2c61c6b2f47ae7a266490245f
---
 gnu/packages/benchmark.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 89f65a5205..feb6786e71 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -90,7 +90,7 @@ (define-public fio
 (build-system gnu-build-system)
 (arguments
  (list #:modules
-   `(,@%default-gnu-imported-modules
+   `(,@%default-gnu-modules
  (ice-9 textual-ports))
#:test-target "test"
#:configure-flags
-- 
2.41.0

bug#65924: [PATCH core-updates 04/65] gnu: dirvish: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/backup.scm (dirvish) [arguments] : Replace
%default-gnu-imported-modules with %default-gnu-modules.  Delete trailing #t.

Change-Id: I041a65441055a21f141bb7ea4a563e2624cd783c
---
 gnu/packages/backup.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 63b6055c5e..aa2eb11c64 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -813,7 +813,7 @@ (define-public dirvish
 "1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb"
 (arguments
  `(#:modules ((ice-9 match) (ice-9 rdelim)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:phases
;; This mostly mirrors the steps taken in the install.sh that ships
;; with dirvish, but simplified because we aren't prompting 
interactively
@@ -889,8 +889,7 @@ (define-public dirvish
;; Write out executables
(for-each write-pl executables)
;; Write out man pages
-   (for-each write-man man-pages)
-   #t))
+   (for-each write-man man-pages)))
 (inputs
  (list perl rsync perl-libtime-period perl-libtime-parsedate))
 (home-page "http://dirvish.org/;)
-- 
2.41.0

bug#65924: [PATCH core-updates 03/65] gnu: acl: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/acl.scm (acl) [arguments] : Replace
%default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I9514a3d8d9ece9ca54ccb457bac415bb1fa99692
---
 gnu/packages/acl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index 6d78847680..bc37572252 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -52,7 +52,7 @@ (define-public acl
 (build-system gnu-build-system)
 (arguments
  `(#:modules ((ice-9 ftw)
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:configure-flags '("--disable-static")
#:tests? ,(not (or (%current-target-system)
   (target-hurd?)))
-- 
2.41.0

bug#65924: [PATCH core-updates 06/65] gnu: ccwl: Import the correct set of modules.

[Maxim Cournoyer]

* gnu/packages/bioinformatics.scm (ccwl) [arguments] : Replace
%default-gnu-imported-modules with %default-gnu-modules.

Change-Id: I9c96e847de537b11bc8396d6c0e7968a1a9f3e98
---
 gnu/packages/bioinformatics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 27a3bff63e..2e85df174b 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -20421,7 +20421,7 @@ (define-public ccwl
  `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
-  ,@%default-gnu-imported-modules)
+  ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
,@%default-gnu-imported-modules)
#:phases
-- 
2.41.0

bug#65924: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t.

[Maxim Cournoyer]

* gnu/packages/acl.scm (acl): Remove labels and trailing #t.

Change-Id: I01b3d697da78ae1294b76d1073dbfd0ffe37fe31
---
 gnu/packages/acl.scm | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index 3e97332243..6d78847680 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -66,13 +66,11 @@ (define-public acl
(ftw "." (lambda (file stat flag)
   (unless (<= early-1980 (stat:mtime stat))
 (utime file early-1980 early-1980))
-  #t))
-   #t)))
+  #t)
  (add-after 'build 'patch-exec-bin-sh
(lambda _
  (substitute* "test/run"
-   (("/bin/sh") (which "sh")))
- #t))
+   (("/bin/sh") (which "sh")
  (add-before 'check 'patch-tests
(lambda _
  ;; The coreutils do not have an ACL bit to remove from their
@@ -84,12 +82,9 @@ (define-public acl
  (substitute* "Makefile.in"
((".*test/misc\\.test.*") "")
((".*test/cp\\.test.*") "")
-   ((".*test/setfacl-X\\.test.*") ""))
- #t)
+   ((".*test/setfacl-X\\.test.*") "")))
 (inputs (list attr))
-(native-inputs
- `(("gettext" ,gettext-minimal)
-   ("perl" ,perl)))
+(native-inputs (list gettext-minimal perl))
 (home-page "https://savannah.nongnu.org/projects/acl;)
 (synopsis
  "Library and tools for manipulating access control lists")
-- 
2.41.0

bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules.

[Maxim Cournoyer]

This series introduces default variable bindings for the default
gnu-build-system IMPORTED-MODULES and MODULES values.  The lack of a
%default-gnu-modules caused enough confusion, as made apparent by this series.

Maxim Cournoyer (65):
  build-systems: gnu: Export %default-gnu-imported-modules and
%default-gnu-modules.
  gnu: acl: Remove labels and trailing #t.
  gnu: acl: Import the correct set of modules.
  gnu: dirvish: Import the correct set of modules.
  gnu: fio: Import the correct set of modules.
  gnu: ccwl: Import the correct set of modules.
  gnu: boost: Import the correct set of modules.
  gnu: gcc-final: Import the correct set of modules.
  gnu: epson-inkjet-printer-escpr: Import the correct set of modules.
  gnu: splix: Import the correct set of modules.
  gnu: guile-curl: Import the correct set of modules.
  gnu: dpkg: Import the correct set of modules.
  gnu: dezyne: Import the correct set of modules.
  gnu: fastcap: Import the correct set of modules.
  gnu: fasthenry: Import the correct set of modules.
  gnu: seabios-qemu: Import the correct set of modules.
  gnu: font-amiri: Import the correct set of modules.
  gnu: xdg-utils: Import the correct set of modules.
  gnu: tsukundere: Import the correct set of modules.
  gnu: gcc-4.9: Import the correct set of modules.
  gnu: make-libstdc++: Import the correct set of modules.
  gnu: custom-gcc: Import the correct set of modules.
  gnu: gdb: Import the correct set of modules.
  gnu: genimage: Import the correct set of modules.
  gnu: gimp: Import the correct set of modules.
  gnu: pinentry-rofi: Import the correct set of modules.
  gnu: mozjs: Import the correct set of modules.
  gnu: icecat-minimal: Import the correct set of modules.
  gnu: icedove-minimal: Import the correct set of modules.
  gnu: python-graph-tool: Import the correct set of modules.
  gnu: artanis: Import the correct set of modules.
  gnu: guilescript: Import the correct set of modules.
  gnu: guile-dsv: Import the correct set of modules.
  gnu: guile-di: Import the correct set of modules.
  gnu: guile-hall: Import the correct set of modules.
  gnu: haunt: Import the correct set of modules.
  gnu: guile-studio: Import the correct set of modules.
  gnu: guile-libyaml: Import the correct set of modules.
  gnu: guile-gitlab: Import the correct set of modules.
  gnu: guile-smc: Import the correct set of modules.
  gnu: rime-data: Import the correct set of modules.
  gnu: jbigkit: Import the correct set of modules.
  gnu: uftrace: Import the correct set of modules.
  gnu: mdadm-static: Import the correct set of modules.
  gnu: ecryptfs-utils: Import the correct set of modules.
  gnu: ghmm: Import the correct set of modules.
  gnu: %gcc-static: Import the correct set of modules.
  gnu: mumps: Import the correct set of modules.
  gnu: hypre: Import the correct set of modules.
  gnu: lingeling: Import the correct set of modules.
  gnu: guix-build-coordinator: Import the correct set of modules.
  gnu: nar-herder: Import the correct set of modules.
  gnu: python-sip-4: Import the correct set of modules.
  gnu: ratpoison: Import the correct set of modules.
  gnu: stklos: Import the correct set of modules.
  gnu: python-sepolgen: Import the correct set of modules.
  gnu: boxes: Import the correct set of modules.
  gnu: simh: Import the correct set of modules.
  gnu: stb: Import the correct set of modules.
  gnu: info-reader: Import the correct set of modules.
  gnu: git: Import the correct set of modules.
  gnu: ffmpeg-3.4: Import the correct set of modules.
  gnu: qemu: Import the correct set of modules.
  gnu: ganeti: Import the correct set of modules.
  gnu: criu: Import the correct set of modules.

 gnu/packages/acl.scm| 15 
 gnu/packages/axoloti.scm|  4 +--
 gnu/packages/backup.scm |  5 ++--
 gnu/packages/base.scm   |  2 +-
 gnu/packages/benchmark.scm  |  2 +-
 gnu/packages/bioinformatics.scm |  4 +--
 gnu/packages/boost.scm  |  4 +--
 gnu/packages/bootloaders.scm|  6 ++---
 gnu/packages/bqn.scm|  2 +-
 gnu/packages/commencement.scm   |  8 +++---
 gnu/packages/cpp.scm|  2 +-
 gnu/packages/cross-base.scm |  2 +-
 gnu/packages/cups.scm   |  6 ++---
 gnu/packages/curl.scm   |  4 +--
 gnu/packages/debian.scm |  2 +-
 gnu/packages/dezyne.scm |  2 +-
 gnu/packages/dictionaries.scm   |  2 +-
 gnu/packages/djvu.scm   |  4 +--
 gnu/packages/docker.scm |  2 +-
 gnu/packages/emacs-xyz.scm  | 20 +++
 gnu/packages/emulators.scm  |  2 +-
 gnu/packages/engineering.scm|  4 +--
 gnu/packages/esolangs.scm   |  2 +-
 gnu/packages/firmware.scm   |  2 +-
 gnu/packages/fonts.scm  |  4 +--
 gnu/packages/freedesktop.scm|  2 +-
 gnu/packages/game-development.scm   |  4 +--
 gnu/packages/gcc.scm|  6 ++---

bug#66027: [PATCH v2] build: Add a commit-msg hook that embeds Change-Id in commit messages.

[Maxim Cournoyer]

Partially implements .

This will make it possible to track a merged commit back to its original
posting on the mailing list, and open the door to new opportunities such as
closing fully merged series automatically.

* Makefile.am (COMMIT_MSG_MAGIC): New variable.
(.git/hooks/commit-msg): New target.
* etc/git/commit-msg: New file.
* doc/contributing.texi (Configuring Git): Document Change-Id.

Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6
---
Changes in v2:
* Guard against nonexistant .git/hooks/commit-msg.d in commit-msg hook

 Makefile.am   | 12 +-
 doc/contributing.texi | 10 -
 etc/git/commit-msg| 94 +++
 3 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100755 etc/git/commit-msg

diff --git a/Makefile.am b/Makefile.am
index 310a231259..b860af7258 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1172,7 +1172,17 @@ cuirass-jobs: $(GOBJECTS)
git config --add include.path ../etc/git/gitconfig; \
fi
 
-nodist_noinst_DATA = .git/hooks/pre-push .git/config
+COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
+.git/hooks/commit-msg: etc/git/commit-msg
+   $(AM_V_at)if test -d .git; then \
+   if test -f $@  && ! grep -qF $(COMMIT_MSG_MAGIC) $@; then \
+ mkdir -p $@.d && mv $@ $@.d && \
+   @ echo user commit-msg hook moved to $@.d/commit-msg; \
+   fi; \
+   cp etc/git/commit-msg $@; \
+   fi
+
+nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg
 
 # Downloading up-to-date PO files.
 
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 864190b119..778bfb8fe6 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1575,8 +1575,16 @@ Configuring Git
 use @command{git config --local}, or edit @file{.git/config} in the
 repository instead of @file{~/.gitconfig}.
 
+@cindex commit-msg hook
 Other important Git configuration will automatically be configured when
-building the project (@pxref{Building from Git}).
+building the project (@pxref{Building from Git}).  A
+@file{.git/hooks/commit-msg} hook will be installed that embeds
+@samp{Change-Id} Git @emph{trailers} in your commit messages for
+traceability purposes.  It is important to preserve these when editing
+your commit messages, particularly if a first version of your proposed
+changes was already published.  If you have a @file{commit-msg} hook of
+your own you would like to use with Guix, you can place it under the
+@file{.git/hooks/commit-msg.d/} directory.
 
 @node Sending a Patch Series
 @subsection Sending a Patch Series
diff --git a/etc/git/commit-msg b/etc/git/commit-msg
new file mode 100755
index 00..dfa07918bb
--- /dev/null
+++ b/etc/git/commit-msg
@@ -0,0 +1,94 @@
+#!/bin/sh
+# From Gerrit Code Review 3.6.1
+#
+# Part of Gerrit Code Review (https://www.gerritcodereview.com/)
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### Guix modifications start
+COMMIT_MSG_MAGIC=VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
+top=$(git rev-parse --show-toplevel)
+if test -d "$top/.git/hooks/commit-msg.d/"; then
+for msg_hook in "$top/.git/hooks/commit-msg.d/"*; do
+if ! sh "$msg_hook"; then
+echo "error while running $msg_hook"
+exit 1
+fi
+done
+fi
+### Guix modifications end
+
+set -u
+
+# avoid [[ which is not POSIX sh.
+if test "$#" != 1 ; then
+  echo "$0 requires an argument."
+  exit 1
+fi
+
+if test ! -f "$1" ; then
+  echo "file does not exist: $1"
+  exit 1
+fi
+
+# Do not create a change id if requested
+if test "false" = "$(git config --bool --get gerrit.createChangeId)" ; then
+  exit 0
+fi
+
+if git rev-parse --verify HEAD >/dev/null 2>&1; then
+  refhash="$(git rev-parse HEAD)"
+else
+  refhash="$(git hash-object -t tree /dev/null)"
+fi
+
+random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | git 
hash-object --stdin)
+dest="$1.tmp.${random}"
+
+trap 'rm -f "${dest}"' EXIT
+
+if ! git stripspace --strip-comments < "$1" > "${dest}" ; then
+   echo "cannot strip comments from $1"
+   exit 1
+fi
+
+if test ! -s "${dest}" ; then
+  echo "file is empty: $1"
+  exit 1
+fi
+
+reviewurl="$(git config --get gerrit.reviewUrl)"
+if test -n "${reviewurl}" ; then
+  if ! git interpret-trailers --parse < "$1" | grep -q 
'^Link:.*/id/I[0-9a-f]\{40\}$' ; then
+if ! git interpret-trailers \
+  

bug#65924: git searches coreutils and util-linux commands in PATH

[Maxim Cournoyer]

Hi Liliana :-)

Liliana Marie Prikler  writes:

> Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer:
>> It's simpler to add features on top of a minimal variant than to
>> remove them, and helps avoiding mistakenly changing git-minimal,
>> which has many dependents.
>> 
>> * gnu/packages/version-control.scm (git-minimal): Move above git and
>> severe inheritance.  Remove input label.  Repatriate most fields
>> from...
>> (git): ... here.  Define as package/inherit to inherit from git-
>> minimal.
>> Extend minimal values instead of overriding them whole.
>> ---
> Having done the same to Emacs recently, I fully agree with this move.

Great; does this mean a LGTM on your side for this one?  Please be
explicit :-).

-- 
Thanks,
Maxim

bug#66358: Some options are really subcommands + ignore arguments

[Tobias Geerinckx-Rice via Bug reports for GNU Guix]

retitle 66358 Some options are really subcommands + ignore arguments
thanks

Today, we learn that ‘ and ’ are non-free:


Processing commands for cont...@debbugs.gnu.org:

retitle 66358 ‘guix archive --{authorize,import,…}’ are really
Failed to set the title of 66358: Non-printable characters are not 
allowed in bug titles.


All are bugs, bugs are all.

Kind regards,

T G-R

Sent from a Web browser.  Excuse or enjoy my brevity.

bug#66358: Can't import package using archive command

[Tobias Geerinckx-Rice via Bug reports for GNU Guix]

retitle 66358 ‘guix archive --{authorize,import,…}’ are really 
subcommands + ignore some arguments

thanks

Hi Daniel,

The error is correct, so I sure hope it's reproducible!

Later options cancel out previous ones, so your ‘--authorize’ action 
takes precedence over ‘--import’.  You're passing it a binary .nar 
archive as a private key (which is an s-expression).


Boom.

Instead:

  1.  guix archive --export hello > hello.nar
  2.  guix archive --authorize < export-host.private-key
  3.  guix archive --import < hello.nar

Note that you had an extra ‘hello’ in your --import command as well.  
Please note that it does nothing.  Option parsing in Guix is 
surprisingly lax.


I started thinking about a nice way to make ‘--action’ options mutually 
exclusive, but reconsidered.  I think it would violate POLA if not 
POSIX.


I think it would be less surprising if these ‘single, mutually exclusive 
actions’ should always be (sub)subcommands, e.g., ‘guix archive import’, 
‘guix archive authorize’, …


I don't know if that change is still worth making here.

Kind regards,

T G-R

Sent from a Web browser.  Excuse or enjoy my brevity.

bug#66358: Can't import package using archive command

[Perry, Daniel J]

  1.  guix archive --export hello > hello.nar
  2.  guix archive --import --authorize hello < hello.nar

This gives a fatal error on my machine (Debian on wsl) and was reproduced on 
Guix proper my a member of the IRC chat.

bug#66419: Incorrect handling of -L flag on guix system commands

[Sergio Pastor Pérez]

Good morning.

I've noticed that in system configurations split into different modules,
when using the -L flag, the `guix system build` command incorrectly
issues some errors. The error is ignored and the system is built
successfully.

For example, given a base system and 2 systems that inherit from it, the
error appears when building any of them:
--8<---cut here---start->8---
λ ls
base-system.scm  bordercollie.scm  sheepbook.scm
--8<---cut here---end--->8---

base-system.scm:
--8<---cut here---start->8---
(define-module (base-system)
  #:use-module (gnu))
...
(define-public %base-system
  (operating-system
   ...))
--8<---cut here---end--->8---

bordercollie.scm:
--8<---cut here---start->8---
(define-module (bordercollie)
  #:use-module (base-system)
  ...)
(operating-system
  (inherit %base-system)
  ...)
--8<---cut here---end--->8---

sheepbook.scm:
--8<---cut here---start->8---
(define-module (sheepbook)
  #:use-module (base-system)
  ...)
(operating-system
  (inherit %base-system)
  ...)
--8<---cut here---end--->8---

--8<---cut here---start->8---
λ guix system build -L . bordercollie.scm 
error: %useful-gnome-extensions: unbound variable
hint: Did you forget `(use-modules (base-system))'?

/gnu/store/gf21yc9ii1cfd3ki9hnn8ac5d65923ir-system
--8<---cut here---end--->8---

As you can see this command has built successfully. Note that in this
particular case the error says that the unbound variable is
`%useful-gnome-extensions'. It will complain always about the first
think it encounters.

On the other hand relying on the `GUILE_LOAD_PATH', instead of using the
'-L' flag, removes the error:
--8<---cut here---start->8---
λ GUILE_LOAD_PATH=$(pwd):$GUILE_LOAD_PATH guix system build bordercollie.scm
/gnu/store/gf21yc9ii1cfd3ki9hnn8ac5d65923ir-system
--8<---cut here---end--->8---

I've noticed that for the error to appear, there has to be 2 systems
inheriting from the `base-system` module. If I remove `bordercollie.scm`
or `sheepbook.scm`, the other will build without issuing the error.

Regards,
Sergio.

bug#66380: Derivation pb with curl on aarch64-linux

[Pierre Ramet]

Please find the following backtrace obtained on Debian virtual machine aarch64 
(from a Mac M1 host) :

> Mise à jour du canal « guix » depuis le dépôt Git « 
> https://git.savannah.gnu.org/git/guix.git »...
> Construction depuis ce canal :
>   guix  https://git.savannah.gnu.org/git/guix.git a7e6b4c
> construction de /gnu/store/m819aix1w6b6x1dki7fhnizmy45fipw9-curl-8.3.0a.drv...
> | phase « check »Backtrace:
>   13 (primitive-load 
> "/gnu/store/vkq82wvbd65sqjpa6zm1q7gs6hwm5wcb-compute-guix-derivation")
> In ice-9/eval.scm:
> 155:9 12 (_ _)
> 159:9 11 (_ #(#(#(#(#(#(#(#(#(#(#(#(#(#(#(#(# ?) ?) 
> ?) ?) ?) ?) ?) ?) ?) ?) ?) ?) ?) ?) ?) ?))
> In ice-9/boot-9.scm:
> 152:2 10 (with-fluid* _ _ _)
> 152:2  9 (with-fluid* _ _ _)
> In ./guix/store.scm:
>   2168:24  8 (run-with-store # _ 
> #:guile-for-build _ #:system _ #:target _)
>1996:8  7 (_ _)
> In ./guix/gexp.scm:
>299:22  6 (_ _)
>1180:2  5 (_ _)
>1046:2  4 (_ _)
> 892:4  3 (_ _)
> In ./guix/store.scm:
>   2053:12  2 (_ #)
>1401:5  1 (map/accumulate-builds # 
> # ?)
>   1417:15  0 (_ # _ _)
> 
> ./guix/store.scm:1417:15: ERROR:
>   1. :
>   message: "build of 
> `/gnu/store/m819aix1w6b6x1dki7fhnizmy45fipw9-curl-8.3.0a.drv' failed"
>   status: 100
> guix pull: error: You found a bug: the program 
> '/gnu/store/vkq82wvbd65sqjpa6zm1q7gs6hwm5wcb-compute-guix-derivation'
> failed to compute the derivation for Guix (version: 
> "a7e6b4c98b97921ab695218f9b89be4f1ded48c9"; system: "aarch64-linux";
> host version: "1.3.0"; pull-version: 1).
> Please report the COMPLETE output above by email to .


Best,
Pierre.

-
Pierre RametLaBRI, INRIA, CNRS
Email: ra...@labri.fr   Universite Bordeaux
Fax: +33 5 24 57 40 38  351 cours de la Liberation
Tel: +33 5 24 57 40 39  33405 Talence Cedex, France
Url: http://www.labri.fr/~ramet
-

bug#34152: awesome crashes on reload

[Bradley Haggerty]

On Wed Oct 4, 2023 at 1:29 PM CDT, Simon Tournier wrote:
> Hi,
>
> Sorry, it seems this report #34152 [1] ell into the cracks.
>
> 1: https://issues.guix.gnu.org/issue/34152
>
> On Mon, 21 Jan 2019 at 06:26, Bradley Haggerty  wrote:
> > When trying to reload awesome window manager in-place, it restarts X and 
> > sends me back to the graphical login. It's
> > only supposed to flash for a second and not even kill any programs. 
> > Sometimes I'm able to see something like "login
> > command failed" printed on the screen.
> >
> > To recreate this, install the "awesome" package, log in to it, and either 
> > press control-super-r or open the menu in the top
> > left and go to awesome -> restart.
> >
> > guix version:
> > guix (GNU Guix) 1c17adbc7957d024158948a853f4fbc22e52a0f6
>
> Is it still the case for you?
>
>
> Cheers,
> simon

I've since moved to Sway and am planning to stick with Wayland. I don't
recall the issue ever being fixed while I was still using awesomewm, but
not sure if it works now. Should be easy enough to test if someone was
interested. I'm fine with this being closed since I'm no longer using
awesomewm.