From 61d49cedb3f8638a3eaa826675216a11fada2ae9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 9 Mar 2025 13:20:08 +0000 Subject: Remove compatability with old guix derivation-inputs --- guix-data-service/model/derivation.scm | 14 +++++--------- 1 file 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-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? d) sub-derivations) + (let ((path (derivation-file-name d))) (map (lambda (sub-derivation) (select-derivation-output-id conn sub-derivation -- cgit v1.2.3