From b0fef4d660ca86fdda5749356fbc29a456e7a326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 22 Feb 2016 19:02:16 +0100
Subject: [PATCH] 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 6b78a784e7f..5074809c436 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -44,8 +44,10 @@ (define-record-type* <graft> graft make-graft
(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 93bfbc4683a..f6afaeb5108 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -985,7 +985,7 @@ (define* (package-derivation store package
(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 @@ (define* (package-cross-derivation store package target
(()
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 c11403be19e..4a4122a3e98 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -59,7 +59,7 @@ (define %mkdir
'(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 68ab3f897b1..6315c2204f3 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -616,7 +616,7 @@ (define read-at
(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)
--
GitLab