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'.
---
 gnu/system/linux.scm | 3 ++-
 gnu/system/vm.scm    | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'gnu')

diff --git a/gnu/system/linux.scm b/gnu/system/linux.scm
index eb3e133044..65868ce9bf 100644
--- a/gnu/system/linux.scm
+++ b/gnu/system/linux.scm
@@ -108,7 +108,8 @@
                      %build-inputs)
            #t)))
 
-    (derivation-expression "pam.d" (%current-system) builder (zip names files))))
+    (derivation-expression "pam.d" builder
+                           #:inputs (zip names files))))
 
 (define %pam-other-services
   ;; The "other" PAM configuration, which denies everything (see
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 2413a97150..a9f157d915 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -196,7 +196,9 @@ made available under the /xchg CIFS share."
                                      ("coreutils" ,coreutils)
                                      ("builder" ,user-builder)
                                      ,@inputs))))
-    (derivation-expression name system builder inputs
+    (derivation-expression name builder
+                           #:system system
+                           #:inputs inputs
                            #:env-vars env-vars
                            #:modules (delete-duplicates
                                       `((guix build utils)
@@ -450,8 +452,9 @@ input tuples."
                                (x
                                 (return x)))
                               inputs))))
-    (derivation-expression name system builder
-                           inputs
+    (derivation-expression name builder
+                           #:system system
+                           #:inputs inputs
                            #:modules '((guix build union))
                            #:guile-for-build guile)))
 
-- 
cgit v1.2.3