nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2016-02-22 19:02:16 +01:00
parent 7adf9b8469
commit b0fef4d660
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/grafts.scm
View File

@ -44,8 +44,10 @@
(replacement-output graft-replacement-output ;string | #f (replacement-output graft-replacement-output ;string | #f
(default "out"))) (default "out")))
(define* (graft-derivation store name drv grafts (define* (graft-derivation store drv grafts
#:key (guile (%guile-for-build)) #:key
(name (derivation-name drv))
(guile (%guile-for-build))
(system (%current-system))) (system (%current-system)))
"Return a derivation called NAME, based on DRV but with all the GRAFTS "Return a derivation called NAME, based on DRV but with all the GRAFTS
applied." applied."

4
guix/packages.scm
View File

@ -985,7 +985,7 @@ This is an internal procedure."
(grafts (grafts
(let ((guile (package-derivation store (default-guile) (let ((guile (package-derivation store (default-guile)
system #:graft? #f))) system #:graft? #f)))
(graft-derivation store (bag-name bag) drv grafts (graft-derivation store drv grafts
#:system system #:system system
#:guile guile)))) #:guile guile))))
drv)))) drv))))
@ -1003,7 +1003,7 @@ system identifying string)."
(() (()
drv) drv)
(grafts (grafts
(graft-derivation store (bag-name bag) drv grafts (graft-derivation store drv grafts
#:system system #:system system
#:guile #:guile
(package-derivation store (default-guile) (package-derivation store (default-guile)

2
tests/grafts.scm
View File

@ -59,7 +59,7 @@
'(call-with-output-file %output '(call-with-output-file %output
(lambda (port) (lambda (port)
(display "fake mkdir" port))))) (display "fake mkdir" port)))))
(graft (graft-derivation %store "graft" orig (graft (graft-derivation %store orig
(list (graft (list (graft
(origin %bash) (origin %bash)
(replacement one)) (replacement one))

2
tests/packages.scm
View File

@ -616,7 +616,7 @@
(guile (package-derivation %store (canonical-package guile-2.0) (guile (package-derivation %store (canonical-package guile-2.0)
#:graft? #f))) #:graft? #f)))
(equal? (package-derivation %store dummy) (equal? (package-derivation %store dummy)
(graft-derivation %store "dummy-0" (graft-derivation %store
(package-derivation %store dummy #:graft? #f) (package-derivation %store dummy #:graft? #f)
(package-grafts %store dummy) (package-grafts %store dummy)