From 0e3f65062a40bcb6653f743c682ba90b80b68b6b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 11 Mar 2022 10:07:08 +0000 Subject: [PATCH] Compute more cross derivations --- .../jobs/load-new-guix-revision.scm | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 2b8a34b..cdfe8b0 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -572,9 +572,13 @@ WHERE job_id = $1") (define cross-derivations `(("x86_64-linux" . ("arm-linux-gnueabihf" "aarch64-linux-gnu" + "mips64el-linux-gnu" "powerpc-linux-gnu" + "powerpc64le-linux-gnu" "riscv64-linux-gnu" - "i586-pc-gnu")))) + "i586-pc-gnu" + "i686-w64-mingw32" + "x86_64-w64-mingw32")))) (define supported-system-pairs (map (lambda (system) @@ -594,11 +598,13 @@ WHERE job_id = $1") (define (proc packages system-target-pairs) `(lambda (store) (define target-system-alist - '(("arm-linux-gnueabihf" . "armhf-linux") - ("aarch64-linux-gnu" . "aarch64-linux") - ("powerpc-linux-gnu" . "") ; TODO I don't know? - ("riscv64-linux-gnu" . "") ; TODO I don't know? - ("i586-pc-gnu" . "i586-gnu"))) + '(("arm-linux-gnueabihf" . "armhf-linux") + ("aarch64-linux-gnu" . "aarch64-linux") + ("mips64el-linux-gnu" . "mips64el-linux") + ("powerpc-linux-gnu" . "powerpc-linux") + ("powerpc64le-linux-gnu" . "powerpc64le-linux") + ("riscv64-linux-gnu" . "riscv64-linux") + ("i586-pc-gnu" . "i586-gnu"))) (define package-transitive-supported-systems-supports-multiple-arguments? #t) (define (get-supported-systems package system) @@ -689,9 +695,10 @@ WHERE job_id = $1") (let ((system-for-target (assoc-ref target-system-alist target))) - (member system-for-target - (package-supported-systems package) - string=?)))) + (or (not system-for-target) + (member system-for-target + (package-supported-systems package) + string=?))))) (list ,@(map cdr system-target-pairs)))) '()))) (delete-duplicates