diff options
Diffstat (limited to 'guix/derivations.scm')
| -rw-r--r-- | guix/derivations.scm | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index ebeac31877..186d7a3f8f 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -320,8 +320,7 @@ substituter many times." ;; info is not already in cache. ;; Also, skip derivations marked as non-substitutable. (append-map (lambda (input) - (let ((drv (read-derivation-from-file - (derivation-input-path input)))) + (let ((drv (derivation-input-derivation input))) (if (substitutable-derivation? drv) (derivation-input-output-paths input) '()))) @@ -652,12 +651,10 @@ list of name/path pairs of its outputs." ;;; Derivation primitive. ;;; -(define derivation-path->base16-hash - (mlambda (file) - "Return a string containing the base16 representation of the hash of the -derivation at FILE." - (bytevector->base16-string - (derivation-hash (read-derivation-from-file file))))) +(define derivation-base16-hash + (mlambdaq (drv) + "Return a string containing the base16 representation of the hash of DRV." + (bytevector->base16-string (derivation-hash drv)))) (define (derivation/masked-inputs drv) "Assuming DRV is a regular derivation (not fixed-output), replace the file @@ -666,9 +663,8 @@ name of each input with that input's hash." (($ <derivation> outputs inputs sources system builder args env-vars) (let ((inputs (map (match-lambda - (($ <derivation-input> (= derivation-file-name path) - sub-drvs) - (let ((hash (derivation-path->base16-hash path))) + (($ <derivation-input> drv sub-drvs) + (let ((hash (derivation-base16-hash drv))) (make-derivation-input hash sub-drvs)))) inputs))) (make-derivation outputs @@ -886,8 +882,11 @@ long-running processes that know what they're doing. Use with care!" ;; Typically this is meant to be used by Cuirass and Hydra, which can clear ;; caches when they start evaluating packages for another architecture. (invalidate-memoization! derivation->bytevector) - (invalidate-memoization! derivation-path->base16-hash) - (hash-clear! %derivation-cache)) + (invalidate-memoization! derivation-base16-hash) + + ;; FIXME: Comment out to work around <https://bugs.gnu.org/36487>. + ;; (hash-clear! %derivation-cache) + ) (define derivation-properties (mlambdaq (drv) @@ -945,16 +944,14 @@ recursively." ;; in the format used in 'derivation' calls. (mlambda (input loop) (match input - (($ <derivation-input> (= derivation-file-name path) - (sub-drvs ...)) - (match (vhash-assoc path mapping) + (($ <derivation-input> drv (sub-drvs ...)) + (match (vhash-assoc (derivation-file-name drv) mapping) ((_ . (? derivation? replacement)) (cons replacement sub-drvs)) ((_ . replacement) (list replacement)) (#f - (let* ((drv (loop (read-derivation-from-file path)))) - (cons drv sub-drvs)))))))) + (cons (loop drv) sub-drvs))))))) (let loop ((drv drv)) (let* ((inputs (map (cut rewritten-input <> loop) |