cbaines pushed a commit to branch master
in repository data-service.
commit 0ca9c3f64fc7e70d983a5eac8cc8e58b1309ea03
Author: Christopher Baines <[email protected]>
AuthorDate: Thu Jul 18 13:58:21 2024 +0100
Catch and ignore the new cross build derivation errors
---
guix-data-service/jobs/load-new-guix-revision.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm
b/guix-data-service/jobs/load-new-guix-revision.scm
index 7945a19..672577f 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -473,6 +473,10 @@
'misc-error
(lambda ()
(guard (c ((package-cross-build-system-error? c)
+ #f)
+ ((package-unsupported-target-error? c)
+ #f)
+ ((unsupported-cross-compilation-target-error? c)
#f))
(let ((derivation
(if target
@@ -579,6 +583,17 @@
(use-modules (guix platform)))
inf)
+ (unless (inferior-eval
+ '(defined? 'package-unsupported-target-error?
+ (resolve-module '(guix packages)))
+ inf)
+ (inferior-eval
+ '(define package-unsupported-target-error? (const #f))
+ inf)
+ (inferior-eval
+ '(define unsupported-cross-compilation-target-error? (const #f))
+ inf))
+
(format (current-error-port)
"heap size: ~a MiB~%"
(round
