* bug#65924: git searches coreutils and util-linux commands in PATH
@ 2023-09-13 18:00 Maxim Cournoyer
2023-09-13 22:27 ` Simon Tournier
` (3 more replies)
0 siblings, 4 replies; 106+ messages in thread
From: Maxim Cournoyer @ 2023-09-13 18:00 UTC (permalink / raw)
To: 65924
Hello,
Attempting to use git-minimal in a --pure environment, I stumbled upon:
--8<---------------cut here---------------start------------->8---
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 7: basename: command not found
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 7: sed: command not found
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: line 77: basename: command not found
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: line 77: sed: command not found
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: line 292: uname: command not found
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 613: sed: command not found
/gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 613: cmd_: command not found
☒ git clone exited 127
--8<---------------cut here---------------end--------------->8---
The 'git' command should be wrapped to include these in its PATH.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 106+ messages in thread* bug#65924: git searches coreutils and util-linux commands in PATH 2023-09-13 18:00 bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer @ 2023-09-13 22:27 ` Simon Tournier 2023-09-14 3:14 ` Maxim Cournoyer 2023-10-04 16:14 ` Ludovic Courtès ` (2 subsequent siblings) 3 siblings, 1 reply; 106+ messages in thread From: Simon Tournier @ 2023-09-13 22:27 UTC (permalink / raw) To: Maxim Cournoyer, 65924 Hi Maxim, On Wed, 13 Sep 2023 at 14:00, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: > The 'git' command should be wrapped to include these in its PATH. --8<---------------cut here---------------start------------->8--- $ guix size git-minimal [...] total: 147.8 MiB $ guix size git-minimal util-linux coreutils [...] total: 195.4 MiB --8<---------------cut here---------------end--------------->8--- It increases the size by 33% which is not nothing. :-) Is it only the subcommand git-submodule which is broken? Probably not. --8<---------------cut here---------------start------------->8--- $ find $(guix build git-minimal --no-grafts) -type f -exec grep -H git-sh-setup {} \; | cut -f1 -d':' | xargs -I {} basename {} grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/scalar: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/git: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/scalar: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git: binary file matches git-submodule git-filter-branch git-merge-resolve git-mergetool git-merge-octopus git-merge-one-file git-web--browse git-web--browse git-quiltimport --8<---------------cut here---------------end--------------->8--- The question could be: is worth to add 33% for these commands? Cheers, simon ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-09-13 22:27 ` Simon Tournier @ 2023-09-14 3:14 ` Maxim Cournoyer 2023-09-14 6:12 ` Simon Tournier 0 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-09-14 3:14 UTC (permalink / raw) To: Simon Tournier; +Cc: 65924 Hi, Simon Tournier <zimon.toutoune@gmail.com> writes: > Hi Maxim, > > On Wed, 13 Sep 2023 at 14:00, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: > >> The 'git' command should be wrapped to include these in its PATH. > > $ guix size git-minimal > [...] > total: 147.8 MiB > > $ guix size git-minimal util-linux coreutils > [...] > total: 195.4 MiB > > > It increases the size by 33% which is not nothing. :-) > > Is it only the subcommand git-submodule which is broken? Probably not. > > $ find $(guix build git-minimal --no-grafts) -type f -exec grep -H git-sh-setup {} \; | cut -f1 -d':' | xargs -I {} basename {} > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/scalar: binary file matches > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/git: binary file matches > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/scalar: binary file matches > grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git: binary file matches > git-submodule > git-filter-branch > git-merge-resolve > git-mergetool > git-merge-octopus > git-merge-one-file > git-web--browse > git-web--browse > git-quiltimport > > The question could be: is worth to add 33% for these commands? I'm not sure where uname is needed; we'd have to check. util-linux is where most of the weigh increase is at. 'git submodule' is part of git-minimal; it should work without external tools, ideally. References are also found in bin/git in your search, which suggests perhaps the size of git-minimal is a "lie" (the core package is not fully functional). -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-09-14 3:14 ` Maxim Cournoyer @ 2023-09-14 6:12 ` Simon Tournier 0 siblings, 0 replies; 106+ messages in thread From: Simon Tournier @ 2023-09-14 6:12 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924 Hi, On Thu, 14 Sept 2023 at 05:14, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: > > $ guix size git-minimal > > [...] > > total: 147.8 MiB > > > > $ guix size git-minimal util-linux coreutils > > [...] > > total: 195.4 MiB > > > > It increases the size by 33% which is not nothing. :-) [...] > > The question could be: is worth to add 33% for these commands? [...] > References are also found in bin/git in your search, which suggests > perhaps the size of git-minimal is a "lie" (the core package is not > fully functional). Only coreutils is about 165.1 MiB so 12% which is better than 33% but not nothing either; especially if git-mininal becomes an hard dependency of Guix (as proposed in e.g. patch##65866 [1]). Another fix could be that git-minimal does not provide the "git submodule" subcommand for example; or other ones. I have not considered that yet and I am not plainly proposing that; somehow I would like to avoid to have a git-minimal that would not be really "minimal" for features that are not minimalist :-) Cheers, simon 1: [bug#65866] [PATCH 0/8] Add built-in builder for Git checkouts Ludovic Courtès <ludo@gnu.org> Mon, 11 Sep 2023 16:23:42 +0200 id:cover.1694441830.git.ludo@gnu.org https://issues.guix.gnu.org//65866 https://issues.guix.gnu.org/msgid/cover.1694441830.git.ludo@gnu.org https://yhetil.org/guix/cover.1694441830.git.ludo@gnu.org ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-09-13 18:00 bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer 2023-09-13 22:27 ` Simon Tournier @ 2023-10-04 16:14 ` Ludovic Courtès 2023-10-04 16:52 ` Simon Tournier 2023-10-05 3:41 ` Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer 3 siblings, 2 replies; 106+ messages in thread From: Ludovic Courtès @ 2023-10-04 16:14 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924 Hi, Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > Attempting to use git-minimal in a --pure environment, I stumbled upon: > > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 7: basename: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 7: sed: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: line 77: basename: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: line 77: sed: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: line 292: uname: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 613: sed: command not found > /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: line 613: cmd_: command not found > ☒ git clone exited 127 > > The 'git' command should be wrapped to include these in its PATH. I think we should add coreutils-minimal and sed (or gash-utils?) to the ‘git-submodule’ wrapper that already exists. Closure size is a concern, as Simon notes. Longer-term we should make coreutils-minimal more minimal, perhaps by stripping it of l10n data. But first: let’s fix this so we can address <https://issues.guix.gnu.org/66305>. Ludo’. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-04 16:14 ` Ludovic Courtès @ 2023-10-04 16:52 ` Simon Tournier 2023-10-05 3:41 ` Maxim Cournoyer 1 sibling, 0 replies; 106+ messages in thread From: Simon Tournier @ 2023-10-04 16:52 UTC (permalink / raw) To: Ludovic Courtès, Maxim Cournoyer; +Cc: 65924 Hi, On Wed, 04 Oct 2023 at 18:14, Ludovic Courtès <ludo@gnu.org> wrote: > I think we should add coreutils-minimal and sed (or gash-utils?) to the > ‘git-submodule’ wrapper that already exists. Yes, for now it is seems the way forward for fixing the current #66305. It is an increase of git-minimal about ~12%. > Closure size is a concern, as Simon notes. Longer-term we should make > coreutils-minimal more minimal, perhaps by stripping it of l10n data. About gash-utils, well currently broken so… https://ci.guix.gnu.org/build/2072492/details And it would drag Guile in the picture, no? And ’sed’ seems an order more minimalist than Guile, no? For sure, more git-minimal is, happier people will be. Cheers, simon ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-04 16:14 ` Ludovic Courtès 2023-10-04 16:52 ` Simon Tournier @ 2023-10-05 3:41 ` Maxim Cournoyer 2023-10-05 16:21 ` Simon Tournier 1 sibling, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-05 3:41 UTC (permalink / raw) To: Ludovic Courtès; +Cc: 65924 Hi Ludovic, Ludovic Courtès <ludo@gnu.org> writes: > Hi, > > Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > >> Attempting to use git-minimal in a --pure environment, I stumbled upon: >> >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: >> line 7: basename: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: >> line 7: sed: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: >> line 77: basename: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: >> line 77: sed: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-sh-setup: >> line 292: uname: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: >> line 613: sed: command not found >> /gnu/store/grc79ijx09nygvjh67cpk3g405nzr801-profile/libexec/git-core/git-submodule: >> line 613: cmd_: command not found >> ☒ git clone exited 127 >> >> The 'git' command should be wrapped to include these in its PATH. > > I think we should add coreutils-minimal and sed (or gash-utils?) to the > ‘git-submodule’ wrapper that already exists. That should work for the use case at hand, but we should scan the source for occurrences of the tools to see if other git commands need to be wrapped as well. This doesn't also cover 'uname' from my report, which should be looked into as well (when is it needed? is it a fatal error if it's missing? etc.) -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-05 3:41 ` Maxim Cournoyer @ 2023-10-05 16:21 ` Simon Tournier 0 siblings, 0 replies; 106+ messages in thread From: Simon Tournier @ 2023-10-05 16:21 UTC (permalink / raw) To: Maxim Cournoyer, Ludovic Courtès; +Cc: 65924 Hi, On Wed, 04 Oct 2023 at 23:41, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote: >> I think we should add coreutils-minimal and sed (or gash-utils?) to the >> ‘git-submodule’ wrapper that already exists. > > That should work for the use case at hand, but we should scan the source > for occurrences of the tools to see if other git commands need to be > wrapped as well. This doesn't also cover 'uname' from my report, which > should be looked into as well (when is it needed? is it a fatal error if > it's missing? etc.) Well, ’git-submodule’ is just a shell script. It depends on: + basename + sed + git-sh-setup which depends on: + basename + sed + uname And all these other subcommands match ’git-sh-setup’: Binary: + bin/git + bin/scalar + libexec/git-core/git + libexec/git-core/scalar Scripts: + libexec/git-core/git-filter-branch + libexec/git-core/git-merge-octopus + libexec/git-core/git-merge-one-file + libexec/git-core/git-merge-resolve + libexec/git-core/git-mergetool + libexec/git-core/git-quiltimport + libexec/git-core/git-submodule + libexec/git-core/git-web--browse + libexec/git-core/git-web--browse For instance, libexec/git-core/git-mergetools/emerge or libexec/git-core/git-mergetools/tortoisemerge depends on ’basename’. This ’git-sh-setup’ is dragged into the picture by the file ’command-list.h’ which basically provides some help. See below. Last, I think ’git-sh-setup’ fails if ’uname’ is missing. Cheers, simon --8<---------------cut here---------------start------------->8--- # From Git checkout $ cat git-submodule | grep -n -E '(basename|sed|uname)' 7:dashless=$(basename "$0" | sed -e 's/-/ /') 569:# parsed here as well, for backward compatibility. 613:"cmd_$(echo $command | sed -e s/-/_/g)" "$@" $ cat git-sh-setup | grep -n -E '(basename|sed|uname)' 77: dashless=$(basename -- "$0" | sed -e 's/-/ /') 181: die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")" 188: die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")" 230:# Generate a sed script to parse identities from a commit. 264:# Create a pick-script as above and feed it to sed. Stdout is suitable for 267: LANG=C LC_ALL=C sed -ne "$(pick_ident_script "$@")" 292:case $(uname -s) in $ find $(guix build git-minimal --no-grafts) -type f -exec grep -nH git-sh-setup {} \; | sort grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/git: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/bin/scalar: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git: binary file matches grep: /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/scalar: binary file matches /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-filter-branch:109:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-merge-octopus:8:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-merge-one-file:26:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-merge-resolve:8:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-mergetool:17:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-quiltimport:14:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-submodule:22:. git-sh-setup /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-web--browse:22:# the vanilla git-sh-setup should not be used. /gnu/store/y3vdq2pdkljrw63xxnc2vb6lz07ycar6-git-minimal-2.41.0/libexec/git-core/git-web--browse:24:. git-sh-setup $ find . -type f -name "*.[ch]" -exec grep -nH git-sh-setup {} \; ./command-list.h:171: { "git-sh-setup", N_("Common Git shell script setup code"), 0 | CAT_purehelpers }, $ find . -type f -name "*.o" -exec grep -nH git-sh-setup {} \; grep: ./help.o: binary file matches $ grep git-sh-setup git grep: git: binary file matches $ grep -B 5 -A 10 -n uname $(guix build git-minimal --no-grafts)/libexec/git-core/git-sh-setup 287- expr $sz0 \< $sz1 \* 2 >/dev/null || : >"$1" 288-} 289- 290- 291-# Platform specific tweaks to work around some commands 292:case $(uname -s) in 293-*MINGW*) 294- # Windows has its own (incompatible) sort and find 295- sort () { 296- /usr/bin/sort "$@" 297- } 298- find () { 299- /usr/bin/find "$@" 300- } 301- # git sees Windows-style pwd 302- pwd () { --8<---------------cut here---------------end--------------->8--- ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments. 2023-09-13 18:00 bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer 2023-09-13 22:27 ` Simon Tournier 2023-10-04 16:14 ` Ludovic Courtès @ 2023-10-08 3:18 ` Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps Maxim Cournoyer ` (2 more replies) 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer 3 siblings, 3 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-08 3:18 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès Can be tested with something like: $ ./pre-inst-env guix shell -CN nss-certs git-minimal -- \ git clone --recursive https://git.jami.net/savoirfairelinux/jami-client-qt.git /tmp/jami Maxim Cournoyer (3): gnu: git: Remove labels and use gexps. gnu: git: Invert inheritance relationship. gnu: git-minimal: Add coreutils and sed to PATH. gnu/packages/version-control.scm | 884 ++++++++++++++++--------------- 1 file changed, 466 insertions(+), 418 deletions(-) base-commit: c2b224658ccb52b4541c79016cec55a47aef32fc -- 2.41.0 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments Maxim Cournoyer @ 2023-10-08 3:18 ` Maxim Cournoyer 2023-10-08 7:09 ` Liliana Marie Prikler 2023-10-14 16:51 ` Ludovic Courtès 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH Maxim Cournoyer 2 siblings, 2 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-08 3:18 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès * gnu/packages/version-control.scm (git) [native-inputs, inputs]: Remove labels. [arguments]: Use gexps. Use gexp variables input searching procedures where it makes sense. --- gnu/packages/version-control.scm | 706 ++++++++++++++++--------------- 1 file changed, 360 insertions(+), 346 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d9c53af71c..7a3c17efd8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -230,358 +230,373 @@ (define git-cross-configure-flags (define-public git (package - (name "git") - (version "2.41.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://kernel.org/software/scm/git/git-" - version ".tar.xz")) - (sha256 - (base32 - "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) - (build-system gnu-build-system) - (native-inputs - `(("native-perl" ,perl) - ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, - ;; see <https://bugs.gnu.org/39513>. - ("bash" ,bash-minimal) - ("bash-for-tests" ,bash) - ("gettext" ,gettext-minimal) - ;; To build the man pages from the git sources, we would need a dependency - ;; on a full XML tool chain, and building it actually takes ages. So we - ;; use this lazy approach and use released tarball. - ("git-manpages" - ,(origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/git-manpages-" - version ".tar.xz")) - (sha256 - (base32 - "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))) - ;; For subtree documentation. - ("asciidoc" ,asciidoc) - ("docbook2x" ,docbook2x) - ("docbook-xsl" ,docbook-xsl) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ("xmlto" ,xmlto))) - (inputs - `(("curl" ,curl) - ("expat" ,expat) - ("openssl" ,openssl) - ("perl" ,perl) - ("python" ,python) ; for git-p4 - ("zlib" ,zlib) - - ;; For PCRE support in git grep (USE_LIBPCRE2). - ("pcre" ,pcre2) - - ;; For 'gitweb.cgi'. - ("perl-cgi" ,perl-cgi) - - ;; For 'git-svn'. - ("subversion" ,subversion) - ("perl-term-readkey" ,perl-term-readkey) - - ;; For 'git-send-email'. - ("perl-authen-sasl" ,perl-authen-sasl) - ("perl-net-smtp-ssl" ,perl-net-smtp-ssl) - ("perl-io-socket-ssl" ,perl-io-socket-ssl) - - ;; For 'git gui', 'gitk', and 'git citool'. - ("tcl" ,tcl) - ("tk" ,tk) - - ;; For 'git-credential-libsecret' - ("glib" ,glib) - ("libsecret" ,libsecret))) - (outputs '("out" ; the core - "send-email" ; for git-send-email - "svn" ; git-svn - "credential-netrc" ; git-credential-netrc - "credential-libsecret" ; git-credential-libsecret - "subtree" ; git-subtree - "gui")) ; gitk, git gui - (arguments - `(#:make-flags `("V=1" ;more verbose compilation + (name "git") + (version "2.41.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/software/scm/git/git-" + version ".tar.xz")) + (sha256 + (base32 + "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) + (build-system gnu-build-system) + (native-inputs + (list perl + ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, + ;; see <https://bugs.gnu.org/39513>. + bash-minimal + bash + gettext-minimal + ;; For subtree documentation. + asciidoc + docbook2x + docbook-xsl + libxslt + pkg-config + texinfo + xmlto)) + (inputs + (list curl + expat + openssl + perl + python ;for git-p4 + zlib - ,(string-append "SHELL_PATH=" - (assoc-ref %build-inputs "bash") - "/bin/sh") + ;; For PCRE support in git grep (USE_LIBPCRE2). + pcre2 - ;; Tests require a bash with completion support. - ,(string-append "TEST_SHELL_PATH=" - (assoc-ref %build-inputs "bash-for-tests") - "/bin/bash") + ;; For 'gitweb.cgi'. + perl-cgi - "USE_LIBPCRE2=yes" + ;; For 'git-svn'. + subversion + perl-term-readkey + + ;; For 'git-send-email'. + perl-authen-sasl + perl-net-smtp-ssl + perl-io-socket-ssl + + ;; For 'git gui', 'gitk', and 'git citool'. + tcl + tk + + ;; For 'git-credential-libsecret' + glib + libsecret)) + (outputs '("out" ;the core + "send-email" ;for git-send-email + "svn" ;git-svn + "credential-netrc" ;git-credential-netrc + "credential-libsecret" ;git-credential-libsecret + "subtree" ;git-subtree + "gui")) ;gitk, git gui + (arguments + (list + #:make-flags + #~(list "V=1" ;more verbose compilation + (string-append "SHELL_PATH=" + #$(this-package-native-input "bash-minimal") + "/bin/sh") - ;; By default 'make install' creates hard links for - ;; things in 'libexec/git-core', which leads to huge - ;; nars; see <https://bugs.gnu.org/21949>. - "NO_INSTALL_HARDLINKS=indeed") + ;; Tests require a bash with completion support. + (string-append "TEST_SHELL_PATH=" + #$(this-package-native-input "bash") + "/bin/bash") - ;; Make sure the full bash does not end up in the final closure. - #:disallowed-references (,bash) + "USE_LIBPCRE2=yes" - #:test-target "test" + ;; By default 'make install' creates hard links for + ;; things in 'libexec/git-core', which leads to huge + ;; nars; see <https://bugs.gnu.org/21949>. + "NO_INSTALL_HARDLINKS=indeed") + + ;; Make sure the full bash does not end up in the final closure. + #:disallowed-references (list bash) - ;; The explicit --with-tcltk forces the build system to hardcode the - ;; absolute file name to 'wish'. - #:configure-flags (list (string-append "--with-tcltk=" - (assoc-ref %build-inputs "tk") - "/bin/wish8.6") ; XXX - ,@(if (%current-target-system) - git-cross-configure-flags - '())) + #:test-target "test" - #:modules ((srfi srfi-1) + ;; The explicit --with-tcltk forces the build system to hardcode the + ;; absolute file name to 'wish'. + #:configure-flags + #~(list (string-append "--with-tcltk=" + (search-input-file %build-inputs + "bin/wish8.6")) + #$@(if (%current-target-system) + git-cross-configure-flags + #~())) + + #:modules `((srfi srfi-1) (srfi srfi-26) ((guix build gnu-build-system) #:prefix gnu:) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - ,@(if (%current-target-system) - ;; The git build system assumes build == host - `((add-after 'unpack 'use-host-uname_S - (lambda _ - (substitute* "config.mak.uname" - (("uname_S := .*" all) - (if (equal? ,(%current-target-system) "i586-pc-gnu") - "uname_S := GNU\n" - all)))))) - ;; We do not have bash-for-tests when cross-compiling. - `((add-after 'unpack 'modify-PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((path (string-split (getenv "PATH") #\:)) - (bash-full (assoc-ref inputs "bash-for-tests"))) - ;; Drop the test bash from PATH so that (which "sh") and - ;; similar does the right thing. - (setenv "PATH" (string-join - (remove (cut string-prefix? bash-full <>) path) - ":"))))))) - ;; Add cross curl-config script to PATH when cross-compiling. - ,@(if (%current-target-system) - '((add-before 'configure 'add-cross-curl-config - (lambda* (#:key inputs #:allow-other-keys) - (setenv "PATH" - (string-append (assoc-ref inputs "curl") "/bin:" - (getenv "PATH")))))) - '()) - (add-after 'configure 'patch-makefiles - (lambda _ - (substitute* "Makefile" - (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python3"))))) - (add-after 'configure 'add-PM.stamp - (lambda _ - ;; Add the "PM.stamp" to avoid "no rule to make target". - (call-with-output-file "perl/PM.stamp" (const #t)))) - (add-after 'build 'build-subtree - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "contrib/subtree" - (substitute* "Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitution. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") - (string-append "$(XMLTO) -x " - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)) - "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) - (invoke "make") - (invoke "make" "install") - (invoke "make" "install-doc") - (substitute* "git-subtree" - (("/bin/sh") (which "sh")))))) - (add-before 'check 'patch-tests - (lambda _ - (let ((store-directory (%store-directory))) - ;; These files contain some funny bytes that Guile is unable - ;; to decode for shebang patching. Just delete them. - (for-each delete-file '("t/t4201-shortlog.sh" - "t/t7813-grep-icase-iso.sh")) - ;; Many tests contain inline shell scripts (hooks etc). - (substitute* (find-files "t" "\\.sh$") - (("#!/bin/sh") (string-append "#!" (which "sh")))) - ;; Un-do shebang patching here to prevent checksum mismatch. - (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") - (("^#!.*/bin/perl") "#!/usr/bin/perl")) - (substitute* "t/t5003-archive-zip.sh" - (("cp /bin/sh") (string-append "cp " (which "sh")))) - (substitute* "t/t6030-bisect-porcelain.sh" - (("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))) - ;; FIXME: This test runs `git commit` with a bogus EDITOR - ;; and empty commit message, but does not fail the way it's - ;; expected to. The test passes when invoked interactively. - (substitute* "t/t7508-status.sh" - (("\tcommit_template_commented") "\ttrue")) - ;; More checksum mismatches due to odd shebangs. - (substitute* "t/t9100-git-svn-basic.sh" - (((string-append "\"#!" store-directory ".*/bin/sh")) "\"#!/bin/sh") ) - (substitute* "t/t9300-fast-import.sh" - (((string-append "\t#!" store-directory ".*/bin/sh")) "\t#!/bin/sh") - (((string-append "'#!" store-directory ".*/bin/sh")) "'#!/bin/sh")) - ;; FIXME: Some hooks fail with "basename: command not found". - ;; See 't/trash directory.t9164.../svn-hook.log'. - (delete-file "t/t9164-git-svn-dcommit-concurrent.sh") - - ;; XXX: These tests fail intermittently for unknown reasons: - ;; <https://bugs.gnu.org/29546>. - (for-each delete-file - '("t/t9128-git-svn-cmd-branch.sh" - "t/t9167-git-svn-cmd-branch-subproject.sh" - "t/t9141-git-svn-multiple-branches.sh"))))) - (add-after 'install 'install-info-manual - (lambda* (#:key parallel-build? #:allow-other-keys) - (define job-count (if parallel-build? - (number->string (parallel-job-count)) - "1")) - (invoke "make" "-C" "Documentation" "install-info" - "-j" job-count - ;; The Makefile refer to 'docbook2x-texi', but our binary - ;; is named 'docbook2texi'. - "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) - (add-after 'install 'install-shell-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (completions (string-append out "/etc/bash_completion.d"))) - ;; TODO: Install the tcsh and zsh completions in the right place. - (mkdir-p completions) - (copy-file "contrib/completion/git-completion.bash" - (string-append completions "/git"))))) - (add-after 'install 'install-credential-netrc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((netrc (assoc-ref outputs "credential-netrc"))) - (install-file "contrib/credential/netrc/git-credential-netrc.perl" - (string-append netrc "/bin")) - (rename-file (string-append netrc "/bin/git-credential-netrc.perl") - (string-append netrc "/bin/git-credential-netrc")) - ;; Previously, Git.pm was automatically found by netrc. - ;; Perl 5.26 changed how it locates modules so that @INC no - ;; longer includes the current working directory (the Perl - ;; community calls this "dotless @INC"). - (wrap-program (string-append netrc "/bin/git-credential-netrc") - `("PERL5LIB" ":" prefix - (,(string-append (assoc-ref outputs "out") "/share/perl5"))))))) - (add-after 'install 'install-credential-libsecret - (lambda* (#:key outputs #:allow-other-keys) - (let* ((libsecret (assoc-ref outputs "credential-libsecret"))) - (with-directory-excursion "contrib/credential/libsecret" - ((assoc-ref gnu:%standard-phases 'build)) - (install-file "git-credential-libsecret" - (string-append libsecret "/bin")))))) - (add-after 'install 'install-subtree - (lambda* (#:key outputs #:allow-other-keys) - (let ((subtree (assoc-ref outputs "subtree"))) - (install-file "contrib/subtree/git-subtree" - (string-append subtree "/bin")) - (install-file "contrib/subtree/git-subtree.1" - (string-append subtree "/share/man/man1"))))) - (add-after 'install 'restore-sample-hooks-shebang - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/share/git-core/templates/hooks"))) - (for-each (lambda (file) - (format #t "restoring shebang on `~a'~%" file) - (substitute* file - (("^#!.*/bin/sh") "#!/bin/sh"))) - (find-files dir ".*"))))) - (add-after 'install 'split - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Split the binaries to the various outputs. - (let* ((out (assoc-ref outputs "out")) - (se (assoc-ref outputs "send-email")) - (svn (assoc-ref outputs "svn")) - (gui (assoc-ref outputs "gui")) - (gitk (string-append out "/bin/gitk")) - (gitk* (string-append gui "/bin/gitk")) - (git-gui (string-append out "/libexec/git-core/git-gui")) - (git-gui* (string-append gui "/libexec/git-core/git-gui")) - (git-cit (string-append out "/libexec/git-core/git-citool")) - (git-cit* (string-append gui "/libexec/git-core/git-citool")) - (git-se (string-append out "/libexec/git-core/git-send-email")) - (git-se* (string-append se "/libexec/git-core/git-send-email")) - (git-svn (string-append out "/libexec/git-core/git-svn")) - (git-svn* (string-append svn "/libexec/git-core/git-svn")) - (git-sm (string-append out - "/libexec/git-core/git-submodule"))) - (mkdir-p (string-append gui "/bin")) - (mkdir-p (string-append gui "/libexec/git-core")) - (mkdir-p (string-append se "/libexec/git-core")) - (mkdir-p (string-append svn "/libexec/git-core")) - - (for-each (lambda (old new) - (copy-file old new) - (delete-file old) - (chmod new #o555)) - (list gitk git-gui git-cit git-se git-svn) - (list gitk* git-gui* git-cit* git-se* git-svn*)) - - ;; Tell 'git-svn' where Subversion and perl-term-readkey are. - (wrap-program git-svn* - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/bin"))) - `("PERL5LIB" ":" prefix - ,(map (lambda (i) (string-append (assoc-ref inputs i) - "/lib/perl5/site_perl")) - '("subversion" "perl-term-readkey"))) - - ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so - ;; help it find 'libsvn_client-1.so'. - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/lib")))) - - ;; Tell 'git-send-email' where perl modules are. - (wrap-program git-se* - `("PERL5LIB" ":" prefix - ,(map (lambda (o) (string-append o "/lib/perl5/site_perl")) - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (package-inputs this-package))) - '("perl-authen-sasl" - "perl-net-smtp-ssl" - "perl-io-socket-ssl"))))))) - - ;; Tell 'gitweb.cgi' where perl modules are. - (wrap-program (string-append out "/share/gitweb/gitweb.cgi") - `("PERL5LIB" ":" prefix - ,(map (lambda (o) (string-append o "/lib/perl5/site_perl")) - (list - ,@(transitive-input-references - 'inputs - (map (lambda (l) - (assoc l (package-inputs this-package))) - '("perl-cgi"))))))) - - ;; Tell 'git-submodule' where Perl is. - (wrap-program git-sm - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "perl") - "/bin"))))))) - (add-after 'split 'install-man-pages - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man")) - (manpages (assoc-ref inputs "git-manpages"))) - (mkdir-p man) - (with-directory-excursion man - (invoke "tar" "xvf" manpages))))) - ,@(if (system-hurd?) - '((add-after 'unpack 'delete-tests/hurd - (lambda _ - (delete-file "t/t0052-simple-ipc.sh") - (delete-file "t/t5562-http-backend-content-length.sh") - (delete-file "t/t9902-completion.sh")))) - '())))) + #:phases + #~(modify-phases %standard-phases + #$@(if (%current-target-system) + ;; The git build system assumes build == host + #~((add-after 'unpack 'use-host-uname_S + (lambda _ + (substitute* "config.mak.uname" + (("uname_S := .*" all) + (if (equal? #$(%current-target-system) "i586-pc-gnu") + "uname_S := GNU\n" + all)))))) + ;; We do not have a full bash when cross-compiling. + #~((add-after 'unpack 'modify-PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (string-split (getenv "PATH") #\:)) + (bash-full #$(this-package-native-input "bash"))) + ;; Drop the test bash from PATH so that (which "sh") + ;; and similar does the right thing. + (setenv "PATH" + (string-join + (remove (cut string-prefix? bash-full <>) + path) + ":"))))))) + ;; Add cross curl-config script to PATH when cross-compiling. + #$@(if (%current-target-system) + #~((add-before 'configure 'add-cross-curl-config + (lambda* (#:key inputs #:allow-other-keys) + (setenv "PATH" + (string-append + (dirname (search-input-file + inputs "bin/curl-config")) + ":" (getenv "PATH")))))) + #~()) + (add-after 'configure 'patch-makefiles + (lambda _ + (substitute* "Makefile" + (("/usr/bin/perl") (which "perl")) + (("/usr/bin/python") (which "python3"))))) + (add-after 'configure 'add-PM.stamp + (lambda _ + ;; Add the "PM.stamp" to avoid "no rule to make target". + (call-with-output-file "perl/PM.stamp" (const #t)))) + (add-after 'build 'build-subtree + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "contrib/subtree" + (substitute* "Makefile" + ;; Apparently `xmlto' does not bother to looks up the + ;; stylesheets specified in the XML, unlike the above + ;; substitution. Instead it uses a hard-coded URL. Work + ;; around it here, but if this is common perhaps we should + ;; hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") + (string-append "$(XMLTO) -x " + (search-input-directory + (or native-inputs inputs) + (string-append + "xml/xsl/docbook-xsl-" + #$(package-version docbook-xsl))) + "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) + (invoke "make") + (invoke "make" "install") + (invoke "make" "install-doc") + (substitute* "git-subtree" + (("/bin/sh") (which "sh")))))) + (add-before 'check 'patch-tests + (lambda _ + (let ((store-directory (%store-directory))) + ;; These files contain some funny bytes that Guile is unable + ;; to decode for shebang patching. Just delete them. + (for-each delete-file '("t/t4201-shortlog.sh" + "t/t7813-grep-icase-iso.sh")) + ;; Many tests contain inline shell scripts (hooks etc). + (substitute* (find-files "t" "\\.sh$") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + ;; Un-do shebang patching here to prevent checksum mismatch. + (substitute* '("t/t4034/perl/pre" "t/t4034/perl/post") + (("^#!.*/bin/perl") "#!/usr/bin/perl")) + (substitute* "t/t5003-archive-zip.sh" + (("cp /bin/sh") (string-append "cp " (which "sh")))) + (substitute* "t/t6030-bisect-porcelain.sh" + (("\"/bin/sh\"") (string-append "\"" (which "sh") "\""))) + ;; FIXME: This test runs `git commit` with a bogus EDITOR + ;; and empty commit message, but does not fail the way it's + ;; expected to. The test passes when invoked interactively. + (substitute* "t/t7508-status.sh" + (("\tcommit_template_commented") "\ttrue")) + ;; More checksum mismatches due to odd shebangs. + (substitute* "t/t9100-git-svn-basic.sh" + (((string-append "\"#!" store-directory ".*/bin/sh")) + "\"#!/bin/sh") ) + (substitute* "t/t9300-fast-import.sh" + (((string-append "\t#!" store-directory ".*/bin/sh")) + "\t#!/bin/sh") + (((string-append "'#!" store-directory ".*/bin/sh")) + "'#!/bin/sh")) + ;; FIXME: Some hooks fail with "basename: command not found". + ;; See 't/trash directory.t9164.../svn-hook.log'. + (delete-file "t/t9164-git-svn-dcommit-concurrent.sh") + + ;; XXX: These tests fail intermittently for unknown reasons: + ;; <https://bugs.gnu.org/29546>. + (for-each delete-file + '("t/t9128-git-svn-cmd-branch.sh" + "t/t9167-git-svn-cmd-branch-subproject.sh" + "t/t9141-git-svn-multiple-branches.sh"))))) + (add-after 'install 'install-info-manual + (lambda* (#:key parallel-build? #:allow-other-keys) + (define job-count (if parallel-build? + (number->string (parallel-job-count)) + "1")) + (invoke "make" "-C" "Documentation" "install-info" + "-j" job-count + ;; The Makefile refer to 'docbook2x-texi', but our binary + ;; is named 'docbook2texi'. + "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) + (add-after 'install 'install-shell-completion + (lambda _ + (let ((completions (string-append #$output + "/etc/bash_completion.d"))) + ;; TODO: Install the tcsh and zsh completions in the right + ;; place. + (mkdir-p completions) + (copy-file "contrib/completion/git-completion.bash" + (string-append completions "/git"))))) + (add-after 'install 'install-credential-netrc + (lambda _ + (install-file "contrib/credential/netrc/git-credential-netrc.perl" + (string-append #$output:credential-netrc "/bin")) + (rename-file (string-append #$output:credential-netrc + "/bin/git-credential-netrc.perl") + (string-append #$output:credential-netrc + "/bin/git-credential-netrc")) + ;; Previously, Git.pm was automatically found by netrc. + ;; Perl 5.26 changed how it locates modules so that @INC no + ;; longer includes the current working directory (the Perl + ;; community calls this "dotless @INC"). + (wrap-program (string-append #$output:credential-netrc + "/bin/git-credential-netrc") + `("PERL5LIB" ":" prefix + (,(string-append #$output "/share/perl5")))))) + (add-after 'install 'install-credential-libsecret + (lambda _ + (with-directory-excursion "contrib/credential/libsecret" + ((assoc-ref gnu:%standard-phases 'build)) + (install-file "git-credential-libsecret" + (string-append #$output:credential-libsecret + "/bin"))))) + (add-after 'install 'install-subtree + (lambda _ + (install-file "contrib/subtree/git-subtree" + (string-append #$output:subtree "/bin")) + (install-file "contrib/subtree/git-subtree.1" + (string-append #$output:subtree + "/share/man/man1")))) + (add-after 'install 'restore-sample-hooks-shebang + (lambda _ + (let* ((dir (string-append #$output + "/share/git-core/templates/hooks"))) + (for-each (lambda (file) + (format #t "restoring shebang on `~a'~%" file) + (substitute* file + (("^#!.*/bin/sh") "#!/bin/sh"))) + (find-files dir ".*"))))) + (add-after 'install 'split + (lambda* (#:key inputs #:allow-other-keys) + ;; Split the binaries to the various outputs. + (let* ((out #$output) + (se #$output:send-email) + (svn #$output:svn) + (gui #$output:gui) + (gitk (string-append out "/bin/gitk")) + (gitk* (string-append gui "/bin/gitk")) + (git-gui (string-append + out "/libexec/git-core/git-gui")) + (git-gui* (string-append gui "/libexec/git-core/git-gui")) + (git-cit (string-append + out "/libexec/git-core/git-citool")) + (git-cit* (string-append + gui "/libexec/git-core/git-citool")) + (git-se (string-append + out "/libexec/git-core/git-send-email")) + (git-se* (string-append + se "/libexec/git-core/git-send-email")) + (git-svn (string-append out "/libexec/git-core/git-svn")) + (git-svn* (string-append svn "/libexec/git-core/git-svn")) + (git-sm (string-append + out "/libexec/git-core/git-submodule"))) + (mkdir-p (string-append gui "/bin")) + (mkdir-p (string-append gui "/libexec/git-core")) + (mkdir-p (string-append se "/libexec/git-core")) + (mkdir-p (string-append svn "/libexec/git-core")) + + (for-each (lambda (old new) + (copy-file old new) + (delete-file old) + (chmod new #o555)) + (list gitk git-gui git-cit git-se git-svn) + (list gitk* git-gui* git-cit* git-se* git-svn*)) + + ;; Tell 'git-svn' where Subversion and perl-term-readkey are. + + ;; FIXME: Old school 'assoc-ref' is used to retrieve + ;; subversion here, as #$(this-package-input "subversion") + ;; causes a dependency cycle for unknown reasons. + (wrap-program git-svn* + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))) + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + (list (assoc-ref inputs "subversion") + #$(this-package-input "perl-term-readkey")))) + + ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so + ;; help it find 'libsvn_client-1.so'. + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "subversion") + "/lib")))) + + ;; Tell 'git-send-email' where perl modules are. + (wrap-program git-se* + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-authen-sasl") + (this-package-input "perl-net-smtp-ssl") + (this-package-input "perl-io-socket-ssl"))))))) + ;; Tell 'gitweb.cgi' where perl modules are. + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-cgi"))))))) + + ;; Tell 'git-submodule' where Perl is. + (wrap-program git-sm + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))))))) + (add-after 'split 'install-man-pages + (lambda _ + (let ((man (string-append #$output "/share/man"))) + (mkdir-p man) + (with-directory-excursion man + (invoke + "tar" "xvf" + #$(origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/" + "git-manpages-" version ".tar.xz")) + (sha256 + (base32 + "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))))))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'delete-tests/hurd + (lambda _ + (delete-file "t/t0052-simple-ipc.sh") + (delete-file "t/t5562-http-backend-content-length.sh") + (delete-file "t/t9902-completion.sh")))) + #~())))) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified @@ -641,9 +656,8 @@ (define-public git-minimal (delete 'install-credential-libsecret) (add-after 'install 'remove-unusable-perl-commands (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (libexec (string-append out "/libexec"))) + (let ((bin (string-append #$output "/bin")) + (libexec (string-append #$output "/libexec"))) (for-each (lambda (file) (delete-file (string-append libexec "/git-core/" file))) @@ -663,11 +677,11 @@ (define-public git-minimal ;; These templates typically depend on Perl. Remove them. (delete-file-recursively - (string-append out "/share/git-core/templates/hooks")) + (string-append #$output "/share/git-core/templates/hooks")) ;; Gitweb depends on Perl as well. (delete-file-recursively - (string-append out "/share/gitweb"))))))) + (string-append #$output "/share/gitweb"))))))) ((#:make-flags flags) #~(delete "USE_LIBPCRE2=yes" #$flags)) ((#:configure-flags flags) -- 2.41.0 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps Maxim Cournoyer @ 2023-10-08 7:09 ` Liliana Marie Prikler 2023-10-14 16:51 ` Ludovic Courtès 1 sibling, 0 replies; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-08 7:09 UTC (permalink / raw) To: Maxim Cournoyer, 65924 Am Samstag, dem 07.10.2023 um 23:18 -0400 schrieb Maxim Cournoyer: > * gnu/packages/version-control.scm (git) > [native-inputs, inputs]: Remove labels. > [arguments]: Use gexps. Use gexp variables input searching > procedures where it makes sense. > --- Heads-up, the additional completions I'm installing in 66171 will cause a merge conflict here (they need to go to core-updates due to git being git and git-minimal still changes accordingly on master). IIUC it should be easier to apply your changes first and then mine. IMHO, completions shouldn't go to git-minimal, but reading 2/3 (i.e. reading without applying) I'm not quite sure where they end up atm. Cheers ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps Maxim Cournoyer 2023-10-08 7:09 ` Liliana Marie Prikler @ 2023-10-14 16:51 ` Ludovic Courtès 2023-10-15 19:55 ` Maxim Cournoyer 1 sibling, 1 reply; 106+ messages in thread From: Ludovic Courtès @ 2023-10-14 16:51 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924, Simon Tournier Hi! Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > * gnu/packages/version-control.scm (git) > [native-inputs, inputs]: Remove labels. > [arguments]: Use gexps. Use gexp variables input searching procedures where > it makes sense. [...] > + ;; Tell 'git-send-email' where perl modules are. > + (wrap-program git-se* > + `("PERL5LIB" ":" prefix > + ,(search-path-as-list > + '("lib/perl5/site_perl") > + '#$(delete-duplicates > + (append-map > + (compose last package-transitive-propagated-inputs) > + (list (this-package-input "perl-authen-sasl") > + (this-package-input "perl-net-smtp-ssl") > + (this-package-input "perl-io-socket-ssl"))))))) > + ;; Tell 'gitweb.cgi' where perl modules are. > + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") > + `("PERL5LIB" ":" prefix > + ,(search-path-as-list > + '("lib/perl5/site_perl") > + '#$(delete-duplicates > + (append-map > + (compose last package-transitive-propagated-inputs) > + (list (this-package-input "perl-cgi"))))))) I wonder if this could be simplified, but I don’t have a good idea. Otherwise LGTM! Ludo’. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps. 2023-10-14 16:51 ` Ludovic Courtès @ 2023-10-15 19:55 ` Maxim Cournoyer 0 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-15 19:55 UTC (permalink / raw) To: Ludovic Courtès; +Cc: 65924, Simon Tournier Hi Ludovic, Ludovic Courtès <ludo@gnu.org> writes: > Hi! > > Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > >> * gnu/packages/version-control.scm (git) >> [native-inputs, inputs]: Remove labels. >> [arguments]: Use gexps. Use gexp variables input searching procedures where >> it makes sense. > > [...] > >> + ;; Tell 'git-send-email' where perl modules are. >> + (wrap-program git-se* >> + `("PERL5LIB" ":" prefix >> + ,(search-path-as-list >> + '("lib/perl5/site_perl") >> + '#$(delete-duplicates >> + (append-map >> + (compose last package-transitive-propagated-inputs) >> + (list (this-package-input "perl-authen-sasl") >> + (this-package-input "perl-net-smtp-ssl") >> + (this-package-input "perl-io-socket-ssl"))))))) >> + ;; Tell 'gitweb.cgi' where perl modules are. >> + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") >> + `("PERL5LIB" ":" prefix >> + ,(search-path-as-list >> + '("lib/perl5/site_perl") >> + '#$(delete-duplicates >> + (append-map >> + (compose last package-transitive-propagated-inputs) >> + (list (this-package-input "perl-cgi"))))))) > > I wonder if this could be simplified, but I don’t have a good idea. > > Otherwise LGTM! Thanks; this was merged some days ago to core-updates. We can still refine it though. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps Maxim Cournoyer @ 2023-10-08 3:18 ` Maxim Cournoyer 2023-10-08 7:03 ` Liliana Marie Prikler 2023-10-14 16:54 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Ludovic Courtès 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH Maxim Cournoyer 2 siblings, 2 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-08 3:18 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès 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. --- gnu/packages/version-control.scm | 603 +++++++++++++++---------------- 1 file changed, 292 insertions(+), 311 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7a3c17efd8..bc647d1538 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -224,13 +224,16 @@ (define-public bazaar (deprecated-package "bazaar" breezy)) (define git-cross-configure-flags - '("ac_cv_fread_reads_directories=yes" - "ac_cv_snprintf_returns_bogus=no" - "ac_cv_iconv_omits_bom=no")) + #~(list "ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no")) -(define-public git +;; The size of the closure of 'git-minimal' is two thirds that of 'git'. +;; Its test suite runs slightly faster and most importantly it doesn't +;; depend on packages that are expensive to build such as Subversion. +(define-public git-minimal (package - (name "git") + (name "git-minimal") (version "2.41.0") (source (origin (method url-fetch) @@ -240,60 +243,19 @@ (define-public git (base32 "0h40arw08xbpi2cbf7pvc947v963rjxz3inb2ar81zjc8byvlj77")))) (build-system gnu-build-system) - (native-inputs - (list perl - ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, - ;; see <https://bugs.gnu.org/39513>. - bash-minimal - bash - gettext-minimal - ;; For subtree documentation. - asciidoc - docbook2x - docbook-xsl - libxslt - pkg-config - texinfo - xmlto)) - (inputs - (list curl - expat - openssl - perl - python ;for git-p4 - zlib - - ;; For PCRE support in git grep (USE_LIBPCRE2). - pcre2 - - ;; For 'gitweb.cgi'. - perl-cgi - - ;; For 'git-svn'. - subversion - perl-term-readkey - - ;; For 'git-send-email'. - perl-authen-sasl - perl-net-smtp-ssl - perl-io-socket-ssl - - ;; For 'git gui', 'gitk', and 'git citool'. - tcl - tk - - ;; For 'git-credential-libsecret' - glib - libsecret)) - (outputs '("out" ;the core - "send-email" ;for git-send-email - "svn" ;git-svn - "credential-netrc" ;git-credential-netrc - "credential-libsecret" ;git-credential-libsecret - "subtree" ;git-subtree - "gui")) ;gitk, git gui (arguments (list + #:modules `((srfi srfi-1) + (srfi srfi-26) + ((guix build gnu-build-system) #:prefix gnu:) + ,@%gnu-build-system-modules) + ;; Make sure the full bash does not end up in the final closure. + #:disallowed-references (list bash perl) + #:test-target "test" + #:configure-flags + (if (%current-target-system) + git-cross-configure-flags + #~(list)) #:make-flags #~(list "V=1" ;more verbose compilation (string-append "SHELL_PATH=" @@ -305,32 +267,10 @@ (define-public git #$(this-package-native-input "bash") "/bin/bash") - "USE_LIBPCRE2=yes" - ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see <https://bugs.gnu.org/21949>. "NO_INSTALL_HARDLINKS=indeed") - - ;; Make sure the full bash does not end up in the final closure. - #:disallowed-references (list bash) - - #:test-target "test" - - ;; The explicit --with-tcltk forces the build system to hardcode the - ;; absolute file name to 'wish'. - #:configure-flags - #~(list (string-append "--with-tcltk=" - (search-input-file %build-inputs - "bin/wish8.6")) - #$@(if (%current-target-system) - git-cross-configure-flags - #~())) - - #:modules `((srfi srfi-1) - (srfi srfi-26) - ((guix build gnu-build-system) #:prefix gnu:) - ,@%gnu-build-system-modules) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -354,6 +294,13 @@ (define-public git (remove (cut string-prefix? bash-full <>) path) ":"))))))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'delete-tests/hurd + (lambda _ + (delete-file "t/t0052-simple-ipc.sh") + (delete-file "t/t5562-http-backend-content-length.sh") + (delete-file "t/t9902-completion.sh")))) + #~()) ;; Add cross curl-config script to PATH when cross-compiling. #$@(if (%current-target-system) #~((add-before 'configure 'add-cross-curl-config @@ -367,34 +314,11 @@ (define-public git (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" - (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python3"))))) + (("/usr/bin/perl") (which "perl"))))) (add-after 'configure 'add-PM.stamp (lambda _ ;; Add the "PM.stamp" to avoid "no rule to make target". (call-with-output-file "perl/PM.stamp" (const #t)))) - (add-after 'build 'build-subtree - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (with-directory-excursion "contrib/subtree" - (substitute* "Makefile" - ;; Apparently `xmlto' does not bother to looks up the - ;; stylesheets specified in the XML, unlike the above - ;; substitution. Instead it uses a hard-coded URL. Work - ;; around it here, but if this is common perhaps we should - ;; hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") - (string-append "$(XMLTO) -x " - (search-input-directory - (or native-inputs inputs) - (string-append - "xml/xsl/docbook-xsl-" - #$(package-version docbook-xsl))) - "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) - (invoke "make") - (invoke "make" "install") - (invoke "make" "install-doc") - (substitute* "git-subtree" - (("/bin/sh") (which "sh")))))) (add-before 'check 'patch-tests (lambda _ (let ((store-directory (%store-directory))) @@ -436,16 +360,6 @@ (define-public git '("t/t9128-git-svn-cmd-branch.sh" "t/t9167-git-svn-cmd-branch-subproject.sh" "t/t9141-git-svn-multiple-branches.sh"))))) - (add-after 'install 'install-info-manual - (lambda* (#:key parallel-build? #:allow-other-keys) - (define job-count (if parallel-build? - (number->string (parallel-job-count)) - "1")) - (invoke "make" "-C" "Documentation" "install-info" - "-j" job-count - ;; The Makefile refer to 'docbook2x-texi', but our binary - ;; is named 'docbook2texi'. - "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) (add-after 'install 'install-shell-completion (lambda _ (let ((completions (string-append #$output @@ -455,36 +369,34 @@ (define-public git (mkdir-p completions) (copy-file "contrib/completion/git-completion.bash" (string-append completions "/git"))))) - (add-after 'install 'install-credential-netrc - (lambda _ - (install-file "contrib/credential/netrc/git-credential-netrc.perl" - (string-append #$output:credential-netrc "/bin")) - (rename-file (string-append #$output:credential-netrc - "/bin/git-credential-netrc.perl") - (string-append #$output:credential-netrc - "/bin/git-credential-netrc")) - ;; Previously, Git.pm was automatically found by netrc. - ;; Perl 5.26 changed how it locates modules so that @INC no - ;; longer includes the current working directory (the Perl - ;; community calls this "dotless @INC"). - (wrap-program (string-append #$output:credential-netrc - "/bin/git-credential-netrc") - `("PERL5LIB" ":" prefix - (,(string-append #$output "/share/perl5")))))) - (add-after 'install 'install-credential-libsecret + (add-after 'install 'remove-unusable-perl-commands (lambda _ - (with-directory-excursion "contrib/credential/libsecret" - ((assoc-ref gnu:%standard-phases 'build)) - (install-file "git-credential-libsecret" - (string-append #$output:credential-libsecret - "/bin"))))) - (add-after 'install 'install-subtree - (lambda _ - (install-file "contrib/subtree/git-subtree" - (string-append #$output:subtree "/bin")) - (install-file "contrib/subtree/git-subtree.1" - (string-append #$output:subtree - "/share/man/man1")))) + (let ((bin (string-append #$output "/bin")) + (libexec (string-append #$output "/libexec"))) + (for-each (lambda (file) + (delete-file (string-append libexec + "/git-core/" file))) + '("git-svn" "git-cvsimport" "git-archimport" + "git-cvsserver" "git-request-pull" + + ;; git-add--interactive was removed in Git 2.40 but + ;; this phase is inherited by older versions. + #$@(if (version>=? (package-version this-package) + "2.40.1") + #~() + #~("git-add--interactive")) + + "git-cvsexportcommit" + "git-instaweb" "git-send-email")) + (delete-file (string-append bin "/git-cvsserver")) + + ;; These templates typically depend on Perl. Remove them. + (delete-file-recursively + (string-append #$output "/share/git-core/templates/hooks")) + + ;; Gitweb depends on Perl as well. + (delete-file-recursively + (string-append #$output "/share/gitweb"))))) (add-after 'install 'restore-sample-hooks-shebang (lambda _ (let* ((dir (string-append #$output @@ -493,111 +405,20 @@ (define-public git (format #t "restoring shebang on `~a'~%" file) (substitute* file (("^#!.*/bin/sh") "#!/bin/sh"))) - (find-files dir ".*"))))) - (add-after 'install 'split - (lambda* (#:key inputs #:allow-other-keys) - ;; Split the binaries to the various outputs. - (let* ((out #$output) - (se #$output:send-email) - (svn #$output:svn) - (gui #$output:gui) - (gitk (string-append out "/bin/gitk")) - (gitk* (string-append gui "/bin/gitk")) - (git-gui (string-append - out "/libexec/git-core/git-gui")) - (git-gui* (string-append gui "/libexec/git-core/git-gui")) - (git-cit (string-append - out "/libexec/git-core/git-citool")) - (git-cit* (string-append - gui "/libexec/git-core/git-citool")) - (git-se (string-append - out "/libexec/git-core/git-send-email")) - (git-se* (string-append - se "/libexec/git-core/git-send-email")) - (git-svn (string-append out "/libexec/git-core/git-svn")) - (git-svn* (string-append svn "/libexec/git-core/git-svn")) - (git-sm (string-append - out "/libexec/git-core/git-submodule"))) - (mkdir-p (string-append gui "/bin")) - (mkdir-p (string-append gui "/libexec/git-core")) - (mkdir-p (string-append se "/libexec/git-core")) - (mkdir-p (string-append svn "/libexec/git-core")) - - (for-each (lambda (old new) - (copy-file old new) - (delete-file old) - (chmod new #o555)) - (list gitk git-gui git-cit git-se git-svn) - (list gitk* git-gui* git-cit* git-se* git-svn*)) - - ;; Tell 'git-svn' where Subversion and perl-term-readkey are. - - ;; FIXME: Old school 'assoc-ref' is used to retrieve - ;; subversion here, as #$(this-package-input "subversion") - ;; causes a dependency cycle for unknown reasons. - (wrap-program git-svn* - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "bin/perl")))) - `("PERL5LIB" ":" prefix - ,(search-path-as-list - '("lib/perl5/site_perl") - (list (assoc-ref inputs "subversion") - #$(this-package-input "perl-term-readkey")))) - - ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so - ;; help it find 'libsvn_client-1.so'. - `("LD_LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "subversion") - "/lib")))) - - ;; Tell 'git-send-email' where perl modules are. - (wrap-program git-se* - `("PERL5LIB" ":" prefix - ,(search-path-as-list - '("lib/perl5/site_perl") - '#$(delete-duplicates - (append-map - (compose last package-transitive-propagated-inputs) - (list (this-package-input "perl-authen-sasl") - (this-package-input "perl-net-smtp-ssl") - (this-package-input "perl-io-socket-ssl"))))))) - ;; Tell 'gitweb.cgi' where perl modules are. - (wrap-program (string-append out "/share/gitweb/gitweb.cgi") - `("PERL5LIB" ":" prefix - ,(search-path-as-list - '("lib/perl5/site_perl") - '#$(delete-duplicates - (append-map - (compose last package-transitive-propagated-inputs) - (list (this-package-input "perl-cgi"))))))) - - ;; Tell 'git-submodule' where Perl is. - (wrap-program git-sm - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "bin/perl")))))))) - (add-after 'split 'install-man-pages - (lambda _ - (let ((man (string-append #$output "/share/man"))) - (mkdir-p man) - (with-directory-excursion man - (invoke - "tar" "xvf" - #$(origin - (method url-fetch) - (uri (string-append - "mirror://kernel.org/software/scm/git/" - "git-manpages-" version ".tar.xz")) - (sha256 - (base32 - "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))))))) - #$@(if (system-hurd?) - #~((add-after 'unpack 'delete-tests/hurd - (lambda _ - (delete-file "t/t0052-simple-ipc.sh") - (delete-file "t/t5562-http-backend-content-length.sh") - (delete-file "t/t9902-completion.sh")))) - #~())))) - + (find-files dir ".*")))))))) + (native-inputs + ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests, + ;; see <https://bugs.gnu.org/39513>. + (list bash-minimal + bash + gettext-minimal + perl)) + (inputs + (list curl ;for HTTP(S) access + expat ;for 'git push' over HTTP(S) + openssl + perl + zlib)) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified ;; with $GIT_SSL_CAINFO. @@ -610,7 +431,6 @@ (define-public git (variable "GIT_EXEC_PATH") (separator #f) ;single entry (files '("libexec/git-core"))))) - (synopsis "Distributed version control system") (description "Git is a free distributed version control system designed to handle @@ -632,76 +452,237 @@ (define-public git (license license:gpl2) (home-page "https://git-scm.com/"))) -(define-public git-minimal - ;; The size of the closure of 'git-minimal' is two thirds that of 'git'. - ;; Its test suite runs slightly faster and most importantly it doesn't - ;; depend on packages that are expensive to build such as Subversion. - (package - (inherit git) - (name "git-minimal") +(define-public git + (package/inherit git-minimal + (name "git") + (outputs '("out" ;the core + "send-email" ;for git-send-email + "svn" ;git-svn + "credential-netrc" ;git-credential-netrc + "credential-libsecret" ;git-credential-libsecret + "subtree" ;git-subtree + "gui")) ;gitk, git gui (arguments - (substitute-keyword-arguments (package-arguments git) - ((#:phases phases) + (substitute-keyword-arguments (package-arguments git-minimal) + ((#:disallowed-references disallowed-refs ''()) + (delete perl disallowed-refs)) + ((#:make-flags flags #~'()) + #~(cons "USE_LIBPCRE2=yes" #$flags)) + ((#:configure-flags flags #~'()) + ;; The explicit --with-tcltk forces the build system to hardcode the + ;; absolute file name to 'wish'. + #~(cons (string-append "--with-tcltk=" + (search-input-file %build-inputs + "bin/wish8.6")) + #$flags)) + ((#:phases phases '%standard-phases) #~(modify-phases #$phases + (delete 'remove-unusable-perl-commands) (replace 'patch-makefiles (lambda _ (substitute* "Makefile" - (("/usr/bin/perl") (which "perl"))))) - (delete 'build-subtree) - (delete 'split) - (delete 'install-man-pages) - (delete 'install-info-manual) - (delete 'install-subtree) - (delete 'install-credential-netrc) - (delete 'install-credential-libsecret) - (add-after 'install 'remove-unusable-perl-commands - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append #$output "/bin")) - (libexec (string-append #$output "/libexec"))) - (for-each (lambda (file) - (delete-file (string-append libexec - "/git-core/" file))) - '("git-svn" "git-cvsimport" "git-archimport" - "git-cvsserver" "git-request-pull" - - ;; git-add--interactive was removed in Git 2.40 but - ;; this phase is inherited by older versions. - #$@(if (version>=? (package-version this-package) - "2.40.1") - #~() - #~("git-add--interactive")) - - "git-cvsexportcommit" - "git-instaweb" "git-send-email")) - (delete-file (string-append bin "/git-cvsserver")) - - ;; These templates typically depend on Perl. Remove them. - (delete-file-recursively - (string-append #$output "/share/git-core/templates/hooks")) - - ;; Gitweb depends on Perl as well. - (delete-file-recursively - (string-append #$output "/share/gitweb"))))))) - ((#:make-flags flags) - #~(delete "USE_LIBPCRE2=yes" #$flags)) - ((#:configure-flags flags) - #~(list #$@(if (%current-target-system) - git-cross-configure-flags - '()))) - ((#:disallowed-references lst '()) - `(,perl ,@lst)))) - (outputs '("out")) + (("/usr/bin/perl") (which "perl")) + (("/usr/bin/python") (which "python3"))))) + (add-after 'build 'build-subtree + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "contrib/subtree" + (substitute* "Makefile" + ;; Apparently `xmlto' does not bother to looks up the + ;; stylesheets specified in the XML, unlike the above + ;; substitution. Instead it uses a hard-coded URL. Work + ;; around it here, but if this is common perhaps we should + ;; hardcode this path in xmlto itself. + (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)") + (string-append "$(XMLTO) -x " + (search-input-directory + (or native-inputs inputs) + (string-append + "xml/xsl/docbook-xsl-" + #$(package-version docbook-xsl))) + "/manpages/docbook.xsl -m $(MANPAGE_XSL)"))) + (invoke "make") + (invoke "make" "install") + (invoke "make" "install-doc") + (substitute* "git-subtree" + (("/bin/sh") (which "sh")))))) + (add-after 'install 'install-info-manual + (lambda* (#:key parallel-build? #:allow-other-keys) + (define job-count (if parallel-build? + (number->string (parallel-job-count)) + "1")) + (invoke "make" "-C" "Documentation" "install-info" + "-j" job-count + ;; The Makefile refer to 'docbook2x-texi', but our + ;; binary is named 'docbook2texi'. + "DOCBOOK2X_TEXI=docbook2texi" "PERL_PATH=perl"))) + (add-after 'install 'install-credential-netrc + (lambda _ + (install-file + "contrib/credential/netrc/git-credential-netrc.perl" + (string-append #$output:credential-netrc "/bin")) + (rename-file (string-append #$output:credential-netrc + "/bin/git-credential-netrc.perl") + (string-append #$output:credential-netrc + "/bin/git-credential-netrc")) + ;; Previously, Git.pm was automatically found by netrc. + ;; Perl 5.26 changed how it locates modules so that @INC no + ;; longer includes the current working directory (the Perl + ;; community calls this "dotless @INC"). + (wrap-program (string-append #$output:credential-netrc + "/bin/git-credential-netrc") + `("PERL5LIB" ":" prefix + (,(string-append #$output "/share/perl5")))))) + (add-after 'install 'install-credential-libsecret + (lambda _ + (with-directory-excursion "contrib/credential/libsecret" + ((assoc-ref gnu:%standard-phases 'build)) + (install-file "git-credential-libsecret" + (string-append #$output:credential-libsecret + "/bin"))))) + (add-after 'install 'install-subtree + (lambda _ + (install-file "contrib/subtree/git-subtree" + (string-append #$output:subtree "/bin")) + (install-file "contrib/subtree/git-subtree.1" + (string-append #$output:subtree + "/share/man/man1")))) + (add-after 'install 'split + (lambda* (#:key inputs #:allow-other-keys) + ;; Split the binaries to the various outputs. + (let* ((out #$output) + (se #$output:send-email) + (svn #$output:svn) + (gui #$output:gui) + (gitk (string-append out "/bin/gitk")) + (gitk* (string-append gui "/bin/gitk")) + (git-gui (string-append + out "/libexec/git-core/git-gui")) + (git-gui* (string-append + gui "/libexec/git-core/git-gui")) + (git-cit (string-append + out "/libexec/git-core/git-citool")) + (git-cit* (string-append + gui "/libexec/git-core/git-citool")) + (git-se (string-append + out "/libexec/git-core/git-send-email")) + (git-se* (string-append + se "/libexec/git-core/git-send-email")) + (git-svn (string-append + out "/libexec/git-core/git-svn")) + (git-svn* (string-append + svn "/libexec/git-core/git-svn")) + (git-sm (string-append + out "/libexec/git-core/git-submodule"))) + (mkdir-p (string-append gui "/bin")) + (mkdir-p (string-append gui "/libexec/git-core")) + (mkdir-p (string-append se "/libexec/git-core")) + (mkdir-p (string-append svn "/libexec/git-core")) + + (for-each (lambda (old new) + (copy-file old new) + (delete-file old) + (chmod new #o555)) + (list gitk git-gui git-cit git-se git-svn) + (list gitk* git-gui* git-cit* git-se* git-svn*)) + + ;; Tell 'git-svn' where Subversion and perl-term-readkey are. + + ;; FIXME: Old school 'assoc-ref' is used to retrieve + ;; subversion here, as #$(this-package-input "subversion") + ;; causes a dependency cycle for unknown reasons. + (wrap-program git-svn* + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))) + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + (list (assoc-ref inputs "subversion") + #$(this-package-input "perl-term-readkey")))) + + ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so + ;; help it find 'libsvn_client-1.so'. + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (assoc-ref inputs "subversion") + "/lib")))) + + ;; Tell 'git-send-email' where perl modules are. + (wrap-program git-se* + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-authen-sasl") + (this-package-input "perl-net-smtp-ssl") + (this-package-input + "perl-io-socket-ssl"))))))) + ;; Tell 'gitweb.cgi' where perl modules are. + (wrap-program (string-append out "/share/gitweb/gitweb.cgi") + `("PERL5LIB" ":" prefix + ,(search-path-as-list + '("lib/perl5/site_perl") + '#$(delete-duplicates + (append-map + (compose last package-transitive-propagated-inputs) + (list (this-package-input "perl-cgi"))))))) + + ;; Tell 'git-submodule' where Perl is. + (wrap-program git-sm + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/perl")))))))) + (add-after 'split 'install-man-pages + (lambda _ + (let ((man (string-append #$output "/share/man"))) + (mkdir-p man) + (with-directory-excursion man + (invoke + "tar" "xvf" + #$(origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/software/scm/git/" + "git-manpages-" (package-version this-package) + ".tar.xz")) + (sha256 + (base32 + "0xsqakgy0s60zpa13ilj6zj420kdh8pf4v3nrp1nziwj8ja4qymw")))))))))))) (native-inputs - `(("bash" ,bash-minimal) - ("bash-for-tests" ,bash) - ("native-perl" ,perl) - ("gettext" ,gettext-minimal))) + (modify-inputs (package-native-inputs git-minimal) + ;; For subtree documentation. + (append asciidoc + docbook2x + docbook-xsl + libxslt + pkg-config + texinfo + xmlto))) (inputs - (list curl ;for HTTP(S) access - expat ;for 'git push' over HTTP(S) - openssl - perl - zlib)))) + (modify-inputs (package-inputs git-minimal) + (append python ;for git-p4 + + ;; For PCRE support in git grep (USE_LIBPCRE2). + pcre2 + + ;; For 'gitweb.cgi'. + perl-cgi + + ;; For 'git-svn'. + subversion + perl-term-readkey + + ;; For 'git-send-email'. + perl-authen-sasl + perl-net-smtp-ssl + perl-io-socket-ssl + + ;; For 'git gui', 'gitk', and 'git citool'. + tcl + tk + + ;; For 'git-credential-libsecret' + glib + libsecret))))) ;;; The symbol git-minimal/fixed should be used when git-minimal needs fixes ;;; (security or else) and this deprecation could be removed. -- 2.41.0 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Maxim Cournoyer @ 2023-10-08 7:03 ` Liliana Marie Prikler 2023-10-09 14:21 ` bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer 2023-10-14 16:54 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Ludovic Courtès 1 sibling, 1 reply; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-08 7:03 UTC (permalink / raw) To: Maxim Cournoyer, 65924 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. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-08 7:03 ` Liliana Marie Prikler @ 2023-10-09 14:21 ` Maxim Cournoyer 2023-10-09 16:49 ` Liliana Marie Prikler 0 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 14:21 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 65924 Hi Liliana :-) Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 14:21 ` bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer @ 2023-10-09 16:49 ` Liliana Marie Prikler 2023-10-09 18:21 ` Maxim Cournoyer 2023-10-09 19:17 ` Maxim Cournoyer 0 siblings, 2 replies; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-09 16:49 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924 Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer: > Hi Liliana :-) > > Liliana Marie Prikler <liliana.prikler@gmail.com> 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. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 16:49 ` Liliana Marie Prikler @ 2023-10-09 18:21 ` Maxim Cournoyer 2023-10-09 18:33 ` Liliana Marie Prikler 2023-10-09 19:17 ` Maxim Cournoyer 1 sibling, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 18:21 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 65924 Hello, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer: >> Hi Liliana :-) >> >> Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 18:21 ` Maxim Cournoyer @ 2023-10-09 18:33 ` Liliana Marie Prikler 2023-10-09 19:25 ` Maxim Cournoyer 2023-10-09 21:03 ` bokr 0 siblings, 2 replies; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-09 18:33 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924 Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: > Hello, > > Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 18:33 ` Liliana Marie Prikler @ 2023-10-09 19:25 ` Maxim Cournoyer 2023-10-09 19:28 ` Liliana Marie Prikler 2023-10-09 21:03 ` bokr 1 sibling, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 19:25 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 65924 Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: >> Hello, >> >> Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 19:25 ` Maxim Cournoyer @ 2023-10-09 19:28 ` Liliana Marie Prikler 2023-10-09 19:44 ` Maxim Cournoyer 0 siblings, 1 reply; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-09 19:28 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924 Am Montag, dem 09.10.2023 um 15:25 -0400 schrieb Maxim Cournoyer: > Hi Liliana, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: > > > Hello, > > > > > > Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 19:28 ` Liliana Marie Prikler @ 2023-10-09 19:44 ` Maxim Cournoyer 0 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 19:44 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: Ludovic Courtès, 65924-done Hello, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 15:25 -0400 schrieb Maxim Cournoyer: >> Hi Liliana, >> >> Liliana Marie Prikler <liliana.prikler@gmail.com> writes: >> >> > Am Montag, dem 09.10.2023 um 14:21 -0400 schrieb Maxim Cournoyer: >> > > Hello, >> > > >> > > Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 18:33 ` Liliana Marie Prikler 2023-10-09 19:25 ` Maxim Cournoyer @ 2023-10-09 21:03 ` bokr 2023-10-10 4:28 ` Liliana Marie Prikler 1 sibling, 1 reply; 106+ messages in thread From: bokr @ 2023-10-09 21:03 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 65924, Maxim Cournoyer 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 <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 21:03 ` bokr @ 2023-10-10 4:28 ` Liliana Marie Prikler 0 siblings, 0 replies; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-10 4:28 UTC (permalink / raw) To: bokr; +Cc: 65924, Maxim Cournoyer Am Montag, dem 09.10.2023 um 23:03 +0200 schrieb bokr@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. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 16:49 ` Liliana Marie Prikler 2023-10-09 18:21 ` Maxim Cournoyer @ 2023-10-09 19:17 ` Maxim Cournoyer 1 sibling, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 19:17 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 65924 Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 10:21 -0400 schrieb Maxim Cournoyer: >> Hi Liliana :-) >> >> Liliana Marie Prikler <liliana.prikler@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Maxim Cournoyer 2023-10-08 7:03 ` Liliana Marie Prikler @ 2023-10-14 16:54 ` Ludovic Courtès 1 sibling, 0 replies; 106+ messages in thread From: Ludovic Courtès @ 2023-10-14 16:54 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924, Simon Tournier Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > 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. LGTM! Ludo'. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Maxim Cournoyer @ 2023-10-08 3:18 ` Maxim Cournoyer 2023-10-14 17:01 ` Ludovic Courtès 2 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-08 3:18 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès Fixes <https://issues.guix.gnu.org/65924>. * gnu/packages/version-control.scm (git-minimal) [arguments] <imported-modules>: New field. <modules>: Augment with (ice-9 match), (ice-9 textual-ports) and (guix search-paths). <phases>: Add patch-commands phase. [inputs]: Add coreutils-minimal and sed. --- gnu/packages/version-control.scm | 57 ++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bc647d1538..b0997db5da 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -82,6 +82,7 @@ (define-module (gnu packages version-control) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) + #:use-module (guix modules) #:use-module (gnu packages apr) #:use-module (gnu packages autotools) #:use-module (gnu packages documentation) @@ -245,9 +246,14 @@ (define-public git-minimal (build-system gnu-build-system) (arguments (list - #:modules `((srfi srfi-1) + #:imported-modules `(,@%gnu-build-system-modules + ,@(source-module-closure '((guix search-paths)))) + #:modules `((ice-9 match) + (ice-9 textual-ports) + (srfi srfi-1) (srfi srfi-26) ((guix build gnu-build-system) #:prefix gnu:) + (guix search-paths) ,@%gnu-build-system-modules) ;; Make sure the full bash does not end up in the final closure. #:disallowed-references (list bash perl) @@ -311,6 +317,51 @@ (define-public git-minimal inputs "bin/curl-config")) ":" (getenv "PATH")))))) #~()) + (add-after 'unpack 'patch-commands + (lambda* (#:key inputs #:allow-other-keys) + (define (prepend-string-to-file text file) + "Prepend TEXT to FILE." + (let ((content (call-with-input-file file + (cut get-string-all <>)))) + (call-with-output-file file + (lambda (port) + (display text port) + (display content port))))) + + (define PATH-variable-definition + (let ((value + (match (evaluate-search-paths + (list $PATH) + (list #$(this-package-input "coreutils-minimal") + #$(this-package-input "sed"))) + (((spec . value)) + value)))) + (string-append + (search-path-definition $PATH value + #:kind 'prefix) "\n\n"))) + + ;; Ensure that coreutils (for basename) and sed are on PATH + ;; for any script that sources the 'git-sh-setup.sh' file. + (prepend-string-to-file PATH-variable-definition + "git-sh-setup.sh") + + ;; Avoid depending on util-linux; it's only used to detect + ;; whether the system is MinGW, which we can detect at build + ;; time. + (substitute* "git-sh-setup.sh" + (("\\$\\(uname -s)") + (if #$(target-mingw?) + "MINGW" + "GNU"))) ;matched against '*' + + ;; git-submodule sources 'git-sh-setup.sh', but not before + ;; invoking the basename and sed commands... patch them to their + ;; absolute location. + (substitute* "git-submodule.sh" + (("\\$\\(basename") + (string-append "$(" (search-input-file inputs "bin/basename"))) + (("sed -e") + (string-append (search-input-file inputs "bin/sed") " -e"))))) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" @@ -414,10 +465,12 @@ (define-public git-minimal gettext-minimal perl)) (inputs - (list curl ;for HTTP(S) access + (list coreutils-minimal + curl ;for HTTP(S) access expat ;for 'git push' over HTTP(S) openssl perl + sed zlib)) (native-search-paths ;; For HTTPS access, Git needs a single-file certificate bundle, specified -- 2.41.0 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH Maxim Cournoyer @ 2023-10-14 17:01 ` Ludovic Courtès 2023-10-15 20:03 ` Maxim Cournoyer 2023-10-17 15:15 ` Maxim Cournoyer 0 siblings, 2 replies; 106+ messages in thread From: Ludovic Courtès @ 2023-10-14 17:01 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: 65924, Simon Tournier Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > Fixes <https://issues.guix.gnu.org/65924>. > > * gnu/packages/version-control.scm (git-minimal) > [arguments] <imported-modules>: New field. > <modules>: Augment with (ice-9 match), (ice-9 textual-ports) and (guix > search-paths). > <phases>: Add patch-commands phase. > [inputs]: Add coreutils-minimal and sed. [...] > + #:imported-modules `(,@%gnu-build-system-modules > + ,@(source-module-closure '((guix search-paths)))) I think we should avoid the dependency on (guix search-paths) here, to avoid situation such as that described in <https://issues.guix.gnu.org/66525>. > + (add-after 'unpack 'patch-commands > + (lambda* (#:key inputs #:allow-other-keys) > + (define (prepend-string-to-file text file) > + "Prepend TEXT to FILE." Nitpick: no need to add a docstring to internal defines because it’s optimized out and inaccessible (you can use a comment instead). > + (let ((content (call-with-input-file file > + (cut get-string-all <>)))) > + (call-with-output-file file > + (lambda (port) > + (display text port) > + (display content port))))) > + > + (define PATH-variable-definition > + (let ((value > + (match (evaluate-search-paths > + (list $PATH) > + (list #$(this-package-input "coreutils-minimal") > + #$(this-package-input "sed"))) > + (((spec . value)) > + value)))) > + (string-append > + (search-path-definition $PATH value > + #:kind 'prefix) "\n\n"))) > + > + ;; Ensure that coreutils (for basename) and sed are on PATH > + ;; for any script that sources the 'git-sh-setup.sh' file. > + (prepend-string-to-file PATH-variable-definition > + "git-sh-setup.sh") How about something along these lines instead: ;; Instead PATH definition at the top of the file. (substitute* "git-sh-setup.sh" (("^unset CDPATH" all) (string-append "PATH=" (dirname (search-input-file inputs "bin/basename")) ":$PATH\nexport PATH\n" all))) ? Thanks, Ludo’. ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. 2023-10-14 17:01 ` Ludovic Courtès @ 2023-10-15 20:03 ` Maxim Cournoyer 2023-10-17 15:15 ` Maxim Cournoyer 1 sibling, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-15 20:03 UTC (permalink / raw) To: Ludovic Courtès; +Cc: 65924, Simon Tournier Hi Ludovic, Ludovic Courtès <ludo@gnu.org> writes: > Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > >> Fixes <https://issues.guix.gnu.org/65924>. >> >> * gnu/packages/version-control.scm (git-minimal) >> [arguments] <imported-modules>: New field. >> <modules>: Augment with (ice-9 match), (ice-9 textual-ports) and (guix >> search-paths). >> <phases>: Add patch-commands phase. >> [inputs]: Add coreutils-minimal and sed. > > [...] > >> + #:imported-modules `(,@%gnu-build-system-modules >> + ,@(source-module-closure '((guix search-paths)))) > > I think we should avoid the dependency on (guix search-paths) here, to > avoid situation such as that described in > <https://issues.guix.gnu.org/66525>. OK, I can see how that could be annoying, especially since (guix search-paths) will see frequent new search paths additions. I think the best course to avoid a repeat may be to document that only modules part of the (guix build ...) prefix should be used on the build side, with the list of exception modules, if there are any; what do you think? >> + (add-after 'unpack 'patch-commands >> + (lambda* (#:key inputs #:allow-other-keys) >> + (define (prepend-string-to-file text file) >> + "Prepend TEXT to FILE." > > Nitpick: no need to add a docstring to internal defines because it’s > optimized out and inaccessible (you can use a comment instead). I think I did so here in case it's ever moved to (guix build utils) or the likes; it seems a useful procedure to have around. Thanks for the bit of knowledge! >> + (let ((content (call-with-input-file file >> + (cut get-string-all <>)))) >> + (call-with-output-file file >> + (lambda (port) >> + (display text port) >> + (display content port))))) >> + >> + (define PATH-variable-definition >> + (let ((value >> + (match (evaluate-search-paths >> + (list $PATH) >> + (list #$(this-package-input "coreutils-minimal") >> + #$(this-package-input "sed"))) >> + (((spec . value)) >> + value)))) >> + (string-append >> + (search-path-definition $PATH value >> + #:kind 'prefix) "\n\n"))) >> + >> + ;; Ensure that coreutils (for basename) and sed are on PATH >> + ;; for any script that sources the 'git-sh-setup.sh' file. >> + (prepend-string-to-file PATH-variable-definition >> + "git-sh-setup.sh") > > How about something along these lines instead: > > ;; Instead PATH definition at the top of the file. > (substitute* "git-sh-setup.sh" > (("^unset CDPATH" all) > (string-append "PATH=" (dirname (search-input-file inputs "bin/basename")) > ":$PATH\nexport PATH\n" all))) I'd like to preserve prepending the shell expression to the beginning of the file, as substitute* doesn't error when it doesn't match anything, which could lead to silent breakage in the future (if that 'unset CDPATH' line is ever moved/deleted). The rest looks good, except we'd have to add sed to the PATH as well. I can send a new patch to that effect. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH. 2023-10-14 17:01 ` Ludovic Courtès 2023-10-15 20:03 ` Maxim Cournoyer @ 2023-10-17 15:15 ` Maxim Cournoyer 1 sibling, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-17 15:15 UTC (permalink / raw) To: Ludovic Courtès; +Cc: 65924, Simon Tournier Hi Ludovic, Ludovic Courtès <ludo@gnu.org> writes: > Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: > >> Fixes <https://issues.guix.gnu.org/65924>. >> >> * gnu/packages/version-control.scm (git-minimal) >> [arguments] <imported-modules>: New field. >> <modules>: Augment with (ice-9 match), (ice-9 textual-ports) and (guix >> search-paths). >> <phases>: Add patch-commands phase. >> [inputs]: Add coreutils-minimal and sed. > > [...] > >> + #:imported-modules `(,@%gnu-build-system-modules >> + ,@(source-module-closure '((guix search-paths)))) > > I think we should avoid the dependency on (guix search-paths) here, to > avoid situation such as that described in > <https://issues.guix.gnu.org/66525>. [...] > How about something along these lines instead: > > ;; Instead PATH definition at the top of the file. > (substitute* "git-sh-setup.sh" > (("^unset CDPATH" all) > (string-append "PATH=" (dirname (search-input-file inputs "bin/basename")) > ":$PATH\nexport PATH\n" all))) > I've done something along these lines with commit ab9a88e355165025f7b4719017c0a40264167b22. Also see bug#66585 for a small doc addition hopefully serving as a reminder to not go down that path again. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-09-13 18:00 bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer ` (2 preceding siblings ...) 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t Maxim Cournoyer ` (66 more replies) 3 siblings, 67 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler 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 ++--- 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 | 2 +- guix/build-system/linux-module.scm | 2 +- guix/build-system/maven.scm | 2 +- guix/build-system/minify.scm | 2 +- guix/build-system/node.scm | 2 +- guix/build-system/ocaml.scm | 2 +- guix/build-system/perl.scm | 2 +- guix/build-system/python.scm | 2 +- guix/build-system/r.scm | 2 +- guix/build-system/rakudo.scm | 2 +- guix/build-system/rebar.scm | 2 +- guix/build-system/renpy.scm | 2 +- guix/build-system/ruby.scm | 2 +- guix/build-system/scons.scm | 2 +- guix/build-system/texlive.scm | 2 +- guix/build-system/waf.scm | 2 +- tests/modules.scm | 8 +++--- 111 files changed, 192 insertions(+), 197 deletions(-) base-commit: dc455b6dfb28cf4ca7b1ab5deabeb0adf0ea2d20 -- 2.41.0 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 03/65] gnu: acl: Import the correct set of modules Maxim Cournoyer ` (65 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 03/65] gnu: acl: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 04/65] gnu: dirvish: " Maxim Cournoyer ` (64 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/acl.scm (acl) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 04/65] gnu: dirvish: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 03/65] gnu: acl: Import the correct set of modules Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 05/65] gnu: fio: " Maxim Cournoyer ` (63 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/backup.scm (dirvish) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 05/65] gnu: fio: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (2 preceding siblings ...) 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 04/65] gnu: dirvish: " Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 06/65] gnu: ccwl: " Maxim Cournoyer ` (62 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/benchmark.scm (fio) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 06/65] gnu: ccwl: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (3 preceding siblings ...) 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 05/65] gnu: fio: " Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 07/65] gnu: boost: " Maxim Cournoyer ` (61 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/bioinformatics.scm (ccwl) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 07/65] gnu: boost: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (4 preceding siblings ...) 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 06/65] gnu: ccwl: " Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 08/65] gnu: gcc-final: " Maxim Cournoyer ` (60 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/boost.scm (boost) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 08/65] gnu: gcc-final: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (5 preceding siblings ...) 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 07/65] gnu: boost: " Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 09/65] gnu: epson-inkjet-printer-escpr: " Maxim Cournoyer ` (59 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/commencement.scm (gcc-final) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 09/65] gnu: epson-inkjet-printer-escpr: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (6 preceding siblings ...) 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 08/65] gnu: gcc-final: " Maxim Cournoyer @ 2023-10-09 16:28 ` Maxim Cournoyer 2023-10-09 16:37 ` Maxim Cournoyer ` (58 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/cups.scm (epson-inkjet-printer-escpr) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 10/65] gnu: splix: Import the correct set of modules. @ 2023-10-09 16:37 ` Maxim Cournoyer 0 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:28 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Maxim Cournoyer, Simon Tournier, Ludovic Courtès, Liliana Marie Prikler * gnu/packages/cups.scm (splix) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 10/65] gnu: splix: Import the correct set of modules. @ 2023-10-09 16:37 ` Maxim Cournoyer 0 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/cups.scm (splix) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: git searches coreutils and util-linux commands in PATH 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (8 preceding siblings ...) 2023-10-09 16:37 ` Maxim Cournoyer @ 2023-10-09 16:36 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (56 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:36 UTC (permalink / raw) To: 65924; +Cc: Ludovic Courtès, Liliana Marie Prikler, Simon Tournier Hi, Maxim Cournoyer <maxim.cournoyer@gmail.com> 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 ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (9 preceding siblings ...) 2023-10-09 16:36 ` bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 11/65] gnu: guile-curl: Import the correct set of modules Maxim Cournoyer ` (55 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Andreas Enge, Andrew Tropin, Björn Höfling, Christopher Baines, Efraim Flashner, Eric Bavier, Guillaume Le Vaillant, Jonathan Brielmaier, Julien Lepiller, Katherine Cox-Buday, Lars-Dominik Braun, Leo Famulari, Liliana Marie Prikler, Marius Bakke, Maxim Cournoyer, Munyoki Kilyungi, Philip McGrath, Raghav Gururajan, Ricardo Wurmus, Simon Tournier, Tobias Geerinckx-Rice, Vagrant Cascadian, Zhu Zihao, jgart, pukkamustard, 宋文武 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 | 2 +- guix/build-system/linux-module.scm | 2 +- guix/build-system/maven.scm | 2 +- guix/build-system/minify.scm | 2 +- guix/build-system/node.scm | 2 +- guix/build-system/ocaml.scm | 2 +- guix/build-system/perl.scm | 2 +- guix/build-system/python.scm | 2 +- guix/build-system/r.scm | 2 +- guix/build-system/rakudo.scm | 2 +- guix/build-system/rebar.scm | 2 +- guix/build-system/renpy.scm | 2 +- guix/build-system/ruby.scm | 2 +- guix/build-system/scons.scm | 2 +- guix/build-system/texlive.scm | 2 +- guix/build-system/waf.scm | 2 +- tests/modules.scm | 8 +++--- 111 files changed, 187 insertions(+), 186 deletions(-) diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index eb20fdd549..3e97332243 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '("--disable-static") #:tests? ,(not (or (%current-target-system) (target-hurd?))) diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 7b36922860..83e5056b16 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -230,7 +230,7 @@ (define-public axoloti-patcher (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -387,7 +387,7 @@ (define-public axoloti-patcher-next (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 12c4a45b9d..63b6055c5e 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases ;; This mostly mirrors the steps taken in the install.sh that ships ;; with dirvish, but simplified because we aren't prompting interactively diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 571e612abb..34dc9a037f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1294,7 +1294,7 @@ (define-public (make-glibc-locales glibc) ,@modules)) ((#:imported-modules modules '()) `((gnu build locale) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) ((#:phases phases) `(modify-phases ,phases (replace 'build diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4d92457e59..89f65a5205 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 - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (ice-9 textual-ports)) #:test-target "test" #:configure-flags diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cb0bdf766e..27a3bff63e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -20421,9 +20421,9 @@ (define-public ccwl `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 98dccf7f16..e8fc1503de 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -113,9 +113,9 @@ (define-public boost (arguments (list #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules `(((guix build python-build-system) #:select (python-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f #:configure-flags #~(let ((icu (dirname (dirname (search-input-file diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1124eca837..8869680b24 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -577,7 +577,7 @@ (define-public dtc (build-system gnu-build-system) (arguments (list - #:modules `(,@%gnu-build-system-modules (srfi srfi-26)) + #:modules `(,@%default-gnu-imported-modules (srfi srfi-26)) #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1. @@ -942,7 +942,7 @@ (define*-public (make-u-boot-package board triplet ,@modules)) ((#:imported-modules imported-modules '()) `((guix build kconfig) - ,@%gnu-build-system-modules + ,@%default-gnu-imported-modules ,@imported-modules)) ((#:test-target _ "test") "test") @@ -1808,7 +1808,7 @@ (define-public ipxe (ice-9 regex) (rnrs bytevectors)) #:imported-modules `((guix base32) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags ;; XXX: 'BUILD_ID' is used to determine when another ROM in the ;; system contains identical code in order to save space within the diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 4d03385d21..fd090ad433 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -52,7 +52,7 @@ (define-public dbqn (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build ant-build-system)) #:modules `((guix build gnu-build-system) ((guix build ant-build-system) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 80fdb5aed7..421f3fe050 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -145,7 +145,7 @@ (define bootar #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -185,7 +185,7 @@ (define gash-boot #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -214,7 +214,7 @@ (define gash-utils-boot #:tests? #f #:guile ,%bootstrap-guile #:imported-modules ((guix build gnu-bootstrap) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (begin (use-modules (guix build gnu-bootstrap)) @@ -3236,7 +3236,7 @@ (define gcc-final ;; Additional modules for the libstdc++ phase below. #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) (substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7d9eb2a264..d93f1ab205 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1842,7 +1842,7 @@ (define-public libxsd-frontend (arguments `(#:test-target "test" #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 14cb365099..46c70fd432 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -286,7 +286,7 @@ (define* (cross-gcc target (arguments `(#:implicit-inputs? #f #:imported-modules ((gnu build cross-toolchain) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build gnu-build-system) (guix build utils) (gnu build cross-toolchain) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index c20b06b4db..e43215d726 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -561,7 +561,7 @@ (define-public hplip (arguments (list #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '((guix build gnu-build-system) (guix build utils) ((guix build python-build-system) #:prefix python:)) @@ -880,7 +880,7 @@ (define-public epson-inkjet-printer-escpr (arguments (list #:modules `((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags #~(list "--disable-static" (string-append "--prefix=" #$output) @@ -941,7 +941,7 @@ (define-public splix (arguments `(#:modules ((srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags (list (string-append "CUPSDRV=" (assoc-ref %outputs "out") "/share/cups/drv") diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index cadf1ca361..5c8d88692e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -238,9 +238,9 @@ (define-public guile-curl (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags (list (string-append "--with-guilesitedir=" (assoc-ref %outputs "out") diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 6e40096199..7f41dc8128 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -355,7 +355,7 @@ (define-public dpkg (arguments (list #:modules `((srfi srfi-71) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'bootstrap 'patch-version diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index db3523ac3e..dc2453b521 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -51,7 +51,7 @@ (define-public dezyne (arguments (list #:modules `((ice-9 popen) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'setenv diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 06b5c4362c..55ff0398fd 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -280,7 +280,7 @@ (define-public translate-shell (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation))) #:make-flags (list (string-append "PREFIX=" %output) "NETWORK_ACCESS=no test") - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:modules ((guix build gnu-build-system) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 743fc7e284..084aba2398 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -309,7 +309,7 @@ (define-public didjvu `(#:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:test-target "test" #:phases @@ -395,7 +395,7 @@ (define-public ocrodjvu #:modules '((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build python-build-system)) #:test-target "test" #:phases diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3b809feb67..08e85f7739 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -340,7 +340,7 @@ (define-public docker (guix build union) (guix build utils)) #:imported-modules - `(,@%gnu-build-system-modules + `(,@%default-gnu-imported-modules (guix build union) (guix build go-build-system)) #:phases diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf1542955c..14395b0157 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2240,7 +2240,7 @@ (define-public emacs-shroud `(#:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags (list (string-append "--with-lispdir=" @@ -2353,8 +2353,8 @@ (define-public emacs-haskell-mode #:modules `((ice-9 match) (srfi srfi-26) ((guix build emacs-build-system) #:prefix emacs:) - ,@%gnu-build-system-modules) - #:imported-modules `(,@%gnu-build-system-modules + ,@%default-gnu-imported-modules) + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -3139,7 +3139,7 @@ (define-public emacs-w3m ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -3694,7 +3694,7 @@ (define-public emacs-eweouz ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -4256,7 +4256,7 @@ (define-public emacs-howm #:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -5207,7 +5207,7 @@ (define-public emacs-pdf-tools ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -5415,7 +5415,7 @@ (define-public emacs-guix #:modules '((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -8466,7 +8466,7 @@ (define-public emacs-dvc #:modules `((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags @@ -35419,7 +35419,7 @@ (define-public emacs-ddskk `(#:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-utils)) #:test-target "test" #:phases diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0cb947c58a..8c0005c347 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -182,7 +182,7 @@ (define-public blastem #:tests? #f ; No check target and custom tests don't seem to build #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a56f2ecff1..365434fa2f 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'build 'make-doc @@ -686,7 +686,7 @@ (define-public fasthenry #:parallel-build? #f #:tests? #f ;; no tests-suite #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 0651dda1b0..796f8d3f23 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -135,7 +135,7 @@ (define-public shakespeare-spl "shakespeare-spl-fix-grammar.patch")))) (build-system copy-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build copy-build-system)) #:modules ((guix build copy-build-system) ((guix build gnu-build-system) #:prefix gnu:) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 8be3f4e5cc..7734b3ef51 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 %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((ice-9 match) (ice-9 threads) ,@modules)) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0c380adaa8..f50c8e6a1d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -855,9 +855,9 @@ (define-public font-amiri (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build font-build-system)) - #:modules `(,@%gnu-build-system-modules + #:modules `(,@%default-gnu-imported-modules ((guix build font-build-system) #:prefix font:)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e4f8b16755..e05720ab16 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index eb1d74d1e1..9d956359bd 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -649,9 +649,9 @@ (define-public tsukundere (srfi srfi-1) ((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-command diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5c6ef8ccbf..ffc7166349 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 %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) ,@modules)) ((#:phases phases) @@ -901,7 +901,7 @@ (define-public (make-libstdc++ gcc) #:out-of-source? #t #:modules `((srfi srfi-1) (srfi srfi-26) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases #$@(if (version>=? (package-version gcc) "11") @@ -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 %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `(,@modules (srfi srfi-1) (srfi srfi-26) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index d3881ed9d7..eb90a01c53 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 4a9d24fe78..94a85ce2e4 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -61,7 +61,7 @@ (define-public genimage (arguments `(#:modules ((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'guixify diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c238cd62a..da473d6f97 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2545,7 +2545,7 @@ (define-public grass #:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b1ff08d652..54fbcdcee8 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-gcc-reference diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 908b5782b5..2bcc3421d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11531,7 +11531,7 @@ (define-public soundconverter (arguments `(#:imported-modules ((guix build python-build-system) (guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((guix build glib-or-gtk-build-system) (guix build utils) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index f750b975eb..703710c532 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -81,7 +81,7 @@ (define-public gnucash #:test-target "check" #:configure-flags #~(list "-DWITH_PYTHON=ON") #:make-flags #~(list "GUILE_AUTO_COMPILE=0") - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:modules '((guix build cmake-build-system) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a5b8587a14..80ffe2d1b8 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ac96d7fb1f..3a3e477d7f 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:test-target "check-jstests" #:configure-flags #~(list @@ -876,7 +876,7 @@ (define-public icecat-minimal (rnrs io ports) (guix elf) (guix build gremlin) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches @@ -1625,7 +1625,7 @@ (define-public icedove-minimal #:modules `((guix build utils) ;find-files (sxml simple) (ice-9 regex) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-after 'patch-source-shebangs 'patch-cargo-checksums diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 45a591b9f3..9b558ae2cc 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -636,9 +636,9 @@ (define-public python-graph-tool "0wmvzx509lvigja6cfxh45r4b7wns64vmik0x4rz4y4fnxrhw2m2")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules ((guix build python-build-system) #:select (site-packages))) #:configure-flags (list (string-append "--with-boost=" diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0adcb5b4f4..212741b5c5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -195,9 +195,9 @@ (define-public artanis (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags ;; TODO: The documentation must be built with the `docs' target. (let* ((out (assoc-ref %outputs "out")) @@ -284,9 +284,9 @@ (define-public guilescript `(#:make-flags '("GUILE_AUTO_COMPILE=0") #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-guilescript (lambda* (#:key outputs #:allow-other-keys) @@ -753,9 +753,9 @@ (define-public guile-dsv (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -1799,9 +1799,9 @@ (define-public guile-dbi (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags (list (string-append "--with-guile-site-dir=" %output "/share/guile/site/" @@ -1983,7 +1983,7 @@ (define-public guile-hall `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases @@ -2143,7 +2143,7 @@ (define-public guile-wisp (guix build emacs-utils) (ice-9 rdelim) (ice-9 popen)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases @@ -2537,7 +2537,7 @@ (define-public guile-ncurses #:select (target-guile-effective-version)) (guix build utils)) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags (list "--with-ncursesw" ; Unicode support "--with-gnu-filesystem-hierarchy") #:phases @@ -2813,7 +2813,7 @@ (define-public haunt (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; test suite is non-deterministic :( #:phases (modify-phases %standard-phases (add-after 'install 'wrap-haunt @@ -3098,7 +3098,7 @@ (define-public guile-studio `(#:modules ((ice-9 match) (srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; there are none #:make-flags (list (string-append "PICT_DIR=" @@ -5127,9 +5127,9 @@ (define-public guile-libyaml (arguments `(#:modules (((guix build guile-build-system) #:prefix guile:) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #false ; there are none #:phases (modify-phases %standard-phases @@ -5315,9 +5315,9 @@ (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)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program @@ -5378,9 +5378,9 @@ (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)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'strip) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 1e01bb0ea3..f2ca06a66e 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index bd3bcf964d..1967715bc4 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 7fa7b2f7ba..45ce747f70 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -572,7 +572,7 @@ (define-public uftrace (list #:modules `((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 30a59ec5a3..490492f68f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -715,7 +715,7 @@ (define-public icedtea-8 (arguments `(#:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) @@ -7874,7 +7874,7 @@ (define-public antlr2 (arguments `(#:tests? #f ; no test target #:imported-modules ((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build ant-build-system) #:prefix ant:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index faf3114b84..1366d5a31c 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -969,7 +969,7 @@ (define-public skktools #:prefix emacs:) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5830368a64..bc0f3ca38a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -265,7 +265,7 @@ (define* (customize-linux #:key name (arguments (substitute-keyword-arguments (package-arguments linux) - ((#:imported-modules imported-modules %gnu-build-system-modules) + ((#:imported-modules imported-modules %default-gnu-imported-modules) `((guix build kconfig) ,@imported-modules)) ((#:modules modules) `((guix build kconfig) ,@modules)) @@ -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 %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((ice-9 ftw) ,@modules)) ((#:strip-flags _ '()) ''("--strip-all")) ;strip a few extra KiB @@ -6994,7 +6994,7 @@ (define-public ecryptfs-utils (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-pywrap") - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules (ice-9 binary-ports) (rnrs bytevectors) (srfi srfi-26)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 16781b7aa1..17b0c35f6a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -279,10 +279,10 @@ (define-public ghmm "07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-dir diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 73026012a9..ec5750c7e2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1170,7 +1170,7 @@ (define-public emacs-mew #:modules '((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-utils)) #:tests? #f #:configure-flags @@ -4099,7 +4099,7 @@ (define-public mumi #:select (target-guile-effective-version)) (guix build utils)) #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '(list "--localstatedir=/var") @@ -4680,7 +4680,7 @@ (define-public crm114 ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (ice-9 string-fun)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:make-flags (list (string-append "prefix=" %output) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7b40f395f3..45fc2ac002 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 %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) (srfi srfi-26) (ice-9 regex) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 27ca2d5f18..62bbdc274a 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -5883,7 +5883,7 @@ (define-public hypre (list openblas lapack)) (arguments `(#:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags '("--enable-shared" "--disable-fortran" "--without-MPI" @@ -6385,7 +6385,7 @@ (define-public ocaml-z3 (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build python-build-system) #:select (site-packages)) (guix build gnu-build-system) (guix build utils)) @@ -7888,7 +7888,7 @@ (define-public lingeling (arguments (list #:test-target "test" #:modules `((ice-9 match) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:configure-flags #~(list "--aiger=.") #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 73f8e9eb6a..4a889f3fe7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1356,7 +1356,7 @@ (define-public dino #:modules '((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build cmake-build-system) (guix build glib-or-gtk-build-system)) #:phases diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 86f18e8d77..c2f08d32c2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -377,7 +377,7 @@ (define-public sonata (guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system) (guix build glib-or-gtk-build-system)) #:phases diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index baf6ce11e0..eec13e450d 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -333,7 +333,7 @@ (define-public java-openmpi ((guix build ant-build-system) #:prefix ant:) (guix build utils)) #:imported-modules `((guix build ant-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) #~(cons "--enable-mpi-java" #$flags)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b19e9dde4..27086a5b68 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3387,7 +3387,7 @@ (define-public jack-select `(#:modules ((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84585cdd0f..b2baa4d335 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3793,7 +3793,7 @@ (define-public opendht (arguments (list #:imported-modules `((guix build python-build-system) ;for site-packages - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules '(((guix build python-build-system) #:prefix python:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8543505dbb..d2727ddf13 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1198,7 +1198,7 @@ (define-public emacs-tuareg (build-system gnu-build-system) (arguments (list - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-build-system) (guix build emacs-utils)) #:modules '((guix build gnu-build-system) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index bd244cea1e..3f441f56b4 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -232,7 +232,7 @@ (define-public 389-ds-base #:select (add-installed-pythonpath python-version)) (guix build utils)) #:imported-modules `((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:disallowed-references (list httpd) #:configure-flags #~(list "--enable-cmocka" diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 266b6dc352..3bcb9a5867 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1529,9 +1529,9 @@ (define-public guix-build-coordinator (list #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'build 'set-GUILE_AUTO_COMPILE @@ -1773,9 +1773,9 @@ (define-public nar-herder (list #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:imported-modules `((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'build 'set-GUILE_AUTO_COMPILE diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 9558da1dee..abbfdc7dfb 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -845,7 +845,7 @@ (define-public qtpass `(#:modules ((guix build gnu-build-system) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build qt-utils)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 114cde6f1f..9b3bb4dfc8 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -146,7 +146,7 @@ (define-public guile-plotutils (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) (guix build gnu-build-system) @@ -340,7 +340,7 @@ (define-public asymptote (guix build gnu-build-system) (guix build utils) (srfi srfi-26)) - #:imported-modules `(,@%gnu-build-system-modules + #:imported-modules `(,@%default-gnu-imported-modules (guix build emacs-utils)) #:configure-flags #~(list (string-append "--enable-gc=" #$(this-package-input "libgc")) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b7e394d663..c0abf7f391 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3524,10 +3524,10 @@ (define-public python-sip-4 (arguments `(#:tests? #f ; no check target #:imported-modules ((guix build python-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (replace 'configure @@ -3933,7 +3933,7 @@ (define-public qtsolutions `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 1e97f19dbb..8ebcc2946a 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -575,7 +575,7 @@ (define-public racket-minimal (guix build union) (ice-9 match)) #:imported-modules `((guix build union) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'unpack) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 14933da5a8..b39b679b7e 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -48,7 +48,7 @@ (define-public ratpoison (arguments (list #:modules `((ice-9 format) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-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). diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index ad06d7db06..eee39a55a5 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1252,7 +1252,7 @@ (define-public stklos (arguments (list #:modules `((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-sh-references diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index c45570744a..2405fccc8c 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 _ #~%gnu-build-system-modules) + ((#:modules _ #~%default-gnu-imported-modules) '((srfi srfi-1) (guix build gnu-build-system) (guix build utils))) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 671848fd27..29ea0e4dd9 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm index 9f5c04d8fb..7be6d934de 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 9939d2f165..2ea8e4f64f 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -347,7 +347,7 @@ (define-public festival #:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-utils)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 4ee1b4ebd2..1e2f6a1f15 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4814c22b6c..3a3f9bbb02 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -616,7 +616,7 @@ (define-public tgl `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) @@ -686,7 +686,7 @@ (define-public telegram-cli `(#:tests? #f ; No target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index f45ae06810..2080f97f47 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) - ,@%gnu-build-system-modules))) + ,@%default-gnu-imported-modules))) (synopsis "Standalone Info documentation reader") (inputs (modify-inputs (package-inputs texinfo) (prepend gzip))))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7696217829..6d792fa3d8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1146,7 +1146,7 @@ (define-public geany )) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build gnu-build-system) (guix build utils)) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d9c53af71c..38efff4d7b 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:) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases ,@(if (%current-target-system) @@ -1736,7 +1736,7 @@ (define-public gitile (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:make-flags (list "GUILE_AUTO_COMPILE=0") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bb6ce0cbf1..90623edfc1 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 %gnu-build-system-modules) + ((#:modules modules %default-gnu-imported-modules) `((srfi srfi-1) ,@modules)) ((#:configure-flags flags) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 779164c53f..5398c8116c 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) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases #~(modify-phases %standard-phases ;; Since we removed the bundled firmwares above, many tests @@ -678,10 +678,10 @@ (define-public ganeti "ganeti-relax-dependencies.patch")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build haskell-build-system) (guix build python-build-system)) - #:modules (,@%gnu-build-system-modules + #:modules (,@%default-gnu-imported-modules ((guix build haskell-build-system) #:prefix haskell:) ((guix build python-build-system) #:select (site-packages)) (srfi srfi-1) @@ -1753,7 +1753,7 @@ (define-public criu (search-input-file %build-inputs "/bin/xmlto"))) #:modules ((ice-9 ftw) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a8ef7099f5..42a15b14f5 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -374,7 +374,7 @@ (define-public kristall `(#:modules ((guix build gnu-build-system) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build qt-utils)) #:make-flags (list (string-append "PREFIX=" %output)) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5d873e0884..4a536ba4c4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -222,7 +222,7 @@ (define-public qhttp `(#:tests? #f ; no target #:imported-modules ((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules (((guix build copy-build-system) #:prefix copy:) (guix build gnu-build-system) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index db948a9318..c2409ff4b7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1498,7 +1498,7 @@ (define-public redshift "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) (build-system gnu-build-system) (arguments - `(#:imported-modules (,@%gnu-build-system-modules + `(#:imported-modules (,@%default-gnu-imported-modules (guix build python-build-system)) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4b3c96794d..22f78a87f7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6283,7 +6283,7 @@ (define-public uim `(#:modules ((guix build gnu-build-system) (guix build utils) (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules (,@%default-gnu-imported-modules (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" diff --git a/guix/build-system/agda.scm b/guix/build-system/agda.scm index 64983dff60..409d0cda9d 100644 --- a/guix/build-system/agda.scm +++ b/guix/build-system/agda.scm @@ -38,7 +38,7 @@ (define (default-agda) (define %agda-build-system-modules `((guix build agda-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %default-modules '((guix build agda-build-system) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 047f884b19..23e14c7801 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -32,7 +32,7 @@ (define %android-ndk-build-system-modules ;; Build-side modules imported by default. `((guix build android-ndk-build-system) (guix build syscalls) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (android-ndk-build name inputs #:key diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index cfb033f6a5..c8beea010c 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -44,7 +44,7 @@ (define %ant-build-system-modules (guix build maven pom) (guix build java-utils) (guix build syscalls) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-jdk) "Return the default JDK package." diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 2b17cee37b..26b5a5008a 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -56,7 +56,7 @@ (define %asdf-build-system-modules `((guix build asdf-build-system) (guix build lisp-utils) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %asdf-build-modules ;; Used (visible) build-side modules diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 912400a191..e9d5421065 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -64,7 +64,7 @@ (define (default-rust) (define %cargo-utils-modules ;; Build-side modules imported by default. `((guix build cargo-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %cargo-build-system-modules ;; Build-side modules imported by default. diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index 9f518e66e6..e6fcfa7ee3 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -42,7 +42,7 @@ (define %chicken-build-system-modules ;; Build-side modules imported and used by default. `((guix build chicken-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-chicken) ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index aa187c9844..2bcc8ac046 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -42,7 +42,7 @@ (define-module (guix build-system cmake) (define %cmake-build-system-modules ;; Build-side modules imported by default. `((guix build cmake-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-cmake target) "Return the default CMake package." diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index d58931b33c..1f2937e0f1 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -46,7 +46,7 @@ (define-module (guix build-system copy) (define %copy-build-system-modules ;; Build-side modules imported by default. `((guix build copy-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-glibc) "Return the default glibc package." diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index b4011cdb83..d53acd96e5 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -60,7 +60,7 @@ (define %dub-build-system-modules ;; Build-side modules imported by default. `((guix build dub-build-system) (guix build syscalls) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (dub-build name inputs #:key diff --git a/guix/build-system/elm.scm b/guix/build-system/elm.scm index f5321f811b..7405db3d98 100644 --- a/guix/build-system/elm.scm +++ b/guix/build-system/elm.scm @@ -88,7 +88,7 @@ (define %elm-build-system-modules `((guix build elm-build-system) (guix build json) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define %elm-default-modules ;; Modules in scope in the build-side environment. diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index ebf97a5344..03273d738b 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -46,7 +46,7 @@ (define %emacs-build-system-modules ;; Build-side modules imported by default. `((guix build emacs-build-system) (guix build emacs-utils) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-emacs) "Return the default Emacs package." diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c57c304f52..b18d4af625 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -40,7 +40,7 @@ (define-module (guix build-system font) (define %font-build-system-modules ;; Build-side modules imported by default. `((guix build font-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 726d19efad..5d026ec5ab 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -72,7 +72,7 @@ (define %default-modules (define %glib-or-gtk-build-system-modules ;; Build-side modules imported and used by default. `((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-glib) "Return the default glib package from which we use diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c1aa187c42..5099554b42 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -27,7 +27,8 @@ (define-module (guix build-system gnu) #:use-module (guix packages) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (%gnu-build-system-modules + #:export (%default-gnu-imported-modules + %default-gnu-modules %strip-flags %strip-directories gnu-build @@ -48,14 +49,14 @@ (define-module (guix build-system gnu) ;; ;; Code: -(define %gnu-build-system-modules +(define %default-gnu-imported-modules ;; Build-side modules imported and used by default. '((guix build gnu-build-system) (guix build utils) (guix build gremlin) (guix elf))) -(define %default-modules +(define %default-gnu-modules ;; Modules in scope in the build-side environment. '((guix build gnu-build-system) (guix build utils))) @@ -240,7 +241,7 @@ (define* (dist-package p source #:key (phases '%dist-phases)) ((#:modules modules %default-modules) `((guix build gnu-dist) ,@modules)) - ((#:imported-modules modules %gnu-build-system-modules) + ((#:imported-modules modules %default-gnu-imported-modules) `((guix build gnu-dist) ,@modules)) ((#:phases _ #f) @@ -359,7 +360,7 @@ (define* (gnu-build name inputs (locale "en_US.utf8") (system (%current-system)) (build (nix-system->gnu-triplet system)) - (imported-modules %gnu-build-system-modules) + (imported-modules %default-gnu-imported-modules) (modules %default-modules) (substitutable? #t) allowed-references @@ -499,7 +500,7 @@ (define* (gnu-cross-build name (locale "en_US.utf8") (system (%current-system)) (build (nix-system->gnu-triplet system)) - (imported-modules %gnu-build-system-modules) + (imported-modules %default-gnu-imported-modules) (modules %default-modules) (substitutable? #t) allowed-references diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 0a9761aac7..b1d589e342 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -107,7 +107,7 @@ (define %go-build-system-modules ;; Build-side modules imported and used by default. `((guix build go-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-go) ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 1bd292e267..7ac232bfca 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -36,7 +36,7 @@ (define %scheme-file-regexp (define %guile-build-system-modules ;; Build-side modules imported by default. `((guix build guile-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index f8568e33db..b0019dd014 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -55,7 +55,7 @@ (define (hackage-uri name version) (define %haskell-build-system-modules ;; Build-side modules imported by default. `((guix build haskell-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-haskell) "Return the default Haskell package." diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index b5521e38e4..e098749683 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -42,7 +42,7 @@ (define-module (guix build-system julia) (define %julia-build-system-modules ;; Build-side modules imported by default. `((guix build julia-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-julia) "Return the default Julia package." diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index e46195b53c..d0654a923e 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -41,7 +41,7 @@ (define-module (guix build-system linux-module) (define %linux-module-build-system-modules ;; Build-side modules imported by default. `((guix build linux-module-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-linux) "Return the default Linux package." diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 4bbeaed6a4..03e4e96b89 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -46,7 +46,7 @@ (define %maven-build-system-modules ;; Build-side modules imported by default. `((guix build maven-build-system) (guix build maven pom) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-maven) "Return the default maven package." diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 787235deeb..21c17d1eb1 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -39,7 +39,7 @@ (define-module (guix build-system minify) (define %minify-build-system-modules ;; Build-side modules imported by default. `((guix build minify-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-uglify-js) "Return the default package to minify JavaScript source files." diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 3f73390809..57fe5f6030 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -37,7 +37,7 @@ (define %node-build-system-modules ;; Build-side modules imported by default. `((guix build node-build-system) (guix build json) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-node) "Return the default Node package." diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 582d00b4cd..2f2e6dd62e 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -65,7 +65,7 @@ (define-module (guix build-system ocaml) (define %ocaml-build-system-modules ;; Build-side modules imported by default. `((guix build ocaml-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-ocaml) "Return the default OCaml package." diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 7c6deb34bf..a8d954ea91 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -45,7 +45,7 @@ (define-module (guix build-system perl) (define %perl-build-system-modules ;; Build-side modules imported by default. `((guix build perl-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-perl) "Return the default Perl package." diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index cca009fb28..b987aeef4e 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -59,7 +59,7 @@ (define* (pypi-uri name version #:optional (extension ".tar.gz")) (define %python-build-system-modules ;; Build-side modules imported by default. `((guix build python-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-python) "Return the default Python package." diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 657346bea3..93acb6ab49 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -68,7 +68,7 @@ (define* (bioconductor-uri name version #:optional type) (define %r-build-system-modules ;; Build-side modules imported by default. `((guix build r-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-r) "Return the default R package." diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm index 3b30fdfd0e..ee13c50791 100644 --- a/guix/build-system/rakudo.scm +++ b/guix/build-system/rakudo.scm @@ -41,7 +41,7 @@ (define-module (guix build-system rakudo) (define %rakudo-build-system-modules ;; Build-side modules imported by default. `((guix build rakudo-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-rakudo) "Return the default Rakudo package." diff --git a/guix/build-system/rebar.scm b/guix/build-system/rebar.scm index de1294ec3f..7c7cc5870f 100644 --- a/guix/build-system/rebar.scm +++ b/guix/build-system/rebar.scm @@ -56,7 +56,7 @@ (define (hexpm-uri name version) (define %rebar-build-system-modules ;; Build-side modules imported by default. `((guix build rebar-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-rebar3) "Return the default Rebar3 package." diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 3039e3c63b..015dd7c210 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -44,7 +44,7 @@ (define %renpy-build-system-modules `((guix build renpy-build-system) (guix build json) (guix build python-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index a3793a9381..33aab5f719 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -39,7 +39,7 @@ (define (rubygems-uri name version) (define %ruby-build-system-modules ;; Build-side modules imported by default. `((guix build ruby-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-ruby) "Return the default Ruby package." diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 046ddef740..e76c419b1e 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -39,7 +39,7 @@ (define-module (guix build-system scons) (define %scons-build-system-modules ;; Build-side modules imported by default. `((guix build scons-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-scons) "Return the default SCons package." diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index 88372faa58..2baa35466b 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -78,7 +78,7 @@ (define %texlive-build-system-modules ;; Build-side modules imported by default. `((guix build texlive-build-system) (guix build union) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define (default-texlive-bin) "Return the default texlive-bin package." diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index 91b3d0d100..5f24615514 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -42,7 +42,7 @@ (define-module (guix build-system waf) (define %waf-build-system-modules ;; Build-side modules imported by default. `((guix build waf-build-system) - ,@%gnu-build-system-modules)) + ,@%default-gnu-imported-modules)) (define* (lower name #:key source inputs native-inputs outputs system target diff --git a/tests/modules.scm b/tests/modules.scm index e70d2d9e08..904f91e365 100644 --- a/tests/modules.scm +++ b/tests/modules.scm @@ -18,7 +18,7 @@ (define-module (test-modules) #:use-module (guix modules) - #:use-module ((guix build-system gnu) #:select (%gnu-build-system-modules)) + #:use-module ((guix build-system gnu) #:select (%default-gnu-imported-modules)) #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) @@ -30,9 +30,9 @@ (define-module (test-modules) (lset= equal? (live-module-closure '((guix build gnu-build-system))) (source-module-closure '((guix build gnu-build-system))) - %gnu-build-system-modules - (source-module-closure %gnu-build-system-modules) - (live-module-closure %gnu-build-system-modules))) + %default-gnu-imported-modules + (source-module-closure %default-gnu-imported-modules) + (live-module-closure %default-gnu-imported-modules))) (test-assert "closure of (gnu build install)" (lset= equal? -- 2.41.0 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 11/65] gnu: guile-curl: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (10 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 12/65] gnu: dpkg: " Maxim Cournoyer ` (54 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/curl.scm (guile-curl) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 12/65] gnu: dpkg: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (11 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 11/65] gnu: guile-curl: Import the correct set of modules Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 13/65] gnu: dezyne: " Maxim Cournoyer ` (53 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/debian.scm (dpkg) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 13/65] gnu: dezyne: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (12 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 12/65] gnu: dpkg: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 14/65] gnu: fastcap: " Maxim Cournoyer ` (52 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/dezyne.scm (dezyne) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 14/65] gnu: fastcap: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (13 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 13/65] gnu: dezyne: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 15/65] gnu: fasthenry: " Maxim Cournoyer ` (51 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/engineering.scm (fastcap) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 15/65] gnu: fasthenry: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (14 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 14/65] gnu: fastcap: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 16/65] gnu: seabios-qemu: " Maxim Cournoyer ` (50 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/engineering.scm (fasthenry) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 16/65] gnu: seabios-qemu: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (15 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 15/65] gnu: fasthenry: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 17/65] gnu: font-amiri: " Maxim Cournoyer ` (49 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Efraim Flashner, Vagrant Cascadian * gnu/packages/engineering.scm (seabios-qemu) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 17/65] gnu: font-amiri: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (16 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 16/65] gnu: seabios-qemu: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 18/65] gnu: xdg-utils: " Maxim Cournoyer ` (48 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Zhu Zihao, 宋文武 * gnu/packages/fonts.scm (font-amiri) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 18/65] gnu: xdg-utils: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (17 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 17/65] gnu: font-amiri: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 19/65] gnu: tsukundere: " Maxim Cournoyer ` (47 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/freedesktop.scm (xdg-utils) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 19/65] gnu: tsukundere: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (18 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 18/65] gnu: xdg-utils: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 20/65] gnu: gcc-4.9: " Maxim Cournoyer ` (46 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Liliana Marie Prikler, 宋文武 * gnu/packages/game-development.scm (tsukundere) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 20/65] gnu: gcc-4.9: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (19 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 19/65] gnu: tsukundere: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 21/65] gnu: make-libstdc++: " Maxim Cournoyer ` (45 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/gcc.scm (gcc-4.9) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 21/65] gnu: make-libstdc++: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (20 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 20/65] gnu: gcc-4.9: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 22/65] gnu: custom-gcc: " Maxim Cournoyer ` (44 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/gcc.scm (make-libstdc++) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 22/65] gnu: custom-gcc: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (21 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 21/65] gnu: make-libstdc++: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 23/65] gnu: gdb: " Maxim Cournoyer ` (43 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/gcc.scm (custom-gcc) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 23/65] gnu: gdb: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (22 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 22/65] gnu: custom-gcc: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 24/65] gnu: genimage: " Maxim Cournoyer ` (42 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/gdb.scm (gdb) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 24/65] gnu: genimage: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (23 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 23/65] gnu: gdb: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 25/65] gnu: gimp: " Maxim Cournoyer ` (41 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/genimage.scm (genimage) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 25/65] gnu: gimp: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (24 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 24/65] gnu: genimage: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 26/65] gnu: pinentry-rofi: " Maxim Cournoyer ` (40 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/gimp.scm (gimp) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 26/65] gnu: pinentry-rofi: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (25 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 25/65] gnu: gimp: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 27/65] gnu: mozjs: " Maxim Cournoyer ` (39 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/gnupg.scm (pinentry-rofi) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 27/65] gnu: mozjs: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (26 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 26/65] gnu: pinentry-rofi: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 28/65] gnu: icecat-minimal: " Maxim Cournoyer ` (38 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Jonathan Brielmaier * gnu/packages/gnuzilla.scm (mozjs) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 28/65] gnu: icecat-minimal: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (27 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 27/65] gnu: mozjs: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 29/65] gnu: icedove-minimal: " Maxim Cournoyer ` (37 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Jonathan Brielmaier * gnu/packages/gnuzilla.scm (icecat-minimal) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 29/65] gnu: icedove-minimal: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (28 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 28/65] gnu: icecat-minimal: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 30/65] gnu: python-graph-tool: " Maxim Cournoyer ` (36 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Jonathan Brielmaier * gnu/packages/gnuzilla.scm (icedove-minimal) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 30/65] gnu: python-graph-tool: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (29 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 29/65] gnu: icedove-minimal: " Maxim Cournoyer @ 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 31/65] gnu: artanis: " Maxim Cournoyer ` (35 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:37 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/graph.scm (python-graph-tool) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 31/65] gnu: artanis: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (30 preceding siblings ...) 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 30/65] gnu: python-graph-tool: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 32/65] gnu: guilescript: " Maxim Cournoyer ` (34 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (artanis) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 32/65] gnu: guilescript: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (31 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 31/65] gnu: artanis: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 33/65] gnu: guile-dsv: " Maxim Cournoyer ` (33 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guilescript) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 33/65] gnu: guile-dsv: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (32 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 32/65] gnu: guilescript: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 34/65] gnu: guile-di: " Maxim Cournoyer ` (32 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-dsv) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 34/65] gnu: guile-di: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (33 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 33/65] gnu: guile-dsv: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 35/65] gnu: guile-hall: " Maxim Cournoyer ` (31 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-dbi) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 35/65] gnu: guile-hall: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (34 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 34/65] gnu: guile-di: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 36/65] gnu: haunt: " Maxim Cournoyer ` (30 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-hall) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 36/65] gnu: haunt: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (35 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 35/65] gnu: guile-hall: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 37/65] gnu: guile-studio: " Maxim Cournoyer ` (29 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (haunt) [arguments] <modules>: Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: I234344443de93e07e390ca8ae155718692926633 --- 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 37/65] gnu: guile-studio: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (36 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 36/65] gnu: haunt: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 38/65] gnu: guile-libyaml: " Maxim Cournoyer ` (28 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-studio) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 38/65] gnu: guile-libyaml: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (37 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 37/65] gnu: guile-studio: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 39/65] gnu: guile-gitlab: " Maxim Cournoyer ` (27 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-libyaml) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 39/65] gnu: guile-gitlab: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (38 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 38/65] gnu: guile-libyaml: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 40/65] gnu: guile-smc: " Maxim Cournoyer ` (26 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-gitlab) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 40/65] gnu: guile-smc: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (39 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 39/65] gnu: guile-gitlab: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 41/65] gnu: rime-data: " Maxim Cournoyer ` (25 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/guile-xyz.scm (guile-smc) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 41/65] gnu: rime-data: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (40 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 40/65] gnu: guile-smc: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 42/65] gnu: jbigkit: " Maxim Cournoyer ` (24 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Zhu Zihao, 宋文武 * gnu/packages/ibus.scm (rime-data) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 42/65] gnu: jbigkit: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (41 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 41/65] gnu: rime-data: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 43/65] gnu: uftrace: " Maxim Cournoyer ` (23 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/image.scm (jbigkit) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 43/65] gnu: uftrace: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (42 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 42/65] gnu: jbigkit: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 44/65] gnu: mdadm-static: " Maxim Cournoyer ` (22 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/instrumentation.scm (uftrace) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 44/65] gnu: mdadm-static: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (43 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 43/65] gnu: uftrace: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 45/65] gnu: ecryptfs-utils: " Maxim Cournoyer ` (21 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Leo Famulari, Tobias Geerinckx-Rice * gnu/packages/linux.scm (mdadm-static) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 45/65] gnu: ecryptfs-utils: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (44 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 44/65] gnu: mdadm-static: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 46/65] gnu: ghmm: " Maxim Cournoyer ` (20 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Leo Famulari, Tobias Geerinckx-Rice * gnu/packages/linux.scm (ecryptfs-utils) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 46/65] gnu: ghmm: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (45 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 45/65] gnu: ecryptfs-utils: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 47/65] gnu: %gcc-static: " Maxim Cournoyer ` (19 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/machine-learning.scm (ghmm) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 47/65] gnu: %gcc-static: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (46 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 46/65] gnu: ghmm: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 48/65] gnu: mumps: " Maxim Cournoyer ` (18 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/make-bootstrap.scm (%gcc-static) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 48/65] gnu: mumps: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (47 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 47/65] gnu: %gcc-static: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 49/65] gnu: hypre: " Maxim Cournoyer ` (17 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier * gnu/packages/maths.scm (mumps) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 49/65] gnu: hypre: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (48 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 48/65] gnu: mumps: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 50/65] gnu: lingeling: " Maxim Cournoyer ` (16 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier * gnu/packages/maths.scm (hypre) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 50/65] gnu: lingeling: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (49 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 49/65] gnu: hypre: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 51/65] gnu: guix-build-coordinator: " Maxim Cournoyer ` (15 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier * gnu/packages/maths.scm (lingeling) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 51/65] gnu: guix-build-coordinator: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (50 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 50/65] gnu: lingeling: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 52/65] gnu: nar-herder: " Maxim Cournoyer ` (14 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/package-management.scm (guix-build-oordinator) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 52/65] gnu: nar-herder: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (51 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 51/65] gnu: guix-build-coordinator: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 53/65] gnu: python-sip-4: " Maxim Cournoyer ` (13 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/package-management.scm (nar-herder) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 53/65] gnu: python-sip-4: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (52 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 52/65] gnu: nar-herder: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 54/65] gnu: ratpoison: " Maxim Cournoyer ` (12 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924 Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer, 宋文武 * gnu/packages/qt.scm (python-sip-4) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 54/65] gnu: ratpoison: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (53 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 53/65] gnu: python-sip-4: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 55/65] gnu: stklos: " Maxim Cournoyer ` (11 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/ratpoison.scm (ratpoison) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 55/65] gnu: stklos: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (54 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 54/65] gnu: ratpoison: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 56/65] gnu: python-sepolgen: " Maxim Cournoyer ` (10 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/scheme.scm (stklos) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 56/65] gnu: python-sepolgen: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (55 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 55/65] gnu: stklos: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 57/65] gnu: boxes: " Maxim Cournoyer ` (9 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/selinux.scm (python-sepolgen) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 57/65] gnu: boxes: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (56 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 56/65] gnu: python-sepolgen: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 58/65] gnu: simh: " Maxim Cournoyer ` (8 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/shellutils.scm (boxes) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 58/65] gnu: simh: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (57 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 57/65] gnu: boxes: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 59/65] gnu: stb: " Maxim Cournoyer ` (7 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/simh.scm (simh) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 59/65] gnu: stb: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (58 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 58/65] gnu: simh: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 60/65] gnu: info-reader: " Maxim Cournoyer ` (6 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/stb.scm (stb) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 60/65] gnu: info-reader: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (59 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 59/65] gnu: stb: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 61/65] gnu: git: " Maxim Cournoyer ` (5 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/texinfo.scm (info-reader) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 61/65] gnu: git: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (60 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 60/65] gnu: info-reader: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 62/65] gnu: ffmpeg-3.4: " Maxim Cournoyer ` (4 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/version-control.scm (git) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 62/65] gnu: ffmpeg-3.4: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (61 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 61/65] gnu: git: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 63/65] gnu: qemu: " Maxim Cournoyer ` (3 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/video.scm (ffmpeg-3.4) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 63/65] gnu: qemu: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (62 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 62/65] gnu: ffmpeg-3.4: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 64/65] gnu: ganeti: " Maxim Cournoyer ` (2 subsequent siblings) 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/virtualization.scm (qemu) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 64/65] gnu: ganeti: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (63 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 63/65] gnu: qemu: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 65/65] gnu: criu: " Maxim Cournoyer 2023-10-09 18:18 ` [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Liliana Marie Prikler 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer * gnu/packages/virtualization.scm (ganeti) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* bug#65924: [PATCH core-updates 65/65] gnu: criu: Import the correct set of modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (64 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 64/65] gnu: ganeti: " Maxim Cournoyer @ 2023-10-09 16:38 ` Maxim Cournoyer 2023-10-09 18:18 ` [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Liliana Marie Prikler 66 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 16:38 UTC (permalink / raw) To: 65924; +Cc: Maxim Cournoyer Partially fixes bug #66425. * gnu/packages/virtualization.scm (criu) [arguments] <modules>: 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 ^ permalink raw reply related [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer ` (65 preceding siblings ...) 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 65/65] gnu: criu: " Maxim Cournoyer @ 2023-10-09 18:18 ` Liliana Marie Prikler 2023-10-09 19:36 ` Maxim Cournoyer 66 siblings, 1 reply; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-09 18:18 UTC (permalink / raw) To: Maxim Cournoyer, 66426; +Cc: Bruno Victal Am Montag, dem 09.10.2023 um 12:33 -0400 schrieb 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. If we're going to do this anyway, let's go big: add modules and imported-modules to the fields of build-system and allow users to use that. Perhaps also add short-hands so that (default-modules gnu) expands to (build-system-modules gnu-build-system) and likewise for imported-modules. Cheers ^ permalink raw reply [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-09 18:18 ` [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Liliana Marie Prikler @ 2023-10-09 19:36 ` Maxim Cournoyer 2023-10-09 19:45 ` Liliana Marie Prikler 0 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-09 19:36 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: Bruno Victal, 66426 Hello, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 12:33 -0400 schrieb 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. > If we're going to do this anyway, let's go big: add modules and > imported-modules to the fields of build-system and allow users to use > that. I don't understand; what would that look like in practice? Isn't this already how it works? Build systems have #:modules and #:imported-modules arguments, which are provided via the 'arguments' field of a package. > Perhaps also add short-hands so that (default-modules gnu) > expands to (build-system-modules gnu-build-system) and likewise for > imported-modules. Ah! I understand the idea now. It feels a bit strange to me to attach such metadata to the build-system record itself though. At any rate, we could discuss this separately and do it in a future iteration, perhaps? The series posted here already has value in itself, and if we ever go to attach this information to build system objects instead of plain variables, we could use sed to adjust the code base. What do yo think? -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-09 19:36 ` Maxim Cournoyer @ 2023-10-09 19:45 ` Liliana Marie Prikler 2023-10-10 1:31 ` Maxim Cournoyer 0 siblings, 1 reply; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-09 19:45 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: Bruno Victal, 66426 Am Montag, dem 09.10.2023 um 15:36 -0400 schrieb Maxim Cournoyer: > Hello, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Am Montag, dem 09.10.2023 um 12:33 -0400 schrieb 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. > > If we're going to do this anyway, let's go big: add modules and > > imported-modules to the fields of build-system and allow users to > > use that. > > I don't understand; what would that look like in practice? Isn't > this already how it works? Build systems have #:modules and > #:imported-modules arguments, which are provided via the 'arguments' > field of a package. Well, no. The build-system record currently contains a name, description and lowering procedure, but no "immediately helpful" data for package writers. > > Perhaps also add short-hands so that (default-modules gnu) > > expands to (build-system-modules gnu-build-system) and likewise for > > imported-modules. > > Ah! I understand the idea now. It feels a bit strange to me to > attach such metadata to the build-system record itself though. At > any rate, we could discuss this separately and do it in a future > iteration, perhaps? > The series posted here already has value in itself, and if we ever go > to attach this information to build system objects instead of plain > variables, we could use sed to adjust the code base. > > What do yo think? Hmm, at the very least I'd like to bikeshed the variable names, hence my suggestion to encode it into the build system itself, which would allow any name locally. %default-anything reads weird to me, plus it's a mouthful for imported modules. WDYT about %gnu-build-modules and %gnu-build-system-modules, where %gnu-build-system-modules keeps its current intent for being imported? Alternatively we could also rename it to %gnu-build-imported-modules with a deprecated alias. Cheers ^ permalink raw reply [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-09 19:45 ` Liliana Marie Prikler @ 2023-10-10 1:31 ` Maxim Cournoyer 2023-10-10 4:14 ` Liliana Marie Prikler 0 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-10 1:31 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: Bruno Victal, 66426 Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 15:36 -0400 schrieb Maxim Cournoyer: >> Hello, >> >> Liliana Marie Prikler <liliana.prikler@gmail.com> writes: >> >> > Am Montag, dem 09.10.2023 um 12:33 -0400 schrieb 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. >> > If we're going to do this anyway, let's go big: add modules and >> > imported-modules to the fields of build-system and allow users to >> > use that. >> >> I don't understand; what would that look like in practice? Isn't >> this already how it works? Build systems have #:modules and >> #:imported-modules arguments, which are provided via the 'arguments' >> field of a package. > Well, no. The build-system record currently contains a name, > description and lowering procedure, but no "immediately helpful" data > for package writers. > >> > Perhaps also add short-hands so that (default-modules gnu) >> > expands to (build-system-modules gnu-build-system) and likewise for >> > imported-modules. >> >> Ah! I understand the idea now. It feels a bit strange to me to >> attach such metadata to the build-system record itself though. At >> any rate, we could discuss this separately and do it in a future >> iteration, perhaps? >> The series posted here already has value in itself, and if we ever go >> to attach this information to build system objects instead of plain >> variables, we could use sed to adjust the code base. >> >> What do yo think? > Hmm, at the very least I'd like to bikeshed the variable names, hence > my suggestion to encode it into the build system itself, which would > allow any name locally. %default-anything reads weird to me, plus it's > a mouthful for imported modules. It seems conventional to me: we have %default-subtitute-urls, %default-channels, %default-include (thousands of matches for '%default-' upon grepping). > WDYT about %gnu-build-modules and %gnu-build-system-modules, where > %gnu-build-system-modules keeps its current intent for being imported? > Alternatively we could also rename it to %gnu-build-imported-modules > with a deprecated alias. People have been adding %gnu-build-system-modules to #:modules erroneously. Not renaming that would ensure this keeps happening. Having 'imported-modules' in the name seems like it'd make things a bit easier to remember; thus, I think the proposed naming is adequate? -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-10 1:31 ` Maxim Cournoyer @ 2023-10-10 4:14 ` Liliana Marie Prikler 2023-10-10 14:36 ` Maxim Cournoyer 0 siblings, 1 reply; 106+ messages in thread From: Liliana Marie Prikler @ 2023-10-10 4:14 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: Bruno Victal, 66426 Am Montag, dem 09.10.2023 um 21:31 -0400 schrieb Maxim Cournoyer: > Hi Liliana, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > Hmm, at the very least I'd like to bikeshed the variable names, > > hence my suggestion to encode it into the build system itself, > > which would allow any name locally. %default-anything reads weird > > to me, plus it's a mouthful for imported modules. > > It seems conventional to me: we have %default-subtitute-urls, > %default-channels, %default-include (thousands of matches for > '%default-' upon grepping). Fair enough, but in the cases you've named it's still %default for more than one build system. Or do you by extension want %default-glib-or- gtk-imported-modules? That's quite a mouthful imho without any additional semantics. > > WDYT about %gnu-build-modules and %gnu-build-system-modules, where > > %gnu-build-system-modules keeps its current intent for being > > imported? > > Alternatively we could also rename it to %gnu-build-imported- > > modules > > with a deprecated alias. > > People have been adding %gnu-build-system-modules to #:modules > erroneously. Not renaming that would ensure this keeps happening. > Having 'imported-modules' in the name seems like it'd make things a > bit easier to remember; thus, I think the proposed naming is > adequate? Perhaps, but I think %gnu-build-modules and %gnu-build-imported-modules is better even with that reasoning. Cheers ^ permalink raw reply [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-10 4:14 ` Liliana Marie Prikler @ 2023-10-10 14:36 ` Maxim Cournoyer 2023-10-16 15:28 ` Maxim Cournoyer 0 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-10 14:36 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: Bruno Victal, 66426 Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Montag, dem 09.10.2023 um 21:31 -0400 schrieb Maxim Cournoyer: >> Hi Liliana, >> >> Liliana Marie Prikler <liliana.prikler@gmail.com> writes: >> > Hmm, at the very least I'd like to bikeshed the variable names, >> > hence my suggestion to encode it into the build system itself, >> > which would allow any name locally. %default-anything reads weird >> > to me, plus it's a mouthful for imported modules. >> >> It seems conventional to me: we have %default-subtitute-urls, >> %default-channels, %default-include (thousands of matches for >> '%default-' upon grepping). > Fair enough, but in the cases you've named it's still %default for more > than one build system. Or do you by extension want %default-glib-or- > gtk-imported-modules? That's quite a mouthful imho without any > additional semantics. That's what I was thinking to in the future yes; add %default-glib-or-gtk-imported-modules as well as %default-glib-or-gtk-modules, %default-cmake-imported-modules and %default-cmake-modules, etc. The variable names may be somewhat long, but they are not used often and they should be easy to auto-complete. >> > WDYT about %gnu-build-modules and %gnu-build-system-modules, where >> > %gnu-build-system-modules keeps its current intent for being >> > imported? >> > Alternatively we could also rename it to %gnu-build-imported- >> > modules >> > with a deprecated alias. >> >> People have been adding %gnu-build-system-modules to #:modules >> erroneously. Not renaming that would ensure this keeps happening. >> Having 'imported-modules' in the name seems like it'd make things a >> bit easier to remember; thus, I think the proposed naming is >> adequate? > Perhaps, but I think %gnu-build-modules and %gnu-build-imported-modules > is better even with that reasoning. So we'd use for example %glib-or-gtk-build-imported-modules? The difference is small to what I proposed (swap the leading default for an in-middle 'build' -- 2 characters), so I don't think your 'mouthful' argument holds, but I don't have much of an issue with it, except perhaps that 'build' is not directly attached to the module namespace, which is (guix build-systems gnu) for example. I still prefer my naming, but yeah, we're choosing the color of the bike shed :-). If others could tip in, that may help decide, otherwise I'd prefer leaving it as-is. Does that sound reasonable? -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-10 14:36 ` Maxim Cournoyer @ 2023-10-16 15:28 ` Maxim Cournoyer 2023-10-19 4:04 ` bug#66426: " Maxim Cournoyer 0 siblings, 1 reply; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-16 15:28 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: Bruno Victal, 66426 Hello, [...] >>> People have been adding %gnu-build-system-modules to #:modules >>> erroneously. Not renaming that would ensure this keeps happening. >>> Having 'imported-modules' in the name seems like it'd make things a >>> bit easier to remember; thus, I think the proposed naming is >>> adequate? >> Perhaps, but I think %gnu-build-modules and %gnu-build-imported-modules >> is better even with that reasoning. > > So we'd use for example %glib-or-gtk-build-imported-modules? The > difference is small to what I proposed (swap the leading default for an > in-middle 'build' -- 2 characters), so I don't think your 'mouthful' > argument holds, but I don't have much of an issue with it, except > perhaps that 'build' is not directly attached to the module namespace, > which is (guix build-systems gnu) for example. > > I still prefer my naming, but yeah, we're choosing the color of the bike > shed :-). If others could tip in, that may help decide, otherwise I'd > prefer leaving it as-is. Does that sound reasonable? I just realized that the whole series had been sent mistakenly to another series (seems I messed up using 'mumi send'): <https://issues.guix.gnu.org/65924#18>. I did spot a couple errors in that series that I've resolved locally. If nobody has further concerns, I'll merge it later today to the core-updates branch. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
* bug#66426: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules. 2023-10-16 15:28 ` Maxim Cournoyer @ 2023-10-19 4:04 ` Maxim Cournoyer 0 siblings, 0 replies; 106+ messages in thread From: Maxim Cournoyer @ 2023-10-19 4:04 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 66426-done, Bruno Victal Hi, Maxim Cournoyer <maxim.cournoyer@gmail.com> writes: > Hello, > > [...] > >>>> People have been adding %gnu-build-system-modules to #:modules >>>> erroneously. Not renaming that would ensure this keeps happening. >>>> Having 'imported-modules' in the name seems like it'd make things a >>>> bit easier to remember; thus, I think the proposed naming is >>>> adequate? >>> Perhaps, but I think %gnu-build-modules and %gnu-build-imported-modules >>> is better even with that reasoning. >> >> So we'd use for example %glib-or-gtk-build-imported-modules? The >> difference is small to what I proposed (swap the leading default for an >> in-middle 'build' -- 2 characters), so I don't think your 'mouthful' >> argument holds, but I don't have much of an issue with it, except >> perhaps that 'build' is not directly attached to the module namespace, >> which is (guix build-systems gnu) for example. >> >> I still prefer my naming, but yeah, we're choosing the color of the bike >> shed :-). If others could tip in, that may help decide, otherwise I'd >> prefer leaving it as-is. Does that sound reasonable? > > I just realized that the whole series had been sent mistakenly to > another series (seems I messed up using 'mumi send'): > <https://issues.guix.gnu.org/65924#18>. > > I did spot a couple errors in that series that I've resolved locally. > > If nobody has further concerns, I'll merge it later today to the > core-updates branch. I've now done so. Thanks for the review/comments! -- Thanks, Maxim ^ permalink raw reply [flat|nested] 106+ messages in thread
end of thread, other threads:[~2023-10-19 4:06 UTC | newest] Thread overview: 106+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-09-13 18:00 bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer 2023-09-13 22:27 ` Simon Tournier 2023-09-14 3:14 ` Maxim Cournoyer 2023-09-14 6:12 ` Simon Tournier 2023-10-04 16:14 ` Ludovic Courtès 2023-10-04 16:52 ` Simon Tournier 2023-10-05 3:41 ` Maxim Cournoyer 2023-10-05 16:21 ` Simon Tournier 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 0/3] Fix 'git submodule' in pure environments Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 1/3] gnu: git: Remove labels and use gexps Maxim Cournoyer 2023-10-08 7:09 ` Liliana Marie Prikler 2023-10-14 16:51 ` Ludovic Courtès 2023-10-15 19:55 ` Maxim Cournoyer 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Maxim Cournoyer 2023-10-08 7:03 ` Liliana Marie Prikler 2023-10-09 14:21 ` bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer 2023-10-09 16:49 ` Liliana Marie Prikler 2023-10-09 18:21 ` Maxim Cournoyer 2023-10-09 18:33 ` Liliana Marie Prikler 2023-10-09 19:25 ` Maxim Cournoyer 2023-10-09 19:28 ` Liliana Marie Prikler 2023-10-09 19:44 ` Maxim Cournoyer 2023-10-09 21:03 ` bokr 2023-10-10 4:28 ` Liliana Marie Prikler 2023-10-09 19:17 ` Maxim Cournoyer 2023-10-14 16:54 ` bug#65924: [PATCH core-updates 2/3] gnu: git: Invert inheritance relationship Ludovic Courtès 2023-10-08 3:18 ` bug#65924: [PATCH core-updates 3/3] gnu: git-minimal: Add coreutils and sed to PATH Maxim Cournoyer 2023-10-14 17:01 ` Ludovic Courtès 2023-10-15 20:03 ` Maxim Cournoyer 2023-10-17 15:15 ` Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 02/65] gnu: acl: Remove labels and trailing #t Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 03/65] gnu: acl: Import the correct set of modules Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 04/65] gnu: dirvish: " Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 05/65] gnu: fio: " Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 06/65] gnu: ccwl: " Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 07/65] gnu: boost: " Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 08/65] gnu: gcc-final: " Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 09/65] gnu: epson-inkjet-printer-escpr: " Maxim Cournoyer 2023-10-09 16:28 ` bug#65924: [PATCH core-updates 10/65] gnu: splix: " Maxim Cournoyer 2023-10-09 16:37 ` Maxim Cournoyer 2023-10-09 16:36 ` bug#65924: git searches coreutils and util-linux commands in PATH Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 11/65] gnu: guile-curl: Import the correct set of modules Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 12/65] gnu: dpkg: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 13/65] gnu: dezyne: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 14/65] gnu: fastcap: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 15/65] gnu: fasthenry: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 16/65] gnu: seabios-qemu: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 17/65] gnu: font-amiri: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 18/65] gnu: xdg-utils: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 19/65] gnu: tsukundere: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 20/65] gnu: gcc-4.9: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 21/65] gnu: make-libstdc++: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 22/65] gnu: custom-gcc: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 23/65] gnu: gdb: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 24/65] gnu: genimage: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 25/65] gnu: gimp: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 26/65] gnu: pinentry-rofi: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 27/65] gnu: mozjs: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 28/65] gnu: icecat-minimal: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 29/65] gnu: icedove-minimal: " Maxim Cournoyer 2023-10-09 16:37 ` bug#65924: [PATCH core-updates 30/65] gnu: python-graph-tool: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 31/65] gnu: artanis: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 32/65] gnu: guilescript: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 33/65] gnu: guile-dsv: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 34/65] gnu: guile-di: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 35/65] gnu: guile-hall: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 36/65] gnu: haunt: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 37/65] gnu: guile-studio: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 38/65] gnu: guile-libyaml: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 39/65] gnu: guile-gitlab: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 40/65] gnu: guile-smc: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 41/65] gnu: rime-data: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 42/65] gnu: jbigkit: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 43/65] gnu: uftrace: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 44/65] gnu: mdadm-static: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 45/65] gnu: ecryptfs-utils: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 46/65] gnu: ghmm: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 47/65] gnu: %gcc-static: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 48/65] gnu: mumps: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 49/65] gnu: hypre: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 50/65] gnu: lingeling: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 51/65] gnu: guix-build-coordinator: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 52/65] gnu: nar-herder: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 53/65] gnu: python-sip-4: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 54/65] gnu: ratpoison: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 55/65] gnu: stklos: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 56/65] gnu: python-sepolgen: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 57/65] gnu: boxes: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 58/65] gnu: simh: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 59/65] gnu: stb: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 60/65] gnu: info-reader: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 61/65] gnu: git: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 62/65] gnu: ffmpeg-3.4: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 63/65] gnu: qemu: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 64/65] gnu: ganeti: " Maxim Cournoyer 2023-10-09 16:38 ` bug#65924: [PATCH core-updates 65/65] gnu: criu: " Maxim Cournoyer 2023-10-09 18:18 ` [bug#66426] [PATCH 00/65] Export %default-gnu-imported-modules and %default-gnu-modules Liliana Marie Prikler 2023-10-09 19:36 ` Maxim Cournoyer 2023-10-09 19:45 ` Liliana Marie Prikler 2023-10-10 1:31 ` Maxim Cournoyer 2023-10-10 4:14 ` Liliana Marie Prikler 2023-10-10 14:36 ` Maxim Cournoyer 2023-10-16 15:28 ` Maxim Cournoyer 2023-10-19 4:04 ` bug#66426: " Maxim Cournoyer
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.