mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
derivations: Fix indentation.
* guix/derivations.scm (derivation): Fix indentation. Change-Id: I2407b59788ce335c21c181d9f9e3f26a359e9bf5 Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
parent
0d4ded941e
commit
0bda75dd47
1 changed files with 23 additions and 23 deletions
|
@ -841,30 +841,30 @@ derivation. It is kept as-is, uninterpreted, in the derivation."
|
||||||
;; corresponding environment variable.
|
;; corresponding environment variable.
|
||||||
(match drv
|
(match drv
|
||||||
(($ <derivation> outputs inputs sources
|
(($ <derivation> outputs inputs sources
|
||||||
system builder args env-vars)
|
system builder args env-vars)
|
||||||
(let* ((drv-hash (derivation-hash drv))
|
(let* ((drv-hash (derivation-hash drv))
|
||||||
(outputs (map (match-lambda
|
(outputs (map (match-lambda
|
||||||
((output-name . ($ <derivation-output>
|
((output-name . ($ <derivation-output>
|
||||||
_ algo hash rec?))
|
_ algo hash rec?))
|
||||||
(let ((path
|
(let ((path
|
||||||
(if hash
|
(if hash
|
||||||
(fixed-output-path name hash
|
(fixed-output-path name hash
|
||||||
#:hash-algo algo
|
#:hash-algo algo
|
||||||
#:output output-name
|
#:output output-name
|
||||||
#:recursive? rec?)
|
#:recursive? rec?)
|
||||||
(output-path output-name
|
(output-path output-name
|
||||||
drv-hash name))))
|
drv-hash name))))
|
||||||
(cons output-name
|
(cons output-name
|
||||||
(make-derivation-output path algo
|
(make-derivation-output path algo
|
||||||
hash rec?)))))
|
hash rec?)))))
|
||||||
outputs)))
|
outputs)))
|
||||||
(make-derivation outputs inputs sources system builder args
|
(make-derivation outputs inputs sources system builder args
|
||||||
(map (match-lambda
|
(map (match-lambda
|
||||||
((name . value)
|
((name . value)
|
||||||
(cons name
|
(cons name
|
||||||
(or (and=> (assoc-ref outputs name)
|
(or (and=> (assoc-ref outputs name)
|
||||||
derivation-output-path)
|
derivation-output-path)
|
||||||
value))))
|
value))))
|
||||||
env-vars)
|
env-vars)
|
||||||
#f)))))
|
#f)))))
|
||||||
|
|
||||||
|
@ -910,10 +910,10 @@ derivation. It is kept as-is, uninterpreted, in the derivation."
|
||||||
;; Return a variant of ENV-VARS where each OUTPUTS is associated with an
|
;; Return a variant of ENV-VARS where each OUTPUTS is associated with an
|
||||||
;; empty string, even outputs that do not appear in ENV-VARS.
|
;; empty string, even outputs that do not appear in ENV-VARS.
|
||||||
(let ((e (map (match-lambda
|
(let ((e (map (match-lambda
|
||||||
((name . val)
|
((name . val)
|
||||||
(if (member name outputs)
|
(if (member name outputs)
|
||||||
(cons name "")
|
(cons name "")
|
||||||
(cons name val))))
|
(cons name val))))
|
||||||
env-vars)))
|
env-vars)))
|
||||||
(fold (lambda (output-name env-vars)
|
(fold (lambda (output-name env-vars)
|
||||||
(if (assoc output-name env-vars)
|
(if (assoc output-name env-vars)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue