From 09763444ce748487640c95d4e1a2cf9645c4e250 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 12 Dec 2019 12:56:55 +0100 Subject: derivations: Add #:skip-dependencies? parameter to 'derivation-input-fold'. * guix/derivations.scm (derivation-input-fold): Add #:skip-dependencies?. --- guix/derivations.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 480a65c78b..0ee325d489 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -305,10 +305,13 @@ (define (derivation-output-paths drv sub-drvs) sub-drvs)))) (define* (derivation-input-fold proc seed inputs - #:key (cut? (const #f))) + #:key + (cut? (const #f)) + (skip-dependencies? (const #f))) "Perform a breadth-first traversal of INPUTS, calling PROC on each input -with the current result, starting from SEED. Skip recursion on inputs that -match CUT?." +with the current result, starting from SEED. Skip inputs that match CUT? as +well as all their dependencies; skip the dependencies of inputs that match +SKIP-DEPENDENCIES?, but not the input itself." (let loop ((inputs inputs) (result seed) (visited (set))) @@ -323,7 +326,9 @@ (define* (derivation-input-fold proc seed inputs (loop rest result (set-insert key visited))) (else (let ((drv (derivation-input-derivation input))) - (loop (append (derivation-inputs drv) rest) + (loop (if (skip-dependencies? input) + rest + (append (derivation-inputs drv) rest)) (proc input result) (set-insert key visited)))))))))) -- cgit v1.2.3