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

derivations: Split 'derivation-hash' in two procedures. 

* guix/derivations.scm (derivation/masked-inputs): New procedure.
(derivation-hash): Use it instead of the inline code.
This commit is contained in:
Ludovic Courtès 2017-12-13 14:00:20 +01:00
parent d738f134e4
commit eb1150c22c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
guix/derivations.scm
View File

@ -632,6 +632,24 @@ derivation at FILE."
(bytevector->base16-string (bytevector->base16-string
(derivation-hash (read-derivation-from-file file))))) (derivation-hash (read-derivation-from-file file)))))
(define (derivation/masked-inputs drv)
"Assuming DRV is a regular derivation (not fixed-output), replace the file
name of each input with that input's hash."
(match drv
(($ <derivation> outputs inputs sources
system builder args env-vars)
(let ((inputs (map (match-lambda
(($ <derivation-input> path sub-drvs)
(let ((hash (derivation-path->base16-hash path)))
(make-derivation-input hash sub-drvs))))
inputs)))
(make-derivation outputs
(sort (coalesce-duplicate-inputs inputs)
derivation-input<?)
sources
system builder args env-vars
#f)))))
(define derivation-hash ; `hashDerivationModulo' in derivations.cc (define derivation-hash ; `hashDerivationModulo' in derivations.cc
(mlambda (drv) (mlambda (drv)
"Return the hash of DRV, modulo its fixed-output inputs, as a bytevector." "Return the hash of DRV, modulo its fixed-output inputs, as a bytevector."
@ -647,27 +665,12 @@ derivation at FILE."
(symbol->string hash-algo) (symbol->string hash-algo)
":" (bytevector->base16-string hash) ":" (bytevector->base16-string hash)
":" path)))) ":" path))))
(($ <derivation> outputs inputs sources (_
system builder args env-vars)
;; A regular derivation: replace the path of each input with that
;; input's hash; return the hash of serialization of the resulting
;; derivation.
(let* ((inputs (map (match-lambda
(($ <derivation-input> path sub-drvs)
(let ((hash (derivation-path->base16-hash path)))
(make-derivation-input hash sub-drvs))))
inputs))
(drv (make-derivation outputs
(sort (coalesce-duplicate-inputs inputs)
derivation-input<?)
sources
system builder args env-vars
#f)))
;; XXX: At this point this remains faster than `port-sha256', because ;; XXX: At this point this remains faster than `port-sha256', because
;; the SHA256 port's `write' method gets called for every single ;; the SHA256 port's `write' method gets called for every single
;; character. ;; character.
(sha256 (derivation->bytevector drv))))))) (sha256 (derivation->bytevector (derivation/masked-inputs drv)))))))
(define* (derivation store name builder args (define* (derivation store name builder args
#:key #:key