ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.

Browse source 
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.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
This commit is contained in:
Maxim Cournoyer 2023-10-09 11:10:48 -04:00 committed by Ludovic Courtès
parent 0e881505f1
commit f59df1aa3c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
117 changed files with 205 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/acl.scm
View file

@ -52,7 +52,7 @@ (define-public acl
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags '("--disable-static") #:configure-flags '("--disable-static")
#:tests? ,(not (or (%current-target-system) #:tests? ,(not (or (%current-target-system)
(target-hurd?))) (target-hurd?)))

2
gnu/packages/apl.scm
View file

@ -142,7 +142,7 @@ (define-public dzaima-apl
(native-inputs (list `(,openjdk18 "jdk") zip)) (native-inputs (list `(,openjdk18 "jdk") zip))
(arguments (arguments
(list (list
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build ant-build-system)) (guix build ant-build-system))
#:modules `((guix build gnu-build-system) #:modules `((guix build gnu-build-system)
((guix build ant-build-system) #:prefix ant:) ((guix build ant-build-system) #:prefix ant:)

6
gnu/packages/axoloti.scm
View file

@ -228,7 +228,7 @@ (define-public axoloti-patcher
(sxml xpath) (sxml xpath)
(sxml transform)) (sxml transform))
#:imported-modules `((guix build ant-build-system) #:imported-modules `((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -380,7 +380,7 @@ (define-public axoloti-patcher-next
(sxml xpath) (sxml xpath)
(sxml transform)) (sxml transform))
#:imported-modules ((guix build ant-build-system) #:imported-modules ((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'make-git-checkout-writable (add-after 'unpack 'make-git-checkout-writable
@ -790,7 +790,7 @@ (define-public ksoloti-patcher
(sxml xpath) (sxml xpath)
(sxml transform)) (sxml transform))
#:imported-modules `((guix build ant-build-system) #:imported-modules `((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)

2
gnu/packages/backup.scm
View file

@ -843,7 +843,7 @@ (define-public dirvish
"1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb")))) "1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb"))))
(arguments (arguments
`(#:modules ((ice-9 match) (ice-9 rdelim) `(#:modules ((ice-9 match) (ice-9 rdelim)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
;; This mostly mirrors the steps taken in the install.sh that ships ;; This mostly mirrors the steps taken in the install.sh that ships
;; with dirvish, but simplified because we aren't prompting interactively ;; with dirvish, but simplified because we aren't prompting interactively

2
gnu/packages/base.scm
View file

@ -1356,7 +1356,7 @@ (define-public (make-glibc-locales glibc)
,@modules)) ,@modules))
((#:imported-modules modules '()) ((#:imported-modules modules '())
`((gnu build locale) `((gnu build locale)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(replace 'build (replace 'build

2
gnu/packages/benchmark.scm
View file

@ -90,7 +90,7 @@ (define-public fio
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:modules (list #:modules
`(,@%gnu-build-system-modules `(,@%default-gnu-imported-modules
(ice-9 textual-ports)) (ice-9 textual-ports))
#:test-target "test" #:test-target "test"
#:configure-flags #:configure-flags

4
gnu/packages/bioinformatics.scm
View file

@ -22861,9 +22861,9 @@ (define-public ccwl
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
#:modules (((guix build guile-build-system) #:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-more-source-shebangs (add-after 'patch-source-shebangs 'patch-more-source-shebangs

4
gnu/packages/boost.scm
View file

@ -114,9 +114,9 @@ (define-public boost
(arguments (arguments
(list (list
#:imported-modules `((guix build python-build-system) #:imported-modules `((guix build python-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules `(((guix build python-build-system) #:select (python-version)) #:modules `(((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags
#~(let ((icu (dirname (dirname (search-input-file #~(let ((icu (dirname (dirname (search-input-file

4
gnu/packages/bootloaders.scm
View file

@ -1044,7 +1044,7 @@ (define*-public (make-u-boot-package board triplet
,@modules)) ,@modules))
((#:imported-modules imported-modules '()) ((#:imported-modules imported-modules '())
`((guix build kconfig) `((guix build kconfig)
,@%gnu-build-system-modules ,@%default-gnu-imported-modules
,@imported-modules)) ,@imported-modules))
((#:test-target _ "test") ((#:test-target _ "test")
"test") "test")
@ -1949,7 +1949,7 @@ (define-public ipxe
(ice-9 regex) (ice-9 regex)
(rnrs bytevectors)) (rnrs bytevectors))
#:imported-modules `((guix base32) #:imported-modules `((guix base32)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:make-flags #:make-flags
;; XXX: 'BUILD_ID' is used to determine when another ROM in the ;; XXX: 'BUILD_ID' is used to determine when another ROM in the
;; system contains identical code in order to save space within the ;; system contains identical code in order to save space within the

2
gnu/packages/bqn.scm
View file

@ -52,7 +52,7 @@ (define-public dbqn
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build ant-build-system)) (guix build ant-build-system))
#:modules `((guix build gnu-build-system) #:modules `((guix build gnu-build-system)
((guix build ant-build-system) ((guix build ant-build-system)

8
gnu/packages/commencement.scm
View file

@ -145,7 +145,7 @@ (define bootar
#:tests? #f #:tests? #f
#:guile ,%bootstrap-guile #:guile ,%bootstrap-guile
#:imported-modules ((guix build gnu-bootstrap) #:imported-modules ((guix build gnu-bootstrap)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(begin (begin
(use-modules (guix build gnu-bootstrap)) (use-modules (guix build gnu-bootstrap))
@ -185,7 +185,7 @@ (define gash-boot
#:tests? #f #:tests? #f
#:guile ,%bootstrap-guile #:guile ,%bootstrap-guile
#:imported-modules ((guix build gnu-bootstrap) #:imported-modules ((guix build gnu-bootstrap)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(begin (begin
(use-modules (guix build gnu-bootstrap)) (use-modules (guix build gnu-bootstrap))
@ -214,7 +214,7 @@ (define gash-utils-boot
#:tests? #f #:tests? #f
#:guile ,%bootstrap-guile #:guile ,%bootstrap-guile
#:imported-modules ((guix build gnu-bootstrap) #:imported-modules ((guix build gnu-bootstrap)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(begin (begin
(use-modules (guix build gnu-bootstrap)) (use-modules (guix build gnu-bootstrap))
@ -3236,7 +3236,7 @@ (define gcc-final
;; Additional modules for the libstdc++ phase below. ;; Additional modules for the libstdc++ phase below.
#:modules `((srfi srfi-1) #:modules `((srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
(substitute-keyword-arguments (package-arguments gcc) (substitute-keyword-arguments (package-arguments gcc)
((#:make-flags flags) ((#:make-flags flags)

2
gnu/packages/cpp.scm
View file

@ -2210,7 +2210,7 @@ (define-public libxsd-frontend
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:imported-modules ((guix build copy-build-system) #:imported-modules ((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules (((guix build copy-build-system) #:prefix copy:) #:modules (((guix build copy-build-system) #:prefix copy:)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils)) (guix build utils))

2
gnu/packages/cross-base.scm
View file

@ -359,7 +359,7 @@ (define* (cross-gcc target
(arguments (arguments
`(#:implicit-inputs? #f `(#:implicit-inputs? #f
#:imported-modules ((gnu build cross-toolchain) #:imported-modules ((gnu build cross-toolchain)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(gnu build cross-toolchain) (gnu build cross-toolchain)

6
gnu/packages/cups.scm
View file

@ -569,7 +569,7 @@ (define-public hplip
(arguments (arguments
(list (list
#:imported-modules `((guix build python-build-system) #:imported-modules `((guix build python-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules '((guix build gnu-build-system) #:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
((guix build python-build-system) #:prefix python:)) ((guix build python-build-system) #:prefix python:))
@ -888,7 +888,7 @@ (define-public epson-inkjet-printer-escpr
(arguments (arguments
(list #:modules (list #:modules
`((srfi srfi-26) `((srfi srfi-26)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags #:configure-flags
#~(list "--disable-static" #~(list "--disable-static"
(string-append "--prefix=" #$output) (string-append "--prefix=" #$output)
@ -949,7 +949,7 @@ (define-public splix
(arguments (arguments
`(#:modules `(#:modules
((srfi srfi-26) ((srfi srfi-26)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:make-flags #:make-flags
(list (string-append "CUPSDRV=" (list (string-append "CUPSDRV="
(assoc-ref %outputs "out") "/share/cups/drv") (assoc-ref %outputs "out") "/share/cups/drv")

4
gnu/packages/curl.scm
View file

@ -246,9 +246,9 @@ (define-public guile-curl
(arguments (arguments
`(#:modules (((guix build guile-build-system) `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags (list (string-append #:configure-flags (list (string-append
"--with-guilesitedir=" "--with-guilesitedir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")

2
gnu/packages/debian.scm
View file

@ -581,7 +581,7 @@ (define-public dpkg
(arguments (arguments
(list #:modules (list #:modules
`((srfi srfi-71) `((srfi srfi-71)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'bootstrap 'patch-version (add-before 'bootstrap 'patch-version

4
gnu/packages/dezyne.scm
View file

@ -56,7 +56,7 @@ (define-public dezyne
(arguments (arguments
(list (list
#:modules `((ice-9 popen) #:modules `((ice-9 popen)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'setenv (add-before 'configure 'setenv
@ -132,7 +132,7 @@ (define-public scmackerel
(arguments (arguments
(list (list
#:modules `((ice-9 popen) #:modules `((ice-9 popen)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'setenv (add-before 'configure 'setenv

2
gnu/packages/dictionaries.scm
View file

@ -280,7 +280,7 @@ (define-public translate-shell
(assoc-ref emacs:%standard-phases 'build))) (assoc-ref emacs:%standard-phases 'build)))
#:make-flags (list (string-append "PREFIX=" %output) #:make-flags (list (string-append "PREFIX=" %output)
"NETWORK_ACCESS=no test") "NETWORK_ACCESS=no test")
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)

4
gnu/packages/djvu.scm
View file

@ -309,7 +309,7 @@ (define-public didjvu
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:test-target "test" #:test-target "test"
#:phases #:phases
@ -395,7 +395,7 @@ (define-public ocrodjvu
#:modules '((guix build gnu-build-system) #:modules '((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:test-target "test" #:test-target "test"
#:phases #:phases

2
gnu/packages/docker.scm
View file

@ -343,7 +343,7 @@ (define-public docker
(guix build union) (guix build union)
(guix build utils)) (guix build utils))
#:imported-modules #:imported-modules
`(,@%gnu-build-system-modules `(,@%default-gnu-imported-modules
(guix build union) (guix build union)
(guix build go-build-system)) (guix build go-build-system))
#:phases #:phases

20
gnu/packages/emacs-xyz.scm
View file

@ -2564,7 +2564,7 @@ (define-public emacs-shroud
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags (list (string-append "--with-lispdir=" #:configure-flags (list (string-append "--with-lispdir="
@ -2675,8 +2675,8 @@ (define-public emacs-haskell-mode
#:modules `((ice-9 match) #:modules `((ice-9 match)
(srfi srfi-26) (srfi srfi-26)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
@ -3609,7 +3609,7 @@ (define-public emacs-w3m
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils) (guix build utils)
(guix build emacs-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-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
@ -4213,7 +4213,7 @@ (define-public emacs-eweouz
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils) (guix build utils)
(guix build emacs-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-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
@ -4804,7 +4804,7 @@ (define-public emacs-howm
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
@ -5945,7 +5945,7 @@ (define-public emacs-pdf-tools
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils) (guix build utils)
(guix build emacs-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-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
@ -6154,7 +6154,7 @@ (define-public emacs-guix
#:modules '((guix build gnu-build-system) #:modules '((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)) (guix build utils))
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
@ -9257,7 +9257,7 @@ (define-public emacs-dvc
#:modules `((guix build gnu-build-system) #:modules `((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)) (guix build utils))
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
@ -37777,7 +37777,7 @@ (define-public emacs-ddskk
(list #:modules '((guix build gnu-build-system) (list #:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:test-target "test" #:test-target "test"
#:phases #:phases

2
gnu/packages/emulators.scm
View file

@ -190,7 +190,7 @@ (define-public blastem
#:tests? #f ; No check target and custom tests don't seem to build #:tests? #f ; No check target and custom tests don't seem to build
#:imported-modules #:imported-modules
((guix build copy-build-system) ((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules #:modules
(((guix build copy-build-system) (((guix build copy-build-system)
#:prefix copy:) #:prefix copy:)

6
gnu/packages/engineering.scm
View file

@ -568,7 +568,7 @@ (define-public fastcap
#:parallel-build? #f #:parallel-build? #f
#:tests? #f ;; no tests-suite #:tests? #f ;; no tests-suite
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'build 'make-doc (add-after 'build 'make-doc
@ -665,7 +665,7 @@ (define-public fasthenry
#:parallel-build? #f #:parallel-build? #f
#:tests? #f ;; no tests-suite #:tests? #f ;; no tests-suite
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -3390,7 +3390,7 @@ (define-public poke
(list (list
#:imported-modules `((guix build emacs-build-system) #:imported-modules `((guix build emacs-build-system)
(guix build emacs-utils) (guix build emacs-utils)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules '((guix build gnu-build-system) #:modules '((guix build gnu-build-system)
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils)) (guix build utils))

2
gnu/packages/esolangs.scm
View file

@ -135,7 +135,7 @@ (define-public shakespeare-spl
"shakespeare-spl-fix-grammar.patch")))) "shakespeare-spl-fix-grammar.patch"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%default-gnu-imported-modules
(guix build copy-build-system)) (guix build copy-build-system))
#:modules ((guix build copy-build-system) #:modules ((guix build copy-build-system)
((guix build gnu-build-system) #:prefix gnu:) ((guix build gnu-build-system) #:prefix gnu:)

2
gnu/packages/firmware.scm
View file

@ -680,7 +680,7 @@ (define-public seabios-qemu
(supported-systems %supported-systems) (supported-systems %supported-systems)
(arguments (arguments
(substitute-keyword-arguments (package-arguments seabios) (substitute-keyword-arguments (package-arguments seabios)
((#:modules modules %gnu-build-system-modules) ((#:modules modules %default-gnu-imported-modules)
`((ice-9 match) `((ice-9 match)
(ice-9 threads) (ice-9 threads)
,@modules)) ,@modules))

4
gnu/packages/fonts.scm
View file

@ -980,9 +980,9 @@ (define-public font-amiri
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build font-build-system)) (guix build font-build-system))
#:modules `(,@%gnu-build-system-modules #:modules `(,@%default-gnu-imported-modules
((guix build font-build-system) #:prefix font:)) ((guix build font-build-system) #:prefix font:))
#:phases #~(modify-phases %standard-phases #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source

5
gnu/packages/freedesktop.scm
View file

@ -523,7 +523,7 @@ (define xdgmime
#:make-flags #~(list (string-append "DESTDIR=" #$output) #:make-flags #~(list (string-append "DESTDIR=" #$output)
#$(string-append "CC=" (cc-for-target))) #$(string-append "CC=" (cc-for-target)))
#:imported-modules `((guix build copy-build-system) #:imported-modules `((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules `((guix build gnu-build-system) #:modules `((guix build gnu-build-system)
((guix build copy-build-system) #:prefix copy:) ((guix build copy-build-system) #:prefix copy:)
(guix build utils)) (guix build utils))
@ -643,8 +643,7 @@ (define-public xdg-utils
(list (list
#:tests? #f ;no check target #:tests? #f ;no check target
#:modules `((srfi srfi-26) #:modules `((srfi srfi-26)
(guix build gnu-build-system) ,@%default-gnu-modules)
(guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-paths (add-after 'unpack 'patch-hardcoded-paths

4
gnu/packages/game-development.scm
View file

@ -695,9 +695,9 @@ (define-public tsukundere
(srfi srfi-1) (srfi srfi-1)
((guix build guile-build-system) ((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-command (add-after 'unpack 'patch-command

6
gnu/packages/gcc.scm
View file

@ -420,7 +420,7 @@ (define-public gcc-4.8
;; For native builds of some GCC versions the C++ include path needs to ;; For native builds of some GCC versions the C++ include path needs to
;; be adjusted so it does not interfere with GCC's own build processes. ;; be adjusted so it does not interfere with GCC's own build processes.
(substitute-keyword-arguments (package-arguments parent) (substitute-keyword-arguments (package-arguments parent)
((#:modules modules %gnu-build-system-modules) ((#:modules modules %default-gnu-imported-modules)
`((srfi srfi-1) `((srfi srfi-1)
,@modules)) ,@modules))
((#:phases phases) ((#:phases phases)
@ -955,7 +955,7 @@ (define-public (make-libstdc++ gcc)
#:out-of-source? #t #:out-of-source? #t
#:modules `((srfi srfi-1) #:modules `((srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@(if (version>=? (package-version gcc) "11") #$@(if (version>=? (package-version gcc) "11")
@ -1103,7 +1103,7 @@ (define* (custom-gcc gcc name languages
(native-search-paths search-paths) (native-search-paths search-paths)
(arguments (arguments
(substitute-keyword-arguments (package-arguments gcc) (substitute-keyword-arguments (package-arguments gcc)
((#:modules modules %gnu-build-system-modules) ((#:modules modules %default-gnu-imported-modules)
`(,@modules `(,@modules
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)

2
gnu/packages/gdb.scm
View file

@ -64,7 +64,7 @@ (define-public gdb/pinned
`(#:tests? #f ;FIXME: 217 unexpected failures `(#:tests? #f ;FIXME: 217 unexpected failures
#:out-of-source? #t #:out-of-source? #t
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-paths (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)

2
gnu/packages/genimage.scm
View file

@ -61,7 +61,7 @@ (define-public genimage
(arguments (arguments
`(#:modules `(#:modules
((ice-9 match) ((ice-9 match)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'guixify (add-after 'unpack 'guixify

2
gnu/packages/geo.scm
View file

@ -2816,7 +2816,7 @@ (define-public grass
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases

2
gnu/packages/gimp.scm
View file

@ -354,7 +354,7 @@ (define-public gimp
(list (list
#:modules `((ice-9 popen) #:modules `((ice-9 popen)
(ice-9 rdelim) (ice-9 rdelim)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-gcc-reference (add-after 'unpack 'remove-gcc-reference

2
gnu/packages/gnome.scm
View file

@ -11835,7 +11835,7 @@ (define-public soundconverter
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)
(guix build glib-or-gtk-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) #:modules ((guix build glib-or-gtk-build-system)
(guix build utils) (guix build utils)

2
gnu/packages/gnucash.scm
View file

@ -81,7 +81,7 @@ (define-public gnucash
#:test-target "check" #:test-target "check"
#:configure-flags #~(list "-DWITH_PYTHON=ON") #:configure-flags #~(list "-DWITH_PYTHON=ON")
#:make-flags #~(list "GUILE_AUTO_COMPILE=0") #: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 cmake-build-system)
(guix build glib-or-gtk-build-system)) (guix build glib-or-gtk-build-system))
#:modules '((guix build cmake-build-system) #:modules '((guix build cmake-build-system)

2
gnu/packages/gnupg.scm
View file

@ -997,7 +997,7 @@ (define-public pinentry-rofi
`(#:modules `(#:modules
((ice-9 match) ((ice-9 match)
(ice-9 ftw) (ice-9 ftw)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases (modify-phases
%standard-phases %standard-phases

6
gnu/packages/gnuzilla.scm
View file

@ -119,7 +119,7 @@ (define-public mozjs
(list (list
#:imported-modules %cargo-utils-modules ;for `generate-all-checksums' #:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
#:modules `((guix build cargo-utils) #:modules `((guix build cargo-utils)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:test-target "check-jstests" #:test-target "check-jstests"
#:configure-flags #:configure-flags
#~(list #~(list
@ -868,7 +868,7 @@ (define-public icecat-minimal
(rnrs io ports) (rnrs io ports)
(guix elf) (guix elf)
(guix build gremlin) (guix build gremlin)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'apply-guix-specific-patches (add-after 'unpack 'apply-guix-specific-patches
@ -1344,7 +1344,7 @@ (define-public icedove-minimal
#:modules `((guix build utils) ;find-files #:modules `((guix build utils) ;find-files
(sxml simple) (sxml simple)
(ice-9 regex) (ice-9 regex)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-cargo-checksums (add-after 'patch-source-shebangs 'patch-cargo-checksums

4
gnu/packages/graph.scm
View file

@ -840,9 +840,9 @@ (define-public python-graph-tool
"1bmck5fcihj9lr5kd8x624bdi9xhfc13pl4mwzv74jr5lz07kr6d")))) "1bmck5fcihj9lr5kd8x624bdi9xhfc13pl4mwzv74jr5lz07kr6d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:modules (,@%gnu-build-system-modules #:modules (,@%default-gnu-imported-modules
((guix build python-build-system) #:select (site-packages))) ((guix build python-build-system) #:select (site-packages)))
;; The build process peaks around 4GB/RAM per core. ;; The build process peaks around 4GB/RAM per core.
#:parallel-build? #f #:parallel-build? #f

41
gnu/packages/guile-xyz.scm
View file

@ -201,9 +201,9 @@ (define-public artanis
(arguments (arguments
`(#:modules (((guix build guile-build-system) `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:make-flags #:make-flags
;; TODO: The documentation must be built with the `docs' target. ;; TODO: The documentation must be built with the `docs' target.
(let* ((out (assoc-ref %outputs "out")) (let* ((out (assoc-ref %outputs "out"))
@ -290,9 +290,9 @@ (define-public guilescript
`(#:make-flags '("GUILE_AUTO_COMPILE=0") `(#:make-flags '("GUILE_AUTO_COMPILE=0")
#:modules (((guix build guile-build-system) #:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'install 'wrap-guilescript (add-after 'install 'wrap-guilescript
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -786,9 +786,9 @@ (define-public guile-dsv
(arguments (arguments
`(#:modules (((guix build guile-build-system) `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'strip) (delete 'strip)
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
@ -1905,9 +1905,9 @@ (define-public guile-dbi
(arguments (arguments
`(#:modules (((guix build guile-build-system) `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags #:configure-flags
(list (string-append (list (string-append
"--with-guile-site-dir=" %output "/share/guile/site/" "--with-guile-site-dir=" %output "/share/guile/site/"
@ -2138,10 +2138,10 @@ (define-public guile-hall
#:modules `(((guix build guile-build-system) #:modules `(((guix build guile-build-system)
#:select #:select
(target-guile-effective-version)) (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(with-imported-modules `((guix build guile-build-system) (with-imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'hall-wrap-binaries (add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -2287,7 +2287,7 @@ (define-public guile-wisp
(guix build emacs-utils) (guix build emacs-utils)
(ice-9 rdelim) (ice-9 rdelim)
(ice-9 popen)) (ice-9 popen))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
@ -2696,7 +2696,7 @@ (define-public guile-ncurses
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
(guix build utils)) (guix build utils))
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags (list "--with-gnu-filesystem-hierarchy") #:configure-flags (list "--with-gnu-filesystem-hierarchy")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -3015,7 +3015,7 @@ (define-public haunt
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 match) (ice-9 ftw) `(#:modules ((ice-9 match) (ice-9 ftw)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:tests? #f ; test suite is non-deterministic :( #:tests? #f ; test suite is non-deterministic :(
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'install 'wrap-haunt (add-after 'install 'wrap-haunt
@ -3300,7 +3300,7 @@ (define-public guile-studio
`(#:modules `(#:modules
((ice-9 match) ((ice-9 match)
(srfi srfi-1) (srfi srfi-1)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:tests? #f ; there are none #:tests? #f ; there are none
#:make-flags #:make-flags
(list (string-append "PICT_DIR=" (list (string-append "PICT_DIR="
@ -5729,9 +5729,9 @@ (define-public guile-libyaml
(arguments (arguments
`(#:modules (((guix build guile-build-system) `(#:modules (((guix build guile-build-system)
#:prefix guile:) #:prefix guile:)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:tests? #false ; there are none #:tests? #false ; there are none
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -5951,9 +5951,9 @@ (define-public guile-gitlab
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:modules (((guix build guile-build-system) #:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -5980,6 +5980,7 @@ (define-public guile-gitlab
(native-inputs (list autoconf automake pkg-config texinfo)) (native-inputs (list autoconf automake pkg-config texinfo))
(inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib (inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib
guile2.2-gnutls)) guile2.2-gnutls))
(home-page "https://github.com/artyom-poptsov/guile-gitlab") (home-page "https://github.com/artyom-poptsov/guile-gitlab")
(synopsis "Guile interface to GitLab") (synopsis "Guile interface to GitLab")
(description (description
@ -6007,9 +6008,9 @@ (define-public guile-smc
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:modules (((guix build guile-build-system) #:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'strip) (delete 'strip)

2
gnu/packages/ibus.scm
View file

@ -521,7 +521,7 @@ (define-public rime-data
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((ice-9 match) `(#:modules ((ice-9 match)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:tests? #f ; no tests #:tests? #f ; no tests
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases #:phases

2
gnu/packages/image.scm
View file

@ -895,7 +895,7 @@ (define-public jbigkit
(outputs (list "out" "pbmtools")) (outputs (list "out" "pbmtools"))
(arguments (arguments
`(#:modules ((srfi srfi-26) `(#:modules ((srfi srfi-26)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script

2
gnu/packages/instrumentation.scm
View file

@ -587,7 +587,7 @@ (define-public uftrace
(list (list
#:modules #:modules
`((ice-9 match) `((ice-9 match)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:make-flags #:make-flags
#~(list #~(list
(string-append "CC=" #$(cc-for-target))) (string-append "CC=" #$(cc-for-target)))

6
gnu/packages/java.scm
View file

@ -723,7 +723,7 @@ (define-public icedtea-8
(arguments (arguments
`(#:imported-modules `(#:imported-modules
((guix build ant-build-system) ((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) #:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
@ -889,7 +889,7 @@ (define-public openjdk9
(arguments (arguments
`(#:imported-modules `(#:imported-modules
((guix build ant-build-system) ((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules #:modules
((guix build utils) ((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
@ -8114,7 +8114,7 @@ (define-public antlr2
(arguments (arguments
`(#:tests? #f ; no test target `(#:tests? #f ; no test target
#:imported-modules ((guix build ant-build-system) #:imported-modules ((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules (((guix build ant-build-system) #:prefix ant:) #:modules (((guix build ant-build-system) #:prefix ant:)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils)) (guix build utils))

2
gnu/packages/language.scm
View file

@ -969,7 +969,7 @@ (define-public skktools
#:prefix emacs:) #:prefix emacs:)
(guix build utils) (guix build utils)
(guix build emacs-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-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases

2
gnu/packages/librewolf.scm
View file

@ -286,7 +286,7 @@ (define-public librewolf
(rnrs io ports) (rnrs io ports)
(guix elf) (guix elf)
(guix build gremlin) (guix build gremlin)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #~(modify-phases %standard-phases #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-preferences (add-after 'unpack 'fix-preferences
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)

6
gnu/packages/linux.scm
View file

@ -285,7 +285,7 @@ (define* (customize-linux #:key name
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
(package-arguments linux) (package-arguments linux)
((#:imported-modules imported-modules %gnu-build-system-modules) ((#:imported-modules imported-modules %default-gnu-imported-modules)
`((guix build kconfig) ,@imported-modules)) `((guix build kconfig) ,@imported-modules))
((#:modules modules) ((#:modules modules)
`((guix build kconfig) ,@modules)) `((guix build kconfig) ,@modules))
@ -5846,7 +5846,7 @@ (define-public mdadm-static
(for-each delete-file-recursively directories) (for-each delete-file-recursively directories)
(remove-store-references "sbin/mdadm") (remove-store-references "sbin/mdadm")
(delete-file "sbin/mdmon"))))))) (delete-file "sbin/mdmon")))))))
((#:modules modules %gnu-build-system-modules) ((#:modules modules %default-gnu-imported-modules)
`((ice-9 ftw) ,@modules)) `((ice-9 ftw) ,@modules))
((#:strip-flags _ '()) ((#:strip-flags _ '())
''("--strip-all")) ;strip a few extra KiB ''("--strip-all")) ;strip a few extra KiB
@ -7326,7 +7326,7 @@ (define-public ecryptfs-utils
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--disable-pywrap") `(#:configure-flags (list "--disable-pywrap")
#:modules (,@%gnu-build-system-modules #:modules (,@%default-gnu-imported-modules
(ice-9 binary-ports) (ice-9 binary-ports)
(rnrs bytevectors) (rnrs bytevectors)
(srfi srfi-26)) (srfi srfi-26))

4
gnu/packages/machine-learning.scm
View file

@ -384,10 +384,10 @@ (define-public ghmm
"07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z")))) "07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:modules ((guix build python-build-system) #:modules ((guix build python-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-dir (add-after 'unpack 'enter-dir

4
gnu/packages/mail.scm
View file

@ -4222,7 +4222,7 @@ (define-public mumi
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
(guix build utils)) (guix build utils))
#:imported-modules `((guix build guile-build-system) #:imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags '(list "--localstatedir=/var") #:configure-flags '(list "--localstatedir=/var")
@ -4873,7 +4873,7 @@ (define-public crm114
((guix build emacs-build-system) #:prefix emacs:) ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils) (guix build utils)
(ice-9 string-fun)) (ice-9 string-fun))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:make-flags (list (string-append "prefix=" %output) #:make-flags (list (string-append "prefix=" %output)

2
gnu/packages/make-bootstrap.scm
View file

@ -473,7 +473,7 @@ (define %gcc-static
(outputs '("out")) ; all in one (outputs '("out")) ; all in one
(arguments (arguments
(substitute-keyword-arguments (package-arguments gcc-7) (substitute-keyword-arguments (package-arguments gcc-7)
((#:modules modules %gnu-build-system-modules) ((#:modules modules %default-gnu-imported-modules)
`((srfi srfi-1) `((srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
(ice-9 regex) (ice-9 regex)

8
gnu/packages/maths.scm
View file

@ -4242,7 +4242,7 @@ (define-public mumps
`(#:modules ((ice-9 match) `(#:modules ((ice-9 match)
(ice-9 popen) (ice-9 popen)
(srfi srfi-1) (srfi srfi-1)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -7211,7 +7211,7 @@ (define-public hypre
(list openblas)) (list openblas))
(arguments (arguments
`(#:modules ((srfi srfi-1) `(#:modules ((srfi srfi-1)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags '("--enable-shared" #:configure-flags '("--enable-shared"
"--disable-fortran" "--disable-fortran"
"--without-MPI" "--without-MPI"
@ -7718,7 +7718,7 @@ (define-public ocaml-z3
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules ((guix build python-build-system) `(#:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules (((guix build python-build-system) #:select (site-packages)) #:modules (((guix build python-build-system) #:select (site-packages))
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils)) (guix build utils))
@ -9208,7 +9208,7 @@ (define-public lingeling
(arguments (arguments
(list #:test-target "test" (list #:test-target "test"
#:modules `((ice-9 match) #:modules `((ice-9 match)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:configure-flags #~(list "--aiger=.") #:configure-flags #~(list "--aiger=.")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases

2
gnu/packages/messaging.scm
View file

@ -1414,7 +1414,7 @@ (define-public dino
#:modules '((guix build cmake-build-system) #:modules '((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils)) (guix build utils))
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build cmake-build-system) (guix build cmake-build-system)
(guix build glib-or-gtk-build-system)) (guix build glib-or-gtk-build-system))
#:phases #:phases

2
gnu/packages/mpd.scm
View file

@ -388,7 +388,7 @@ (define-public sonata
(guix build python-build-system) (guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system) (guix build python-build-system)
(guix build glib-or-gtk-build-system)) (guix build glib-or-gtk-build-system))
#:phases #:phases

2
gnu/packages/mpi.scm
View file

@ -399,7 +399,7 @@ (define-public java-openmpi
((guix build ant-build-system) #:prefix ant:) ((guix build ant-build-system) #:prefix ant:)
(guix build utils)) (guix build utils))
#:imported-modules `((guix build ant-build-system) #:imported-modules `((guix build ant-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
(substitute-keyword-arguments (package-arguments openmpi) (substitute-keyword-arguments (package-arguments openmpi)
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons "--enable-mpi-java" #$flags)) #~(cons "--enable-mpi-java" #$flags))

2
gnu/packages/music.scm
View file

@ -3585,7 +3585,7 @@ (define-public jack-select
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" (assoc-ref %outputs "out")))

2
gnu/packages/networking.scm
View file

@ -3907,7 +3907,7 @@ (define-public opendht
(arguments (arguments
(list (list
#:imported-modules `((guix build python-build-system) ;for site-packages #: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:) #:modules '(((guix build python-build-system) #:prefix python:)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils)) (guix build utils))

2
gnu/packages/ocaml.scm
View file

@ -1320,7 +1320,7 @@ (define-public emacs-tuareg
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-build-system) (guix build emacs-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:modules '((guix build gnu-build-system) #:modules '((guix build gnu-build-system)

2
gnu/packages/openldap.scm
View file

@ -232,7 +232,7 @@ (define-public 389-ds-base
#:select (add-installed-pythonpath python-version)) #:select (add-installed-pythonpath python-version))
(guix build utils)) (guix build utils))
#:imported-modules `((guix build python-build-system) #:imported-modules `((guix build python-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:disallowed-references (list httpd) #:disallowed-references (list httpd)
#:configure-flags #:configure-flags
#~(list "--enable-cmocka" #~(list "--enable-cmocka"

8
gnu/packages/package-management.scm
View file

@ -1567,9 +1567,9 @@ (define-public guix-build-coordinator
(list (list
#:modules `(((guix build guile-build-system) #:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules `((guix build guile-build-system) #:imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE (add-before 'build 'set-GUILE_AUTO_COMPILE
@ -1825,9 +1825,9 @@ (define-public nar-herder
(list (list
#:modules `(((guix build guile-build-system) #:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:imported-modules `((guix build guile-build-system) #:imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE (add-before 'build 'set-GUILE_AUTO_COMPILE

4
gnu/packages/plotutils.scm
View file

@ -132,7 +132,7 @@ (define-public asymptote
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26))
#:imported-modules `(,@%gnu-build-system-modules #:imported-modules `(,@%default-gnu-imported-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
#~(list (string-append "--enable-gc=" #$(this-package-input "libgc")) #~(list (string-append "--enable-gc=" #$(this-package-input "libgc"))
@ -263,7 +263,7 @@ (define-public guile-plotutils
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules ((guix build guile-build-system) `(#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules (((guix build guile-build-system) #:modules (((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
(guix build gnu-build-system) (guix build gnu-build-system)

6
gnu/packages/qt.scm
View file

@ -3936,10 +3936,10 @@ (define-public python-sip-4
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:imported-modules ((guix build python-build-system) #:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version)) ((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -4462,7 +4462,7 @@ (define-public qtsolutions
`(#:tests? #f ; No target `(#:tests? #f ; No target
#:imported-modules #:imported-modules
((guix build copy-build-system) ((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules #:modules
(((guix build copy-build-system) #:prefix copy:) (((guix build copy-build-system) #:prefix copy:)
(guix build gnu-build-system) (guix build gnu-build-system)

2
gnu/packages/racket.scm
View file

@ -582,7 +582,7 @@ (define-public racket-minimal
(guix build union) (guix build union)
(ice-9 match)) (ice-9 match))
#:imported-modules `((guix build union) #:imported-modules `((guix build union)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'unpack) (delete 'unpack)

2
gnu/packages/ratpoison.scm
View file

@ -48,7 +48,7 @@ (define-public ratpoison
(arguments (arguments
(list (list
#:modules `((ice-9 format) #:modules `((ice-9 format)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
;; Specify the absolute location of xterm, as the user experience sucks ;; Specify the absolute location of xterm, as the user experience sucks
;; when no terminal is available (can't consult help with 'C-t ?', for ;; when no terminal is available (can't consult help with 'C-t ?', for
;; example). ;; example).

2
gnu/packages/scheme.scm
View file

@ -1286,7 +1286,7 @@ (define-public stklos
(arguments (arguments
(list (list
#:modules `((ice-9 ftw) #:modules `((ice-9 ftw)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'patch-sh-references (add-before 'configure 'patch-sh-references

2
gnu/packages/selinux.scm
View file

@ -251,7 +251,7 @@ (define-public python-sepolgen
(name "python-sepolgen") (name "python-sepolgen")
(arguments (arguments
(substitute-keyword-arguments (package-arguments libsepol) (substitute-keyword-arguments (package-arguments libsepol)
((#:modules _ #~%gnu-build-system-modules) ((#:modules _ #~%default-gnu-imported-modules)
'((srfi srfi-1) '((srfi srfi-1)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils))) (guix build utils)))

2
gnu/packages/shellutils.scm
View file

@ -129,7 +129,7 @@ (define-public boxes
"/etc/boxes-config")) "/etc/boxes-config"))
#:modules #:modules
((ice-9 match) ((ice-9 match)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)

2
gnu/packages/simh.scm
View file

@ -53,7 +53,7 @@ (define-public simh
#:make-flags #:make-flags
#~(list (string-append "GCC=" #$(cc-for-target) " -fcommon")) #~(list (string-append "GCC=" #$(cc-for-target) " -fcommon"))
#:modules `((ice-9 string-fun) #:modules `((ice-9 string-fun)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)

2
gnu/packages/speech.scm
View file

@ -356,7 +356,7 @@ (define-public festival
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases

2
gnu/packages/statistics.scm
View file

@ -6906,7 +6906,7 @@ (define-public emacs-ess
#:modules '((guix build gnu-build-system) #:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-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-build-system)
(guix build emacs-utils)) (guix build emacs-utils))
#:make-flags #:make-flags

2
gnu/packages/stb.scm
View file

@ -47,7 +47,7 @@ (define stb
`(#:modules ((ice-9 ftw) `(#:modules ((ice-9 ftw)
(ice-9 regex) (ice-9 regex)
(srfi srfi-26) (srfi srfi-26)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(delete 'build) (delete 'build)

4
gnu/packages/telegram.scm
View file

@ -618,7 +618,7 @@ (define-public tgl
#:tests? #f ; No target #:tests? #f ; No target
#:imported-modules #:imported-modules
`((guix build copy-build-system) `((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules #:modules
'(((guix build copy-build-system) '(((guix build copy-build-system)
#:prefix copy:) #:prefix copy:)
@ -691,7 +691,7 @@ (define-public telegram-cli
#:tests? #f ; No target #:tests? #f ; No target
#:imported-modules #:imported-modules
`((guix build copy-build-system) `((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules #:modules
'(((guix build copy-build-system) '(((guix build copy-build-system)
#:prefix copy:) #:prefix copy:)

2
gnu/packages/texinfo.scm
View file

@ -230,7 +230,7 @@ (define (files)
#:disallowed-references ,(assoc-ref (package-inputs texinfo) #:disallowed-references ,(assoc-ref (package-inputs texinfo)
"perl") "perl")
#:modules ((ice-9 ftw) (srfi srfi-1) #:modules ((ice-9 ftw) (srfi srfi-1)
,@%gnu-build-system-modules))) ,@%default-gnu-imported-modules)))
(synopsis "Standalone Info documentation reader") (synopsis "Standalone Info documentation reader")
(inputs (modify-inputs (package-inputs texinfo) (inputs (modify-inputs (package-inputs texinfo)
(prepend gzip))))) (prepend gzip)))))

2
gnu/packages/text-editors.scm
View file

@ -1236,7 +1236,7 @@ (define-public geany
)) ))
(arguments (arguments
`(#:imported-modules ((guix build glib-or-gtk-build-system) `(#: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:) #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils)) (guix build utils))

2
gnu/packages/tor-browsers.scm
View file

@ -398,7 +398,7 @@ (define* (make-torbrowser #:key
(rnrs io ports) (rnrs io ports)
(guix elf) (guix elf)
(guix build gremlin) (guix build gremlin)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'apply-guix-specific-patches (add-after 'unpack 'apply-guix-specific-patches

6
gnu/packages/version-control.scm
View file

@ -263,7 +263,7 @@ (define-public git-minimal
(ice-9 format) (ice-9 format)
(ice-9 textual-ports) (ice-9 textual-ports)
((guix build gnu-build-system) #:prefix gnu:) ((guix build gnu-build-system) #:prefix gnu:)
,@%gnu-build-system-modules) ,@%default-gnu-modules)
;; Make sure the full bash does not end up in the final closure. ;; Make sure the full bash does not end up in the final closure.
#:disallowed-references (list bash perl) #:disallowed-references (list bash perl)
#:test-target "test" #:test-target "test"
@ -2102,7 +2102,7 @@ (define-public gitile
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules ((guix build guile-build-system) `(#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:make-flags (list "GUILE_AUTO_COMPILE=0") #:make-flags (list "GUILE_AUTO_COMPILE=0")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -4093,7 +4093,7 @@ (define-public git-filter-repo
(list (list
#:tests? #f ;No tests. #:tests? #f ;No tests.
#:imported-modules #:imported-modules
`(,@%gnu-build-system-modules `(,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:modules #:modules
'((guix build gnu-build-system) '((guix build gnu-build-system)

2
gnu/packages/video.scm
View file

@ -1912,7 +1912,7 @@ (define-public ffmpeg-3.4
"0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv")))) "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg-4) (substitute-keyword-arguments (package-arguments ffmpeg-4)
((#:modules modules %gnu-build-system-modules) ((#:modules modules %default-gnu-imported-modules)
`((srfi srfi-1) `((srfi srfi-1)
,@modules)) ,@modules))
((#:configure-flags flags) ((#:configure-flags flags)

10
gnu/packages/virtualization.scm
View file

@ -251,7 +251,7 @@ (define-public qemu
(srfi srfi-26) (srfi srfi-26)
(ice-9 ftw) (ice-9 ftw)
(ice-9 match) (ice-9 match)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; Since we removed the bundled firmwares above, many tests ;; Since we removed the bundled firmwares above, many tests
@ -757,10 +757,10 @@ (define-public ganeti
"ganeti-relax-dependencies.patch")))) "ganeti-relax-dependencies.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%default-gnu-imported-modules
(guix build haskell-build-system) (guix build haskell-build-system)
(guix build python-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 haskell-build-system) #:prefix haskell:)
((guix build python-build-system) #:select (site-packages)) ((guix build python-build-system) #:select (site-packages))
(srfi srfi-1) (srfi srfi-1)
@ -1978,7 +1978,7 @@ (define-public criu
(search-input-file %build-inputs (search-input-file %build-inputs
"/bin/xmlto"))) "/bin/xmlto")))
#:modules ((ice-9 ftw) #:modules ((ice-9 ftw)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
@ -2350,7 +2350,7 @@ (define-public skopeo
#:tests? #f ; The tests require Docker #:tests? #f ; The tests require Docker
#:test-target "test-unit" #:test-target "test-unit"
#:imported-modules #:imported-modules
(source-module-closure `(,@%gnu-build-system-modules (source-module-closure `(,@%default-gnu-imported-modules
(guix build go-build-system))) (guix build go-build-system)))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases

2
gnu/packages/web-browsers.scm
View file

@ -380,7 +380,7 @@ (define-public kristall
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build qt-utils) (guix build qt-utils)
(guix build utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build qt-utils)) (guix build qt-utils))
#:make-flags #:make-flags
(list (string-append "PREFIX=" %output)) (list (string-append "PREFIX=" %output))

2
gnu/packages/web.scm
View file

@ -235,7 +235,7 @@ (define-public qhttp
`(#:tests? #f ; no target `(#:tests? #f ; no target
#:imported-modules #:imported-modules
((guix build copy-build-system) ((guix build copy-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#:modules #:modules
(((guix build copy-build-system) #:prefix copy:) (((guix build copy-build-system) #:prefix copy:)
(guix build gnu-build-system) (guix build gnu-build-system)

6
gnu/packages/xdisorg.scm
View file

@ -1587,7 +1587,7 @@ (define-public redshift
"1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules (,@%gnu-build-system-modules `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system)) (guix build python-build-system))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -3012,11 +3012,11 @@ (define-public x-resize
#:tests? #f ;no test suite #:tests? #f ;no test suite
#:modules `(((guix build guile-build-system) #:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules ,@%default-gnu-imported-modules
(srfi srfi-26)) (srfi srfi-26))
#:phases #:phases
(with-imported-modules `((guix build guile-build-system) (with-imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%default-gnu-imported-modules)
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)

2
gnu/packages/xorg.scm
View file

@ -6316,7 +6316,7 @@ (define-public uim
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%default-gnu-imported-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
(list "--with-anthy-utf8" (list "--with-anthy-utf8"

2
guix/build-system/agda.scm
View file

@ -38,7 +38,7 @@ (define (default-agda)
(define %agda-build-system-modules (define %agda-build-system-modules
`((guix build agda-build-system) `((guix build agda-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define %default-modules (define %default-modules
'((guix build agda-build-system) '((guix build agda-build-system)

2
guix/build-system/android-ndk.scm
View file

@ -31,7 +31,7 @@ (define-module (guix build-system android-ndk)
(define %android-ndk-build-system-modules (define %android-ndk-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build android-ndk-build-system) `((guix build android-ndk-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define* (android-ndk-build name inputs (define* (android-ndk-build name inputs
#:key #:key

2
guix/build-system/ant.scm
View file

@ -43,7 +43,7 @@ (define %ant-build-system-modules
(guix build maven plugin) (guix build maven plugin)
(guix build maven pom) (guix build maven pom)
(guix build java-utils) (guix build java-utils)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-jdk) (define (default-jdk)
"Return the default JDK package." "Return the default JDK package."

2
guix/build-system/asdf.scm
View file

@ -56,7 +56,7 @@ (define %asdf-build-system-modules
`((guix build asdf-build-system) `((guix build asdf-build-system)
(guix build lisp-utils) (guix build lisp-utils)
(guix build union) (guix build union)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define %asdf-build-modules (define %asdf-build-modules
;; Used (visible) build-side modules ;; Used (visible) build-side modules

2
guix/build-system/cargo.scm
View file

@ -70,7 +70,7 @@ (define (default-rust-sysroot target)
(define %cargo-utils-modules (define %cargo-utils-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build cargo-utils) `((guix build cargo-utils)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define %cargo-build-system-modules (define %cargo-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.

2
guix/build-system/chicken.scm
View file

@ -42,7 +42,7 @@ (define %chicken-build-system-modules
;; Build-side modules imported and used by default. ;; Build-side modules imported and used by default.
`((guix build chicken-build-system) `((guix build chicken-build-system)
(guix build union) (guix build union)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-chicken) (define (default-chicken)
;; Lazily resolve the binding to avoid a circular dependency. ;; Lazily resolve the binding to avoid a circular dependency.

2
guix/build-system/cmake.scm
View file

@ -42,7 +42,7 @@ (define-module (guix build-system cmake)
(define %cmake-build-system-modules (define %cmake-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build cmake-build-system) `((guix build cmake-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-cmake target) (define (default-cmake target)
"Return the default CMake package." "Return the default CMake package."

2
guix/build-system/composer.scm
View file

@ -62,7 +62,7 @@ (define %composer-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build composer-build-system) `((guix build composer-build-system)
(guix build union) (guix build union)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define* (lower name (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target

2
guix/build-system/copy.scm
View file

@ -46,7 +46,7 @@ (define-module (guix build-system copy)
(define %copy-build-system-modules (define %copy-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build copy-build-system) `((guix build copy-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-glibc) (define (default-glibc)
"Return the default glibc package." "Return the default glibc package."

2
guix/build-system/dub.scm
View file

@ -59,7 +59,7 @@ (define (default-ld-gold-wrapper)
(define %dub-build-system-modules (define %dub-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build dub-build-system) `((guix build dub-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define* (dub-build name inputs (define* (dub-build name inputs
#:key #:key

2
guix/build-system/elm.scm
View file

@ -88,7 +88,7 @@ (define %elm-build-system-modules
`((guix build elm-build-system) `((guix build elm-build-system)
(guix build json) (guix build json)
(guix build union) (guix build union)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define %elm-default-modules (define %elm-default-modules
;; Modules in scope in the build-side environment. ;; Modules in scope in the build-side environment.

2
guix/build-system/emacs.scm
View file

@ -46,7 +46,7 @@ (define %emacs-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build emacs-build-system) `((guix build emacs-build-system)
(guix build emacs-utils) (guix build emacs-utils)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-emacs) (define (default-emacs)
"Return the default Emacs package." "Return the default Emacs package."

2
guix/build-system/font.scm
View file

@ -40,7 +40,7 @@ (define-module (guix build-system font)
(define %font-build-system-modules (define %font-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build font-build-system) `((guix build font-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define* (lower name (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target

2
guix/build-system/glib-or-gtk.scm
View file

@ -72,7 +72,7 @@ (define %default-modules
(define %glib-or-gtk-build-system-modules (define %glib-or-gtk-build-system-modules
;; Build-side modules imported and used by default. ;; Build-side modules imported and used by default.
`((guix build glib-or-gtk-build-system) `((guix build glib-or-gtk-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-glib) (define (default-glib)
"Return the default glib package from which we use "Return the default glib package from which we use

19
guix/build-system/gnu.scm
View file

@ -27,7 +27,8 @@ (define-module (guix build-system gnu)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (%gnu-build-system-modules #:export (%default-gnu-imported-modules
%default-gnu-modules
%strip-flags %strip-flags
%strip-directories %strip-directories
gnu-build gnu-build
@ -48,14 +49,14 @@ (define-module (guix build-system gnu)
;; ;;
;; Code: ;; Code:
(define %gnu-build-system-modules (define %default-gnu-imported-modules
;; Build-side modules imported and used by default. ;; Build-side modules imported and used by default.
'((guix build gnu-build-system) '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build gremlin) (guix build gremlin)
(guix elf))) (guix elf)))
(define %default-modules (define %default-gnu-modules
;; Modules in scope in the build-side environment. ;; Modules in scope in the build-side environment.
'((guix build gnu-build-system) '((guix build gnu-build-system)
(guix build utils))) (guix build utils)))
@ -237,10 +238,10 @@ (define* (dist-package p source #:key (phases '%dist-phases))
(arguments (arguments
;; Use the right phases and modules. ;; Use the right phases and modules.
(substitute-keyword-arguments (package-arguments p) (substitute-keyword-arguments (package-arguments p)
((#:modules modules %default-modules) ((#:modules modules %default-gnu-modules)
`((guix build gnu-dist) `((guix build gnu-dist)
,@modules)) ,@modules))
((#:imported-modules modules %gnu-build-system-modules) ((#:imported-modules modules %default-gnu-imported-modules)
`((guix build gnu-dist) `((guix build gnu-dist)
,@modules)) ,@modules))
((#:phases _ #f) ((#:phases _ #f)
@ -359,8 +360,8 @@ (define* (gnu-build name inputs
(locale "en_US.utf8") (locale "en_US.utf8")
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules) (imported-modules %default-gnu-imported-modules)
(modules %default-modules) (modules %default-gnu-modules)
(substitutable? #t) (substitutable? #t)
allowed-references allowed-references
disallowed-references) disallowed-references)
@ -502,8 +503,8 @@ (define* (gnu-cross-build name
(locale "en_US.utf8") (locale "en_US.utf8")
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))
(imported-modules %gnu-build-system-modules) (imported-modules %default-gnu-imported-modules)
(modules %default-modules) (modules %default-gnu-modules)
(substitutable? #t) (substitutable? #t)
allowed-references allowed-references
disallowed-references) disallowed-references)

2
guix/build-system/go.scm
View file

@ -115,7 +115,7 @@ (define %go-build-system-modules
;; Build-side modules imported and used by default. ;; Build-side modules imported and used by default.
`((guix build go-build-system) `((guix build go-build-system)
(guix build union) (guix build union)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-go) (define (default-go)
;; Lazily resolve the binding to avoid a circular dependency. ;; Lazily resolve the binding to avoid a circular dependency.

2
guix/build-system/guile.scm
View file

@ -36,7 +36,7 @@ (define %scheme-file-regexp
(define %guile-build-system-modules (define %guile-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build guile-build-system) `((guix build guile-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define* (lower name (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target

2
guix/build-system/haskell.scm
View file

@ -55,7 +55,7 @@ (define (hackage-uri name version)
(define %haskell-build-system-modules (define %haskell-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build haskell-build-system) `((guix build haskell-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-haskell) (define (default-haskell)
"Return the default Haskell package." "Return the default Haskell package."

2
guix/build-system/julia.scm
View file

@ -42,7 +42,7 @@ (define-module (guix build-system julia)
(define %julia-build-system-modules (define %julia-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build julia-build-system) `((guix build julia-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-julia) (define (default-julia)
"Return the default Julia package." "Return the default Julia package."

2
guix/build-system/linux-module.scm
View file

@ -41,7 +41,7 @@ (define-module (guix build-system linux-module)
(define %linux-module-build-system-modules (define %linux-module-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
`((guix build linux-module-build-system) `((guix build linux-module-build-system)
,@%gnu-build-system-modules)) ,@%default-gnu-imported-modules))
(define (default-linux) (define (default-linux)
"Return the default Linux package." "Return the default Linux package."

Some files were not shown because too many files have changed in this diff Show more