futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system: Use 'sexp->gexp' for plain sexps.

Browse Source 
This reduces memory allocations and list traversals during 'gexp->sexp',
'gexp-inputs', etc.

* guix/build-system/cargo.scm (cargo-build): Use 'sexp->gexp' for sexps
known to not contain file-like objects.  Change default #:phases to a
symbol.
* guix/build-system/cmake.scm (cmake-build, cmake-cross-build): Likewise.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/gnu.scm (%strip-flags, %strip-directories): New
variables.
(gnu-build): Use them.  Use 'sexp->gexp' where appropriate.
(gnu-cross-build): Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/trivial.scm (trivial-build): Likewise.
* guix/build-system/waf.scm (waf-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* guix/packages.scm (patch-and-repack): Use 'sexp->gexp' when SNIPPET is
a pair.
* guix/svn-download.scm (svn-multi-fetch): Use 'sexp->gexp' for
'svn-multi-reference-locations'.
This commit is contained in:
Ludovic Courtès 2021-02-28 21:30:50 +01:00
parent da86e90efe
commit f95fc73248
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
34 changed files with 278 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build-system/android-ndk.scm
View File

@ -41,8 +41,7 @@
source source
(tests? #t) (tests? #t)
(test-target #f) (test-target #f)
(phases '(@ (guix build android-ndk-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(make-flags #~'()) (make-flags #~'())
(search-paths '()) (search-paths '())
@ -55,7 +54,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(android-ndk-build #:name #$name (android-ndk-build #:name #$name
#:source #+source #:source #+source
@ -70,8 +69,9 @@
"/share/android/build/core/main.mk") "/share/android/build/core/main.mk")
#$make-flags) #$make-flags)
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

10
guix/build-system/ant.scm
View File

@ -110,8 +110,7 @@
(test-exclude (list "**/Abstract*.java")) (test-exclude (list "**/Abstract*.java"))
(source-dir "src") (source-dir "src")
(test-dir "src/test") (test-dir "src/test")
(phases '(@ (guix build ant-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -124,7 +123,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(ant-build #:name #$name (ant-build #:name #$name
#:source #+source #:source #+source
#:make-flags #$make-flags #:make-flags #$make-flags
@ -141,8 +140,9 @@
#:test-dir #$test-dir #:test-dir #$test-dir
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

20
guix/build-system/asdf.scm
View File

@ -96,8 +96,7 @@
(define* (asdf-build/source name inputs (define* (asdf-build/source name inputs
#:key source outputs #:key source outputs
(phases '(@ (guix build asdf-build-system) (phases '%standard-phases/source)
%standard-phases/source))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
(guile #f) (guile #f)
@ -106,14 +105,15 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(asdf-build/source #:name #$name (asdf-build/source #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
@ -272,8 +272,7 @@ set up using CL source package conventions."
(asd-files ''()) (asd-files ''())
(asd-systems ''()) (asd-systems ''())
(test-asd-file #f) (test-asd-file #f)
(phases '(@ (guix build asdf-build-system) (phases '%standard-phases)
%standard-phases))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
(guile #f) (guile #f)
@ -295,7 +294,7 @@ set up using CL source package conventions."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(parameterize ((%lisp (string-append (parameterize ((%lisp (string-append
(assoc-ref %build-inputs #$lisp-type) (assoc-ref %build-inputs #$lisp-type)
"/bin/" #$lisp-type)) "/bin/" #$lisp-type))
@ -309,8 +308,9 @@ set up using CL source package conventions."
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs)))))) #:inputs #$(input-tuples->gexp inputs))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

22
guix/build-system/cargo.scm
View File

@ -84,8 +84,7 @@ to NAME and VERSION."
(features ''()) (features ''())
(skip-build? #f) (skip-build? #f)
(install-source? #t) (install-source? #t)
(phases '(@ (guix build cargo-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -98,21 +97,23 @@ to NAME and VERSION."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(cargo-build #:name #$name (cargo-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
#:test-target #$test-target #:test-target #$test-target
#:vendor-dir #$vendor-dir #:vendor-dir #$vendor-dir
#:cargo-build-flags #$cargo-build-flags #:cargo-build-flags #$(sexp->gexp cargo-build-flags)
#:cargo-test-flags #$cargo-test-flags #:cargo-test-flags #$(sexp->gexp cargo-test-flags)
#:cargo-package-flags #$cargo-package-flags #:cargo-package-flags #$(sexp->gexp cargo-package-flags)
#:features #$features #:features #$(sexp->gexp features)
#:skip-build? #$skip-build? #:skip-build? #$skip-build?
#:install-source? #$install-source? #:install-source? #$install-source?
#:tests? #$(and tests? (not skip-build?)) #:tests? #$(and tests? (not skip-build?))
#:phases #$phases #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:outputs (list #$@(map (lambda (name) #:outputs (list #$@(map (lambda (name)
#~(cons #$name #~(cons #$name
(ungexp output name))) (ungexp output name)))
@ -120,8 +121,9 @@ to NAME and VERSION."
#:inputs (map (lambda (tuple) #:inputs (map (lambda (tuple)
(apply cons tuple)) (apply cons tuple))
'#$inputs) '#$inputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths))))) (map search-path-specification->sexp
search-paths))))))
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system

10
guix/build-system/chicken.scm
View File

@ -75,8 +75,7 @@
(define* (chicken-build name inputs (define* (chicken-build name inputs
#:key #:key
source source
(phases '(@ (guix build chicken-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(egg-name "") (egg-name "")
@ -92,14 +91,15 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(chicken-build #:name #$name (chicken-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:egg-name #$egg-name #:egg-name #$egg-name
#:unpack-path #$unpack-path #:unpack-path #$unpack-path
#:build-flags #$build-flags #:build-flags #$build-flags

7
guix/build-system/clojure.scm
View File

@ -137,7 +137,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(clojure-build #:name #$name (clojure-build #:name #$name
#:source #+source #:source #+source
@ -162,8 +162,9 @@
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-spec->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-spec->sexp
search-paths))
#:system #$system #:system #$system
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))

25
guix/build-system/cmake.scm
View File

@ -113,8 +113,7 @@
(strip-flags ''("--strip-debug")) (strip-flags ''("--strip-debug"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build cmake-build-system) (phases '%standard-phases)
%standard-phases))
(system (%current-system)) (system (%current-system))
(substitutable? #t) (substitutable? #t)
(imported-modules %cmake-build-system-modules) (imported-modules %cmake-build-system-modules)
@ -125,17 +124,22 @@ provides a 'CMakeLists.txt' file as its build system."
(define build (define build
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(cmake-build #:source #+source #~(cmake-build #:source #+source
#:system #$system #:system #$system
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
#:phases #$phases search-paths))
#:configure-flags #$configure-flags #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:configure-flags #$(if (pair? configure-flags)
(sexp->gexp configure-flags)
configure-flags)
#:make-flags #$make-flags #:make-flags #$make-flags
#:out-of-source? #$out-of-source? #:out-of-source? #$out-of-source?
#:build-type #$build-type #:build-type #$build-type
@ -146,8 +150,8 @@ provides a 'CMakeLists.txt' file as its build system."
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs? #:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries? #:strip-binaries? #$strip-binaries?
#:strip-flags #$strip-flags #:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$strip-directories))))) #:strip-directories #$(sexp->gexp strip-directories))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))
@ -184,8 +188,7 @@ provides a 'CMakeLists.txt' file as its build system."
"--enable-deterministic-archives")) "--enable-deterministic-archives"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build cmake-build-system) (phases '%standard-phases)
%standard-phases))
(substitutable? #t) (substitutable? #t)
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))

17
guix/build-system/copy.scm
View File

@ -108,16 +108,21 @@
#:system #$system #:system #$system
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:install-plan #$install-plan #:install-plan #$(if (pair? install-plan)
#:search-paths '#$(map search-path-specification->sexp (sexp->gexp install-plan)
search-paths) install-plan)
#:phases #$phases #:search-paths '#$(sexp->gexp
(map search-path-specification->sexp
search-paths))
#:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:out-of-source? #$out-of-source? #:out-of-source? #$out-of-source?
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs? #:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries? #:strip-binaries? #$strip-binaries?
#:strip-flags #$strip-flags #:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$strip-directories))))) #:strip-directories #$(sexp->gexp strip-directories))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))

10
guix/build-system/dub.scm
View File

@ -63,8 +63,7 @@
(tests? #t) (tests? #t)
(test-target #f) (test-target #f)
(dub-build-flags ''()) (dub-build-flags ''())
(phases '(@ (guix build dub-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -76,7 +75,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(dub-build #:name #$name (dub-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
@ -85,8 +84,9 @@
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

10
guix/build-system/emacs.scm
View File

@ -87,8 +87,7 @@
(tests? #f) (tests? #f)
(parallel-tests? #t) (parallel-tests? #t)
(test-command ''("make" "check")) (test-command ''("make" "check"))
(phases '(@ (guix build emacs-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(include (quote %default-include)) (include (quote %default-include))
(exclude (quote %default-exclude)) (exclude (quote %default-exclude))
@ -103,7 +102,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(emacs-build #:name #$name (emacs-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
@ -114,8 +113,9 @@
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:include #$include #:include #$include
#:exclude #$exclude #:exclude #$exclude
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

12
guix/build-system/font.scm
View File

@ -77,8 +77,7 @@
(tests? #t) (tests? #t)
(test-target "test") (test-target "test")
(configure-flags ''()) (configure-flags ''())
(phases '(@ (guix build font-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -99,10 +98,13 @@
#:system #$system #:system #$system
#:test-target #$test-target #:test-target #$test-target
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:outputs %outputs #:outputs %outputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs %build-inputs))))) #:inputs %build-inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

16
guix/build-system/glib-or-gtk.scm
View File

@ -137,16 +137,19 @@
(define build (define build
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(glib-or-gtk-build #:source #+source #~(glib-or-gtk-build #:source #+source
#:system #$system #:system #$system
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
#:phases #$phases search-paths))
#:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:glib-or-gtk-wrap-excluded-outputs #:glib-or-gtk-wrap-excluded-outputs
#$glib-or-gtk-wrap-excluded-outputs #$glib-or-gtk-wrap-excluded-outputs
#:configure-flags #$configure-flags #:configure-flags #$configure-flags
@ -159,8 +162,9 @@
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs? #:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries? #:strip-binaries? #$strip-binaries?
#:strip-flags #$strip-flags #:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$strip-directories))))) #:strip-directories
#$(sexp->gexp strip-directories))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

53
guix/build-system/gnu.scm
View File

@ -330,6 +330,12 @@ standard packages used as implicit inputs of the GNU build system."
;; Typical names of Autotools "bootstrap" scripts. ;; Typical names of Autotools "bootstrap" scripts.
'("bootstrap" "bootstrap.sh" "autogen.sh")) '("bootstrap" "bootstrap.sh" "autogen.sh"))
(define %strip-flags
#~'("--strip-unneeded" "--enable-deterministic-archives"))
(define %strip-directories
#~'("lib" "lib64" "libexec" "bin" "sbin"))
(define* (gnu-build name inputs (define* (gnu-build name inputs
#:key #:key
guile source guile source
@ -345,10 +351,8 @@ standard packages used as implicit inputs of the GNU build system."
(parallel-tests? #t) (parallel-tests? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-unneeded" (strip-flags %strip-flags)
"--enable-deterministic-archives")) (strip-directories %strip-directories)
(strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin"))
(validate-runpath? #t) (validate-runpath? #t)
(make-dynamic-linker-cache? #t) (make-dynamic-linker-cache? #t)
(license-file-regexp %license-file-regexp) (license-file-regexp %license-file-regexp)
@ -381,7 +385,7 @@ are allowed to refer to."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(gnu-build #:source #+source #~(gnu-build #:source #+source
@ -389,13 +393,20 @@ are allowed to refer to."
#:build #$build #:build #$build
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
#:phases #$phases search-paths))
#:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:locale #$locale #:locale #$locale
#:bootstrap-scripts #$bootstrap-scripts #:bootstrap-scripts #$(sexp->gexp bootstrap-scripts)
#:configure-flags #$configure-flags #:configure-flags #$(if (pair? configure-flags)
#:make-flags #$make-flags (sexp->gexp configure-flags)
configure-flags)
#:make-flags #$(if (pair? make-flags)
(sexp->gexp make-flags)
make-flags)
#:out-of-source? #$out-of-source? #:out-of-source? #$out-of-source?
#:tests? #$tests? #:tests? #$tests?
#:test-target #$test-target #:test-target #$test-target
@ -472,10 +483,8 @@ is one of `host' or `target'."
(parallel-build? #t) (parallel-tests? #t) (parallel-build? #t) (parallel-tests? #t)
(patch-shebangs? #t) (patch-shebangs? #t)
(strip-binaries? #t) (strip-binaries? #t)
(strip-flags ''("--strip-unneeded" (strip-flags %strip-flags)
"--enable-deterministic-archives")) (strip-directories %strip-directories)
(strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin"))
(validate-runpath? #t) (validate-runpath? #t)
;; We run 'ldconfig' to generate ld.so.cache and it ;; We run 'ldconfig' to generate ld.so.cache and it
@ -498,7 +507,7 @@ cross-built inputs, and NATIVE-INPUTS are inputs that run on the build
platform." platform."
(define builder (define builder
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(define %build-host-inputs (define %build-host-inputs
(map (lambda (tuple) (map (lambda (tuple)
@ -523,11 +532,13 @@ platform."
#:outputs %outputs #:outputs %outputs
#:inputs %build-target-inputs #:inputs %build-target-inputs
#:native-inputs %build-host-inputs #:native-inputs %build-host-inputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
#:native-search-paths '#$(map search-paths))
search-path-specification->sexp #:native-search-paths '#$(sexp->gexp
native-search-paths) (map
search-path-specification->sexp
native-search-paths))
#:phases #$phases #:phases #$phases
#:locale #$locale #:locale #$locale
#:bootstrap-scripts #$bootstrap-scripts #:bootstrap-scripts #$bootstrap-scripts

8
guix/build-system/go.scm
View File

@ -113,8 +113,7 @@ it, defaulting to full VERSION if a pseudo-version pattern is not recognized."
(define* (go-build name inputs (define* (go-build name inputs
#:key #:key
source source
(phases '(@ (guix build go-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(install-source? #t) (install-source? #t)
@ -138,8 +137,9 @@ it, defaulting to full VERSION if a pseudo-version pattern is not recognized."
#:system #$system #:system #$system
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:install-source? #$install-source? #:install-source? #$install-source?
#:import-path #$import-path #:import-path #$import-path
#:unpack-path #$unpack-path #:unpack-path #$unpack-path

10
guix/build-system/haskell.scm
View File

@ -129,8 +129,7 @@ version REVISION."
(parallel-build? #f) (parallel-build? #f)
(configure-flags ''()) (configure-flags ''())
(extra-directories ''()) (extra-directories ''())
(phases '(@ (guix build haskell-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out" "static")) (outputs '("out" "static"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -143,7 +142,7 @@ provides a 'Setup.hs' file as its build system."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(haskell-build #:name #$name (haskell-build #:name #$name
#:source #+source #:source #+source
@ -159,8 +158,9 @@ provides a 'Setup.hs' file as its build system."
#:haddock? #$haddock? #:haddock? #$haddock?
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

10
guix/build-system/julia.scm
View File

@ -78,8 +78,7 @@
(define* (julia-build name inputs (define* (julia-build name inputs
#:key source #:key source
(tests? #t) (tests? #t)
(phases '(@ (guix build julia-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -92,15 +91,16 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(julia-build #:name #$name (julia-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs) #:inputs #$(input-tuples->gexp inputs)
#:julia-package-name #$julia-package-name)))) #:julia-package-name #$julia-package-name))))

20
guix/build-system/linux-module.scm
View File

@ -155,8 +155,7 @@
source target source target
(search-paths '()) (search-paths '())
(tests? #t) (tests? #t)
(phases '(@ (guix build linux-module-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(make-flags ''()) (make-flags ''())
(system (%current-system)) (system (%current-system))
@ -170,11 +169,12 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(linux-module-build #:name #$name (linux-module-build #:name #$name
#:source #+source #:source #+source
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:phases #$phases #:phases #$phases
#:system #$system #:system #$system
#:target #$target #:target #$target
@ -202,8 +202,7 @@
(search-paths '()) (search-paths '())
(native-search-paths '()) (native-search-paths '())
(tests? #f) (tests? #f)
(phases '(@ (guix build linux-module-build-system) (phases '%standard-phases)
%standard-phases))
(system (%current-system)) (system (%current-system))
(substitutable? #t) (substitutable? #t)
(imported-modules (imported-modules
@ -213,7 +212,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(define %build-host-inputs (define %build-host-inputs
'#+(input-tuples->gexp build-inputs)) '#+(input-tuples->gexp build-inputs))
@ -232,8 +231,9 @@
#:inputs %build-target-inputs #:inputs %build-target-inputs
#:native-inputs %build-host-inputs #:native-inputs %build-host-inputs
#:search-paths #:search-paths
'#$(map search-path-specification->sexp '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:native-search-paths #:native-search-paths
'#$(map '#$(map
search-path-specification->sexp search-path-specification->sexp

14
guix/build-system/maven.scm
View File

@ -157,8 +157,7 @@
(strip-flags ''("--strip-debug")) (strip-flags ''("--strip-debug"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build maven-build-system) (phases '%standard-phases)
%standard-phases))
(system (%current-system)) (system (%current-system))
(imported-modules %maven-build-system-modules) (imported-modules %maven-build-system-modules)
(modules '((guix build maven-build-system) (modules '((guix build maven-build-system)
@ -169,13 +168,14 @@ provides its own binaries."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(maven-build #:source #+source (maven-build #:source #+source
#:system #$system #:system #$system
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:inputs #$(input-tuples->gexp inputs) #:inputs #$(input-tuples->gexp inputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:phases #$phases #:phases #$phases
#:exclude '#$exclude #:exclude '#$exclude
#:local-packages '#$local-packages #:local-packages '#$local-packages
@ -184,8 +184,8 @@ provides its own binaries."
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs? #:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries? #:strip-binaries? #$strip-binaries?
#:strip-flags #$strip-flags #:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$strip-directories)))) #:strip-directories #$(sexp->gexp strip-directories)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))

29
guix/build-system/meson.scm
View File

@ -107,8 +107,7 @@
"bin" "sbin")) "bin" "sbin"))
(elf-directories ''("lib" "lib64" "libexec" (elf-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build meson-build-system) (phases '%standard-phases)
%standard-phases))
(system (%current-system)) (system (%current-system))
(imported-modules %meson-build-system-modules) (imported-modules %meson-build-system-modules)
(modules '((guix build meson-build-system) (modules '((guix build meson-build-system)
@ -120,24 +119,26 @@ has a 'meson.build' file."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(define build-phases (define build-phases
#$(if glib-or-gtk? #$(let ((phases (if (pair? phases) (sexp->gexp phases) phases)))
phases (if glib-or-gtk?
#~(modify-phases #$phases phases
(delete 'glib-or-gtk-compile-schemas) #~(modify-phases #$phases
(delete 'glib-or-gtk-wrap)))) (delete 'glib-or-gtk-compile-schemas)
(delete 'glib-or-gtk-wrap)))))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(meson-build #:source #+source #~(meson-build #:source #+source
#:system #$system #:system #$system
#:outputs %outputs #:outputs %outputs
#:inputs %build-inputs #:inputs %build-inputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:phases build-phases #:phases build-phases
#:configure-flags #$configure-flags #:configure-flags #$(sexp->gexp configure-flags)
#:build-type #$build-type #:build-type #$build-type
#:tests? #$tests? #:tests? #$tests?
#:test-target #$test-target #:test-target #$test-target
@ -146,9 +147,9 @@ has a 'meson.build' file."
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?
#:patch-shebangs? #$patch-shebangs? #:patch-shebangs? #$patch-shebangs?
#:strip-binaries? #$strip-binaries? #:strip-binaries? #$strip-binaries?
#:strip-flags #$strip-flags #:strip-flags #$(sexp->gexp strip-flags)
#:strip-directories #$strip-directories #:strip-directories #$(sexp->gexp strip-directories)
#:elf-directories #$elf-directories))))) #:elf-directories #$(sexp->gexp elf-directories))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f)))

10
guix/build-system/minify.scm
View File

@ -76,8 +76,7 @@
#:key #:key
source source
(javascript-files #f) (javascript-files #f)
(phases '(@ (guix build minify-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(system (%current-system)) (system (%current-system))
search-paths search-paths
@ -89,14 +88,15 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(minify-build #:name #$name (minify-build #:name #$name
#:source #+source #:source #+source
#:javascript-files #$javascript-files #:javascript-files #$javascript-files
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

10
guix/build-system/node.scm
View File

@ -81,8 +81,7 @@ registry."
source source
(npm-flags ''()) (npm-flags ''())
(tests? #t) (tests? #t)
(phases '(@ (guix build node-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -96,7 +95,7 @@ registry."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(node-build #:name #$name (node-build #:name #$name
#:source #+source #:source #+source
#:system #$system #:system #$system
@ -104,8 +103,9 @@ registry."
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

13
guix/build-system/perl.scm
View File

@ -100,17 +100,20 @@ provides a `Makefile.PL' file as its build system."
(define build (define build
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(perl-build #:name #$name #~(perl-build #:name #$name
#:source #+source #:source #+source
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:make-maker? #$make-maker? #:make-maker? #$make-maker?
#:make-maker-flags #$make-maker-flags #:make-maker-flags #$make-maker-flags
#:module-build-flags #$module-build-flags #:module-build-flags #$(sexp->gexp module-build-flags)
#:phases #$phases #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:system #$system #:system #$system
#:test-target "test" #:test-target "test"
#:tests? #$tests? #:tests? #$tests?

14
guix/build-system/python.scm
View File

@ -175,8 +175,7 @@ pre-defined variants."
(test-target "test") (test-target "test")
(use-setuptools? #t) (use-setuptools? #t)
(configure-flags ''()) (configure-flags ''())
(phases '(@ (guix build python-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -189,7 +188,7 @@ provides a 'setup.py' file as its build system."
(define build (define build
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(python-build #:name #$name #~(python-build #:name #$name
@ -199,10 +198,13 @@ provides a 'setup.py' file as its build system."
#:system #$system #:system #$system
#:test-target #$test-target #:test-target #$test-target
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:outputs %outputs #:outputs %outputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs %build-inputs))))) #:inputs %build-inputs)))))

20
guix/build-system/qt.scm
View File

@ -123,8 +123,7 @@
(strip-flags ''("--strip-debug")) (strip-flags ''("--strip-debug"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build qt-build-system) (phases '%standard-phases)
%standard-phases))
(qt-wrap-excluded-outputs ''()) (qt-wrap-excluded-outputs ''())
(system (%current-system)) (system (%current-system))
(imported-modules %qt-build-system-modules) (imported-modules %qt-build-system-modules)
@ -135,13 +134,14 @@ provides a 'CMakeLists.txt' file as its build system."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(qt-build #:source #+source (qt-build #:source #+source
#:system #$system #:system #$system
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:inputs #$(input-tuples->gexp inputs) #:inputs #$(input-tuples->gexp inputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:phases #$phases #:phases #$phases
#:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs
#:configure-flags #$configure-flags #:configure-flags #$configure-flags
@ -191,8 +191,7 @@ provides a 'CMakeLists.txt' file as its build system."
"--enable-deterministic-archives")) "--enable-deterministic-archives"))
(strip-directories ''("lib" "lib64" "libexec" (strip-directories ''("lib" "lib64" "libexec"
"bin" "sbin")) "bin" "sbin"))
(phases '(@ (guix build qt-build-system) (phases '%standard-phases)
%standard-phases))
(system (%current-system)) (system (%current-system))
(build (nix-system->gnu-triplet system)) (build (nix-system->gnu-triplet system))
(imported-modules %qt-build-system-modules) (imported-modules %qt-build-system-modules)
@ -204,7 +203,7 @@ build system."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(define %build-host-inputs (define %build-host-inputs
#+(input-tuples->gexp build-inputs)) #+(input-tuples->gexp build-inputs))
@ -223,8 +222,9 @@ build system."
#:outputs %outputs #:outputs %outputs
#:inputs %build-target-inputs #:inputs %build-target-inputs
#:native-inputs %build-host-inputs #:native-inputs %build-host-inputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:native-search-paths '#$(map #:native-search-paths '#$(map
search-path-specification->sexp search-path-specification->sexp
native-search-paths) native-search-paths)

10
guix/build-system/r.scm
View File

@ -109,8 +109,7 @@ release corresponding to NAME and VERSION."
(tests? #t) (tests? #t)
(test-target "tests") (test-target "tests")
(configure-flags ''()) (configure-flags ''())
(phases '(@ (guix build r-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -123,7 +122,7 @@ release corresponding to NAME and VERSION."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(r-build #:name #$name (r-build #:name #$name
#:source #+source #:source #+source
#:configure-flags #$configure-flags #:configure-flags #$configure-flags
@ -132,8 +131,9 @@ release corresponding to NAME and VERSION."
#:test-target #$test-target #:test-target #$test-target
#:phases #$phases #:phases #$phases
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

10
guix/build-system/rakudo.scm
View File

@ -103,8 +103,7 @@
source source
(search-paths '()) (search-paths '())
(tests? #t) (tests? #t)
(phases '(@ (guix build rakudo-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(system (%current-system)) (system (%current-system))
(guile #f) (guile #f)
@ -117,11 +116,12 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(rakudo-build #:name #$name (rakudo-build #:name #$name
#:source #+source #:source #+source
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:phases #$phases #:phases #$phases
#:system #$system #:system #$system
#:tests? #$tests? #:tests? #$tests?

10
guix/build-system/renpy.scm
View File

@ -77,8 +77,7 @@
(define* (renpy-build name inputs (define* (renpy-build name inputs
#:key #:key
source source
(phases '(@ (guix build renpy-build-system) (phases '%standard-phases)
%standard-phases))
(configure-flags ''()) (configure-flags ''())
(outputs '("out")) (outputs '("out"))
(output "out") (output "out")
@ -93,7 +92,7 @@
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(renpy-build #:name #$name (renpy-build #:name #$name
#:source #+source #:source #+source
#:configure-flags #$configure-flags #:configure-flags #$configure-flags
@ -102,8 +101,9 @@
#:outputs #$(outputs->gexp outputs) #:outputs #$(outputs->gexp outputs)
#:output #$output #:output #$output
#:game #$game #:game #$game
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs #$(input-tuples->gexp inputs))))) #:inputs #$(input-tuples->gexp inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

14
guix/build-system/ruby.scm
View File

@ -80,8 +80,7 @@ NAME and VERSION."
(gem-flags ''()) (gem-flags ''())
(test-target "test") (test-target "test")
(tests? #t) (tests? #t)
(phases '(@ (guix build ruby-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -92,7 +91,7 @@ NAME and VERSION."
"Build SOURCE using RUBY and INPUTS." "Build SOURCE using RUBY and INPUTS."
(define build (define build
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(ruby-build #:name #$name #~(ruby-build #:name #$name
@ -101,10 +100,13 @@ NAME and VERSION."
#:gem-flags #$gem-flags #:gem-flags #$gem-flags
#:test-target #$test-target #:test-target #$test-target
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:outputs %outputs #:outputs %outputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs %build-inputs)))) #:inputs %build-inputs))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

20
guix/build-system/scons.scm
View File

@ -79,11 +79,10 @@
(source #f) (source #f)
(tests? #t) (tests? #t)
(scons-flags ''()) (scons-flags ''())
(build-targets ''()) (build-targets #~'())
(test-target "test") (test-target "test")
(install-targets ''("install")) (install-targets #~'("install"))
(phases '(@ (guix build scons-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -96,17 +95,19 @@ provides a 'SConstruct' file as its build system."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(scons-build #:name ,name (scons-build #:name ,name
#:source #+source #:source #+source
#:scons-flags #$scons-flags #:scons-flags #$(sexp->gexp scons-flags)
#:system #$system #:system #$system
#:build-targets #$build-targets #:build-targets #$build-targets
#:test-target #$test-target #:test-target #$test-target
#:tests? #$tests? #:tests? #$tests?
#:install-targets #$install-targets #:install-targets #$install-targets
#:phases #$phases #:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
#:outputs (list #$@(map (lambda (name) #:outputs (list #$@(map (lambda (name)
#~(cons #$name #~(cons #$name
(ungexp output name))) (ungexp output name)))
@ -114,8 +115,9 @@ provides a 'SConstruct' file as its build system."
#:inputs (map (lambda (tuple) #:inputs (map (lambda (tuple)
(apply cons tuple)) (apply cons tuple))
'#$inputs) '#$inputs)
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths))))) (map search-path-specification->sexp
search-paths))))))
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system

36
guix/build-system/texlive.scm
View File

@ -144,24 +144,24 @@ level package ID."
(define builder (define builder
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
(texlive-build #:name #$name
#:source #+source #$(with-build-variables inputs outputs
#:tex-directory #$tex-directory #~(texlive-build #:name #$name
#:build-targets #$build-targets #:source #+source
#:tex-format #$tex-format #:tex-directory #$tex-directory
#:system #$system #:build-targets #$build-targets
#:tests? #$tests? #:tex-format #$tex-format
#:phases #$phases #:system #$system
#:outputs (list #$@(map (lambda (name) #:tests? #$tests?
#~(cons #$name #:phases #$(if (pair? phases)
(ungexp output name))) (sexp->gexp phases)
outputs)) phases)
#:inputs (map (lambda (tuple) #:outputs %outputs
(apply cons tuple)) #:inputs %build-inputs
'#$inputs) #:search-paths '#$(sexp->gexp
#:search-paths '#$(map search-path-specification->sexp (map search-path-specification->sexp
search-paths))))) search-paths)))))))
(gexp->derivation name builder (gexp->derivation name builder
#:system system #:system system

10
guix/build-system/trivial.scm
View File

@ -54,7 +54,10 @@
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is "Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
ignored." ignored."
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f))
(builder -> (if (pair? builder)
(sexp->gexp builder)
builder)))
(gexp->derivation name (with-build-variables inputs outputs builder) (gexp->derivation name (with-build-variables inputs outputs builder)
#:system system #:system system
#:target #f #:target #f
@ -72,7 +75,10 @@ ignored."
"Run build expression BUILDER, an expression, for SYSTEM. SOURCE is "Run build expression BUILDER, an expression, for SYSTEM. SOURCE is
ignored." ignored."
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f))) system #:graft? #f))
(builder -> (if (pair? builder)
(sexp->gexp builder)
builder)))
(gexp->derivation name (with-build-variables (gexp->derivation name (with-build-variables
(append build-inputs target-inputs) (append build-inputs target-inputs)
outputs outputs

12
guix/build-system/waf.scm
View File

@ -77,9 +77,8 @@
#:key source #:key source
(tests? #t) (tests? #t)
(test-target "check") (test-target "check")
(configure-flags ''()) (configure-flags #~'())
(phases '(@ (guix build waf-build-system) (phases '%standard-phases)
%standard-phases))
(outputs '("out")) (outputs '("out"))
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
@ -91,7 +90,7 @@
as its build system." as its build system."
(define build (define build
#~(begin #~(begin
(use-modules #$@modules) (use-modules #$@(sexp->gexp modules))
#$(with-build-variables inputs outputs #$(with-build-variables inputs outputs
#~(waf-build #:name #$name #~(waf-build #:name #$name
@ -102,8 +101,9 @@ as its build system."
#:tests? #$tests? #:tests? #$tests?
#:phases #$phases #:phases #$phases
#:outputs %outputs #:outputs %outputs
#:search-paths '#$(map search-path-specification->sexp #:search-paths '#$(sexp->gexp
search-paths) (map search-path-specification->sexp
search-paths))
#:inputs %build-inputs)))) #:inputs %build-inputs))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile)) (mlet %store-monad ((guile (package->derivation (or guile (default-guile))

4
guix/packages.scm
View File

@ -769,7 +769,9 @@ specifies modules in scope when evaluating SNIPPET."
module module
(map resolve-interface '#+modules)) (map resolve-interface '#+modules))
((@ (system base compile) compile) ((@ (system base compile) compile)
'#+snippet '#+(if (pair? snippet)
(sexp->gexp snippet)
snippet)
#:to 'value #:to 'value
#:opts %auto-compilation-options #:opts %auto-compilation-options
#:env module)) #:env module))

4
guix/svn-download.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
@ -134,7 +134,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
#$(svn-multi-reference-recursive? ref) #$(svn-multi-reference-recursive? ref)
#:user-name #$(svn-multi-reference-user-name ref) #:user-name #$(svn-multi-reference-user-name ref)
#:password #$(svn-multi-reference-password ref))) #:password #$(svn-multi-reference-password ref)))
'#$(svn-multi-reference-locations ref))))) '#$(sexp->gexp (svn-multi-reference-locations ref))))))
(mlet %store-monad ((guile (package->derivation guile system))) (mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "svn-checkout") build (gexp->derivation (or name "svn-checkout") build