From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id sN3bBF1wJGVkHQAAG6o9tA:P1 (envelope-from ) for ; Mon, 09 Oct 2023 23:27:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sN3bBF1wJGVkHQAAG6o9tA (envelope-from ) for ; Mon, 09 Oct 2023 23:27:57 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 68727612FB for ; Mon, 9 Oct 2023 23:27:56 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="l/X8xKIz"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696886876; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=foVBjrDZ9PSCtvzfBGiSh/GcMzUCDrYZ3JqNlPnDtHo=; b=FlE7bAXDSk7WxjuiWxsdLdMqN2QL6i2nQdIvZkyS3ePoNSCxHoTGJtUzEcaXPJcbmpraAz 7euuBJ7iCU+XkG+4rXxfd3SZ7MQ7D6xWuaXMCBeMPbWQa+Am4ZPbs1Lp7gOG1VrAmQjojM X1FQB4iB8YQNggRU8y5MuPsmUt3vknepKu/Jin7+TxM9oOcsjmYOWiBmAXd24fuGgwpZmj hP9VxHrW1ug+Ax8faUVKnLn9tPGIC7NoG6N3R3UeldefMJBk3Q9GsrS6Phhs3pReXUaAYk I4mq45MMdAUqs0HU8CAR/wviXF0QsHeWKPmspPi/gxs6AIuYQmQ/PcCUEP5nyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="l/X8xKIz"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696886876; a=rsa-sha256; cv=none; b=pbgJYd7w/GQF14yRNcjEJsiW+ebtElJEXhJ6o2L2PaLXzey47MeVu2DClRAjiKn7JIcb9P GY5c7bd3bZ4zsnP2K8vx8g3Z3gcDd3ycJRPW+PsuPBTj+0wiDouLz3Z+EIboHrKUgkvNBA 5Mg/DUVIUHqF1QqcqNtmnf5VelYN/ORbk33dtDsHbcfRTzSKrUKhILupMx/wzzkP5W+lBF e8zPmHvDTOOFD2D+BU6vmSCufwrVhZ/XU1em9/qUmuf1V9Nk4S6MOH+BEkrw3cBmdiJ+UK eB0I+7EHCu1VSFIJkTG2yqDW84m/zOwpeVUrTeFYS7GBixAdreTXjRPtKiQBIQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxmh-00029n-M1; Mon, 09 Oct 2023 17:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qptIM-00035d-Qo for bug-guix@gnu.org; Mon, 09 Oct 2023 12:39:50 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qptIM-0000l5-IL; Mon, 09 Oct 2023 12:39:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qptIb-0003kW-5Q; Mon, 09 Oct 2023 12:40:05 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#65924: [PATCH core-updates 01/65] build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, andrew@trop.in, bjoern.hoefling@bjoernhoefling.de, guix@cbaines.net, efraim@flashner.co.il, bavier@posteo.net, glv@posteo.net, jonathan.brielmaier@web.de, julien@lepiller.eu, cox.katherine.e+guix@gmail.com, lars@6xq.net, leo@famulari.name, liliana.prikler@gmail.com, marius@gnu.org, maxim.cournoyer@gmail.com, me@bonfacemunyoki.com, philip@philipmcgrath.com, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, vagrant@debian.org, all_but_last@163.com, jgart@dismail.de, pukkamustard@posteo.net, iyzsong@envs.net, bug-guix@gnu.org Resent-Date: Mon, 09 Oct 2023 16:40:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65924 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 65924@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Andrew Tropin , =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= , 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 , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Andreas Enge , Andrew Tropin , =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= , 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 , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 65924-submit@debbugs.gnu.org id=B65924.169686959314237 (code B ref 65924); Mon, 09 Oct 2023 16:40:05 +0000 Received: (at 65924) by debbugs.gnu.org; 9 Oct 2023 16:39:53 +0000 Received: from localhost ([127.0.0.1]:60904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptIL-0003gy-Ew for submit@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:53 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:42006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qptID-0003fc-Ko for 65924@debbugs.gnu.org; Mon, 09 Oct 2023 12:39:45 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-77574c2cffdso395579385a.0 for <65924@debbugs.gnu.org>; Mon, 09 Oct 2023 09:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696869555; x=1697474355; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=foVBjrDZ9PSCtvzfBGiSh/GcMzUCDrYZ3JqNlPnDtHo=; b=l/X8xKIzX6/L3YZO2n5KU8VckjJh5UF+FbHXhMlquMvewkr7X5db9Bc/duoW+MwUdB rG/10IyjMlqY78ESC3o1lpbRP5iebWAPmUphH97m8qbuARCGLmp+bOt7sSTaQuDVUGac jyJmAQ9/T/QEQDIO3pw1OoT7TBuNyhEOrZPMsYTXtY6cphmV+vro2N1hvO0vKycxVUAg KEq7PMBzrrxwECvqrhLRyc1dIXlQ3d3ZWCWcFpdVSZgmtaAjroaVnrIwnyPTzUdRJhy3 NRDE6Z8KE7qViRQ27beAcrMknayVZVWP9Olz1WqDiSuTQcfr65y8iEPcwoCNijn0PpFN +a3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869555; x=1697474355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=foVBjrDZ9PSCtvzfBGiSh/GcMzUCDrYZ3JqNlPnDtHo=; b=MBaMS/8juQOFyT9WdMX4nqQzVVRtMShXdN8vToq8p3ILbtdt8eFdsuXuRQP3r2gG+W FUgdd+WYai80Vq0GFu5mdAYWBNtDbHaJ7itFxjyc2oWu8jZVHaCmK8K72av823YSmycJ /24+cfmZyEO+81M+h4ORvkYFgCYjxfbbDdvuGVChVEXmn+mGYaFo7CZ6rin5O0Gn/302 BQRDLSw4eoKy2SgLJZ74I3J2Wv1EV6BZMNXjdfzwDBaBM3sciGqnAiLAZOQLzZRm/Obe TlgwqVMz8VWswNeh2Krb7bhIGUO+uxjogA+yGL1nIIFlfPu8v6OfAiV5wc0pIFrn67iP Vzxw== X-Gm-Message-State: AOJu0YyPQP1MVZ6Co/BxxyPvnXdwILSR9Fk21/OQ8LknAoWpbzfrLQ/M qD4LoYWqwBo349+ciABvFrjeN9p35nA= X-Google-Smtp-Source: AGHT+IET5iKCDQPCzoVH+5STDXUON3dzkMP4cYx2fyOn0IQjYQU1XtPihnHZmAnb0YsUoGuZfzR/hg== X-Received: by 2002:a05:620a:40c5:b0:76c:b468:2efe with SMTP id g5-20020a05620a40c500b0076cb4682efemr16828769qko.20.1696869554101; Mon, 09 Oct 2023 09:39:14 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id t10-20020a0ca68a000000b0065afcf19e23sm3946891qva.62.2023.10.09.09.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:39:13 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 9 Oct 2023 12:37:30 -0400 Message-ID: <7ab0ec82c69e636c35eb22ff22291f2ba40ea4c1.1696868939.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 09 Oct 2023 17:27:26 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 68727612FB X-Spam-Score: 4.77 X-Migadu-Spam-Score: 4.77 X-Migadu-Scanner: mx1.migadu.com X-TUID: 7POuPlZd6k+4 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