diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
commit | 6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09 (patch) | |
tree | c2c35f733d250f86eb052d174fcb1c24a54fea79 /guix/derivations.scm | |
parent | 20e4ee1e3b7044d9f64de02c6237b00e5a57da35 (diff) | |
parent | 010689e7067df1288af29176f4a8639de816b1ef (diff) | |
download | guix-patches-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.tar guix-patches-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'guix/derivations.scm')
-rw-r--r-- | guix/derivations.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index cad77bdb06..8145d51143 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -62,6 +62,7 @@ <derivation-input> derivation-input? derivation-input-path + derivation-input-derivation derivation-input-sub-derivations derivation-input-output-paths valid-derivation-input? @@ -152,6 +153,10 @@ (path derivation-input-path) ; store path (sub-derivations derivation-input-sub-derivations)) ; list of strings +(define (derivation-input-derivation input) + "Return the <derivation> object INPUT refers to." + (read-derivation-from-file (derivation-input-path input))) + (set-record-type-printer! <derivation> (lambda (drv port) (format port "#<derivation ~a => ~a ~a>" @@ -243,9 +248,7 @@ result is the set of prerequisites of DRV not already in valid." (fold2 loop (append inputs result) (fold set-insert input-set inputs) - (map (lambda (i) - (read-derivation-from-file (derivation-input-path i))) - inputs))))) + (map derivation-input-derivation inputs))))) (define (offloadable-derivation? drv) "Return true if DRV can be offloaded, false otherwise." |