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

derivations: Export 'fixed-output-path'. 

* guix/derivations.scm (fixed-output-path): Change 'output',
'hash-algo', and 'recursive?' to keyword parameters.  Export.
(derivation): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2016-07-20 16:39:19 +02:00
parent a849273509
commit 260bc60f83
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
guix/derivations.scm
View File

@ -73,6 +73,7 @@
derivation-name derivation-name
derivation-output-names derivation-output-names
fixed-output-derivation? fixed-output-derivation?
fixed-output-path
offloadable-derivation? offloadable-derivation?
substitutable-derivation? substitutable-derivation?
substitution-oracle substitution-oracle
@ -676,7 +677,11 @@ the derivation called NAME with hash HASH."
name name
(string-append name "-" output)))) (string-append name "-" output))))
(define (fixed-output-path output hash-algo hash recursive? name) (define* (fixed-output-path name hash
#:key
(output "out")
(hash-algo 'sha256)
(recursive? #t))
"Return an output path for the fixed output OUTPUT defined by HASH of type "Return an output path for the fixed output OUTPUT defined by HASH of type
HASH-ALGO, of the derivation NAME. RECURSIVE? has the same meaning as for HASH-ALGO, of the derivation NAME. RECURSIVE? has the same meaning as for
'add-to-store'." 'add-to-store'."
@ -736,12 +741,14 @@ output should not be used."
(outputs (map (match-lambda (outputs (map (match-lambda
((output-name . ($ <derivation-output> ((output-name . ($ <derivation-output>
_ algo hash rec?)) _ algo hash rec?))
(let ((path (if hash (let ((path
(fixed-output-path output-name (if hash
algo hash (fixed-output-path name hash
rec? name) #:hash-algo algo
(output-path output-name #:output output-name
drv-hash name)))) #:recursive? rec?)
(output-path output-name
drv-hash name))))
(cons output-name (cons output-name
(make-derivation-output path algo (make-derivation-output path algo
hash rec?))))) hash rec?)))))