02/03: grafts: 'name' parameter of 'graft-derivation' is now optional.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit b0fef4d660ca86fdda5749356fbc29a456e7a326
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 22 19:02:16 2016 +0100

    grafts: 'name' parameter of 'graft-derivation' is now optional.
    
    * guix/grafts.scm (graft-derivation): Name 'name' a keyword parameter.
    * guix/packages.scm (package-derivation, package-cross-derivation):
    Adjust accordingly.
    * tests/grafts.scm ("graft-derivation"): Likewise.
    * tests/packages.scm ("package-derivation, indirect grafts"): Likewise.
---
 guix/grafts.scm    |    6 ++++--
 guix/packages.scm  |    4 ++--
 tests/grafts.scm   |    2 +-
 tests/packages.scm |    2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/guix/grafts.scm b/guix/grafts.scm
index 6b78a78..5074809 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -44,8 +44,10 @@
   (replacement-output graft-replacement-output    ;string | #f
                       (default "out")))
 
-(define* (graft-derivation store name drv grafts
-                           #:key (guile (%guile-for-build))
+(define* (graft-derivation store drv grafts
+                           #:key
+                           (name (derivation-name drv))
+                           (guile (%guile-for-build))
                            (system (%current-system)))
   "Return a derivation called NAME, based on DRV but with all the GRAFTS
 applied."
diff --git a/guix/packages.scm b/guix/packages.scm
index 93bfbc4..f6afaeb 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -985,7 +985,7 @@ This is an internal procedure."
                   (grafts
                    (let ((guile (package-derivation store (default-guile)
                                                     system #:graft? #f)))
-                     (graft-derivation store (bag-name bag) drv grafts
+                     (graft-derivation store drv grafts
                                        #:system system
                                        #:guile guile))))
                 drv))))
@@ -1003,7 +1003,7 @@ system identifying string)."
                   (()
                    drv)
                   (grafts
-                   (graft-derivation store (bag-name bag) drv grafts
+                   (graft-derivation store drv grafts
                                      #:system system
                                      #:guile
                                      (package-derivation store (default-guile)
diff --git a/tests/grafts.scm b/tests/grafts.scm
index c11403b..4a4122a 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -59,7 +59,7 @@
                                               '(call-with-output-file %output
                                                  (lambda (port)
                                                    (display "fake mkdir" 
port)))))
-         (graft (graft-derivation %store "graft" orig
+         (graft (graft-derivation %store orig
                                   (list (graft
                                           (origin %bash)
                                           (replacement one))
diff --git a/tests/packages.scm b/tests/packages.scm
index 68ab3f8..6315c22 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -616,7 +616,7 @@
          (guile (package-derivation %store (canonical-package guile-2.0)
                                     #:graft? #f)))
     (equal? (package-derivation %store dummy)
-            (graft-derivation %store "dummy-0"
+            (graft-derivation %store
                               (package-derivation %store dummy #:graft? #f)
                               (package-grafts %store dummy)