diff options
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index bd4c3b4..8a7e5aa 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -588,7 +588,6 @@ WHERE job_id = $1") ("riscv64-linux-gnu" . "") ; TODO I don't know? ("i586-pc-gnu" . "i586-gnu"))) - ;; TODO Currently unused (define package-transitive-supported-systems-supports-multiple-arguments? #t) (define (get-supported-systems package system) (or (and package-transitive-supported-systems-supports-multiple-arguments? @@ -602,17 +601,17 @@ WHERE job_id = $1") ;; package-transitive-supported-systems (simple-format (current-error-port) - "info: package-transitive-supported-systems doesn't support two arguments, falling back to one\n") + "info: package-transitive-supported-systems doesn't support two arguments, falling back to package-supported-systems\n") (set! package-transitive-supported-systems-supports-multiple-arguments? #f) #f))) (catch #t (lambda () - (package-transitive-supported-systems package)) + (package-supported-systems package)) (lambda (key . args) (simple-format (current-error-port) - "error: while processing ~A, unable to compute transitive supported systems\n" + "error: while processing ~A, unable to compute supported systems\n" (package-name package)) (simple-format (current-error-port) @@ -662,8 +661,9 @@ WHERE job_id = $1") (lambda () (append-map (lambda (system) - (let ((supported-systems (package-supported-systems package))) - (if supported-systems + (let ((supported-systems (get-supported-systems package system))) + (if (and supported-systems + (member system supported-systems)) (filter-map (lambda (target) (derivations-for-system-and-target inferior-package-id @@ -678,7 +678,7 @@ WHERE job_id = $1") (assoc-ref target-system-alist target))) (member system-for-target - supported-systems + (package-supported-systems package) string=?)))) (list ,@(map cdr system-target-pairs)))) '()))) |