derivations: Use more keyword parameters for 'build-expression->derivation'.

* guix/derivations.scm (build-expression->derivation): Turn 'system' and
  'inputs' into keyword parameters.
  Adjust callers accordingly.
* gnu/system/linux.scm, gnu/system/vm.scm, guix/build-system/cmake.scm,
  guix/build-system/gnu.scm, guix/build-system/perl.scm,
  guix/build-system/python.scm, guix/build-system/trivial.scm,
  guix/download.scm, guix/packages.scm, guix/profiles.scm,
  guix/scripts/pull.scm, tests/derivations.scm, tests/guix-build.sh,
  tests/monads.scm, tests/store.scm, tests/union.scm: Adjust users of
  'build-expression->derivation' and 'derivation-expression'
  accordingly.
* doc/guix.texi (Derivations): Adjust 'build-expression->derivation'
  documentation accordingly.
  (The Store Monad): Likewise for 'derivation-expression'.

5 files changed, 23 insertions, 15 deletions

diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 1a5f4b6ad1..8c9a32c8ab 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -104,8 +104,9 @@ provides a 'CMakeLists.txt' file as its build system."
          (package-derivation store guile system)))))
 
   (let ((cmake (package-derivation store cmake system)))
-    (build-expression->derivation store name system
-                                  builder
+    (build-expression->derivation store name builder
+                                  #:system system
+                                  #:inputs
                                   `(,@(if source
                                           `(("source" ,source))
                                           '())
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 7725b8b67a..333ae9273e 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -323,8 +323,9 @@ which could lead to gratuitous input divergence."
               (guile  (module-ref distro 'guile-final)))
          (package-derivation store guile system)))))
 
-  (build-expression->derivation store name system
-                                builder
+  (build-expression->derivation store name builder
+                                #:system system
+                                #:inputs
                                 `(,@(if source
                                         `(("source" ,source))
                                         '())
@@ -493,8 +494,9 @@ platform."
               (guile  (module-ref distro 'guile-final)))
          (package-derivation store guile system)))))
 
-  (build-expression->derivation store name system
-                                builder
+  (build-expression->derivation store name builder
+                                #:system system
+                                #:inputs
                                 `(,@(if source
                                         `(("source" ,source))
                                         '())
diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm
index 5dc50d97f3..4e5aea3a2f 100644
--- a/guix/build-system/perl.scm
+++ b/guix/build-system/perl.scm
@@ -93,8 +93,9 @@ provides a `Makefile.PL' file as its build system."
          (package-derivation store guile system)))))
 
   (let ((perl (package-derivation store perl system)))
-    (build-expression->derivation store name system
-                                  builder
+    (build-expression->derivation store name builder
+                                  #:system system
+                                  #:inputs
                                   `(,@(if source
                                           `(("source" ,source))
                                           '())
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index a97135fe0c..7e26864653 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -146,8 +146,8 @@ provides a 'setup.py' file as its build system."
          (package-derivation store guile system)))))
 
   (let ((python (package-derivation store python system)))
-    (build-expression->derivation store name system
-                                  builder
+    (build-expression->derivation store name builder
+                                  #:inputs
                                   `(,@(if source
                                           `(("source" ,source))
                                           '())
@@ -158,6 +158,7 @@ provides a 'setup.py' file as its build system."
                                     ;; 'gnu-build-system'.
                                     ,@(standard-inputs system))
 
+                                  #:system system
                                   #:modules imported-modules
                                   #:outputs outputs
                                   #:guile-for-build guile-for-build)))
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
index f91997d1e9..5576d596da 100644
--- a/guix/build-system/trivial.scm
+++ b/guix/build-system/trivial.scm
@@ -42,10 +42,11 @@
                         search-paths)
   "Run build expression BUILDER, an expression, for SYSTEM.  SOURCE is
 ignored."
-  (build-expression->derivation store name system builder
-                                (if source
-                                    `(("source" ,source) ,@inputs)
-                                    inputs)
+  (build-expression->derivation store name builder
+                                #:inputs (if source
+                                             `(("source" ,source) ,@inputs)
+                                             inputs)
+                                #:system system
                                 #:outputs outputs
                                 #:modules modules
                                 #:guile-for-build
@@ -56,7 +57,9 @@ ignored."
                               outputs guile system builder (modules '())
                               search-paths native-search-paths)
   "Like `trivial-build', but in a cross-compilation context."
-  (build-expression->derivation store name system builder
+  (build-expression->derivation store name builder
+                                #:system system
+                                #:inputs
                                 (let ((inputs (append native-inputs inputs)))
                                   (if source
                                       `(("source" ,source) ,@inputs)