[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: Compute more cross derivations
From: |
Christopher Baines |
Subject: |
01/07: Compute more cross derivations |
Date: |
Fri, 11 Mar 2022 08:28:36 -0500 (EST) |
cbaines pushed a commit to branch master
in repository data-service.
commit 0e3f65062a40bcb6653f743c682ba90b80b68b6b
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri Mar 11 10:07:08 2022 +0000
Compute more cross derivations
---
guix-data-service/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
- branch master updated (fe556f4 -> c067918), Christopher Baines, 2022/03/11
- 01/07: Compute more cross derivations,
Christopher Baines <=
- 04/07: Extract out the code for starting an inferior, Christopher Baines, 2022/03/11
- 06/07: Close the load revision inferior prior to inserting data, Christopher Baines, 2022/03/11
- 07/07: Fix an issue with the /builds page, Christopher Baines, 2022/03/11
- 02/07: Disable value history in the inferior repl, Christopher Baines, 2022/03/11
- 03/07: Process each system target pair individually, Christopher Baines, 2022/03/11
- 05/07: Add to the hardcoded list of valid targets, Christopher Baines, 2022/03/11