cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle a change in guix with the <derivation-input> record

Browse source 
The first field is now a <derivation> record, rather than a store path for the
derivation.

It's probably not necessary to cope with two versions, but this is what I've
done currently.
This commit is contained in:
Christopher Baines 2019-09-01 13:04:23 +01:00
parent 3ad100bedc
commit c1fad22cd1
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
guix-data-service/model/derivation.scm
View file

@ -277,12 +277,20 @@ ORDER BY derivations.system DESC,
(insert-into-derivation-inputs (insert-into-derivation-inputs
(append-map (append-map
(match-lambda (match-lambda
(($ <derivation-input> path sub-derivations) (($ <derivation-input> derivation-or-path sub-derivations)
(map (lambda (sub-derivation) (let ((path
(select-derivation-output-id conn (match derivation-or-path
sub-derivation ((? derivation? d)
path)) ;; The first field changed to a derivation (from the file
sub-derivations))) ;; name) in 5cf4b26d52bcea382d98fb4becce89be9ee37b55
(derivation-file-name d))
((? string? s)
s))))
(map (lambda (sub-derivation)
(select-derivation-output-id conn
sub-derivation
path))
sub-derivations))))
derivation-inputs))))) derivation-inputs)))))
(define (select-from-derivation-source-files store-paths) (define (select-from-derivation-source-files store-paths)