From d35b68374543f9eed7dc1f49c73d49a31332e2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 19 Apr 2020 23:58:10 +0200 Subject: [PATCH 2/2] DRAFT gexp: #:guile-for-build defaults to a system-dependent derivation. Until now, the default #:guile-for-build would be Guile lowered to whichever system was current when %GUILE-FOR-BUILD was set. This would break when passing #:system to a value other than %CURRENT-SYSTEM. * guix/gexp.scm (lower-gexp): #:guile-for-build defaults to #f. (gexp->derivation): Likewise. (imported-files/derivation): Likewise. (imported-files): Likewise. (imported-modules): Likewise. (compiled-modules): Likewise. --- guix/gexp.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 4ac0411da1..753da8cb4d 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -784,7 +784,7 @@ second element is the derivation to compile them." (system (%current-system)) (target 'current) (graft? (%graft?)) - (guile-for-build (%guile-for-build)) + (guile-for-build #f) (effective-version "2.2") deprecation-warnings) @@ -885,7 +885,7 @@ derivations--e.g., code evaluated for its side effects." (env-vars '()) (modules '()) (module-path %load-path) - (guile-for-build (%guile-for-build)) + (guile-for-build #f) (effective-version "2.2") (graft? (%graft?)) references-graphs @@ -1357,7 +1357,7 @@ to a tree suitable for 'interned-file-tree'." #:key (name "file-import") (symlink? #f) (system (%current-system)) - (guile (%guile-for-build))) + (guile #f)) "Return a derivation that imports FILES into STORE. FILES must be a list of (FINAL-PATH . FILE) pairs. Each FILE is mapped to FINAL-PATH in the resulting store path. FILE can be either a file name, or a file-like object, @@ -1406,7 +1406,7 @@ to the source files instead of copying them." ;; The following parameters make sense when creating ;; an actual derivation. (system (%current-system)) - (guile (%guile-for-build))) + (guile #f)) "Import FILES into the store and return the resulting derivation or store file name (a derivation is created if and only if some elements of FILES are file-like objects and not local file names.) FILES must be a list @@ -1426,7 +1426,7 @@ as returned by 'local-file' for example." (define* (imported-modules modules #:key (name "module-import") (system (%current-system)) - (guile (%guile-for-build)) + (guile #f) (module-path %load-path)) "Return a derivation that contains the source files of MODULES, a list of module names such as `(ice-9 q)'. All of MODULES must be either names of @@ -1455,7 +1455,7 @@ last one is created from the given object." #:key (name "module-import-compiled") (system (%current-system)) target - (guile (%guile-for-build)) + (guile #f) (module-path %load-path) (extensions '()) (deprecation-warnings #f)) -- 2.26.0