cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compute more cross derivations

Browse source
This commit is contained in:
Christopher Baines 2022-03-11 10:07:08 +00:00
parent fe556f4a4d
commit 0e3f65062a
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -572,9 +572,13 @@ WHERE job_id = $1")
(define cross-derivations (define cross-derivations
`(("x86_64-linux" . ("arm-linux-gnueabihf" `(("x86_64-linux" . ("arm-linux-gnueabihf"
"aarch64-linux-gnu" "aarch64-linux-gnu"
"mips64el-linux-gnu"
"powerpc-linux-gnu" "powerpc-linux-gnu"
"powerpc64le-linux-gnu"
"riscv64-linux-gnu" "riscv64-linux-gnu"
"i586-pc-gnu")))) "i586-pc-gnu"
"i686-w64-mingw32"
"x86_64-w64-mingw32"))))
(define supported-system-pairs (define supported-system-pairs
(map (lambda (system) (map (lambda (system)
@ -596,8 +600,10 @@ WHERE job_id = $1")
(define target-system-alist (define target-system-alist
'(("arm-linux-gnueabihf" . "armhf-linux") '(("arm-linux-gnueabihf" . "armhf-linux")
("aarch64-linux-gnu" . "aarch64-linux") ("aarch64-linux-gnu" . "aarch64-linux")
("powerpc-linux-gnu" . "") ; TODO I don't know? ("mips64el-linux-gnu" . "mips64el-linux")
("riscv64-linux-gnu" . "") ; TODO I don't know? ("powerpc-linux-gnu" . "powerpc-linux")
("powerpc64le-linux-gnu" . "powerpc64le-linux")
("riscv64-linux-gnu" . "riscv64-linux")
("i586-pc-gnu" . "i586-gnu"))) ("i586-pc-gnu" . "i586-gnu")))
(define package-transitive-supported-systems-supports-multiple-arguments? #t) (define package-transitive-supported-systems-supports-multiple-arguments? #t)
@ -689,9 +695,10 @@ WHERE job_id = $1")
(let ((system-for-target (let ((system-for-target
(assoc-ref target-system-alist (assoc-ref target-system-alist
target))) target)))
(or (not system-for-target)
(member system-for-target (member system-for-target
(package-supported-systems package) (package-supported-systems package)
string=?)))) string=?)))))
(list ,@(map cdr system-target-pairs)))) (list ,@(map cdr system-target-pairs))))
'()))) '())))
(delete-duplicates (delete-duplicates