From dd1a5a152c679ba2d386dc66127a0de924182e26 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 4 Dec 2013 16:07:36 +0100
Subject: 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'.
---
 guix/derivations.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'guix/derivations.scm')

diff --git a/guix/derivations.scm b/guix/derivations.scm
index 63c1ba4f2b..3d9f0affbf 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -824,8 +824,9 @@ (define* (imported-files store files
                                                       (mkdir ,tail))))))
                                      `((symlink ,store-path ,final-path)))))
                            files))))
-    (build-expression->derivation store name system
-                                  builder files
+    (build-expression->derivation store name builder
+                                  #:system system
+                                  #:inputs files
                                   #:guile-for-build guile)))
 
 (define* (imported-modules store modules
@@ -889,12 +890,16 @@ (define builder
                                     #:opts %auto-compilation-options)))))
                 files)))
 
-    (build-expression->derivation store name system builder
-                                  `(("modules" ,module-drv))
+    (build-expression->derivation store name builder
+                                  #:inputs `(("modules" ,module-drv))
+                                  #:system system
                                   #:guile-for-build guile)))
 
-(define* (build-expression->derivation store name system exp inputs
-                                       #:key (outputs '("out"))
+(define* (build-expression->derivation store name exp
+                                       #:key
+                                       (system (%current-system))
+                                       (inputs '())
+                                       (outputs '("out"))
                                        hash hash-algo
                                        (env-vars '())
                                        (modules '())
-- 
cgit v1.2.3