From b0fef4d660ca86fdda5749356fbc29a456e7a326 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 22 Feb 2016 19:02:16 +0100 Subject: 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. --- tests/grafts.scm | 2 +- tests/packages.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/grafts.scm b/tests/grafts.scm index c11403be19..4a4122a3e9 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 68ab3f897b..6315c2204f 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) -- cgit v1.2.3