diff options
| author | Christopher Baines <mail@cbaines.net> | 2025-03-09 13:20:08 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2025-03-10 06:30:43 +0000 |
| commit | 61d49cedb3f8638a3eaa826675216a11fada2ae9 (patch) | |
| tree | 75fd881361cfa1e2e6fae958b0b794deb37398ad | |
| parent | 59f1a04f4e1ad92c48709bf5247facf83ad281b0 (diff) | |
| download | data-service-61d49cedb3f8638a3eaa826675216a11fada2ae9.tar data-service-61d49cedb3f8638a3eaa826675216a11fada2ae9.tar.gz | |
Remove compatability with old guix derivation-inputs
| -rw-r--r-- | guix-data-service/model/derivation.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm index 4660a4c..4cb8db4 100644 --- a/guix-data-service/model/derivation.scm +++ b/guix-data-service/model/derivation.scm @@ -1415,15 +1415,11 @@ VALUES ($1, $2);" derivation-id (append-map! (match-lambda - (($ <derivation-input> derivation-or-path sub-derivations) - (let ((path - (match derivation-or-path - ((? derivation? d) - ;; The first field changed to a derivation (from the file - ;; name) in 5cf4b26d52bcea382d98fb4becce89be9ee37b55 - (derivation-file-name d)) - ((? string? s) - s)))) + ;; The first field changed to a derivation (from the file name) + ;; in 5cf4b26d52bcea382d98fb4becce89be9ee37b55, so guard against + ;; that in the match + (($ <derivation-input> (? derivation? d) sub-derivations) + (let ((path (derivation-file-name d))) (map (lambda (sub-derivation) (select-derivation-output-id conn sub-derivation |