@@ -23,7 +23,7 @@
(use-modules (gnu packages)
(guix packages)
(guix profiles)
- ((gnu ci) #:select (%cross-targets))
+ ((gnu platform) #:select (targets))
((gnu services xorg) #:select (%default-xorg-modules))
(guix utils)
(srfi srfi-1)
@@ -144,7 +144,7 @@ (define %cross-manifest
%packages-to-cross-build)))
;; XXX: Important bits like libsigsegv and libffi don't support
;; RISCV at the moment, so don't require RISCV support.
- (delete "riscv64-linux-gnu" %cross-targets))))
+ (delete "riscv64-linux-gnu" (targets)))))
(define %cross-bootstrap-manifest
(manifest
@@ -55,6 +55,7 @@ (define-module (gnu ci)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages package-management)
+ #:use-module (gnu platform)
#:use-module (gnu system)
#:use-module (gnu system image)
#:use-module (gnu system vm)
@@ -71,7 +72,6 @@ (define-module (gnu ci)
image->job
%core-packages
- %cross-targets
channel-source->package
arguments->systems
@@ -169,17 +169,6 @@ (define (packages-to-cross-build target)
(drop-right %core-packages 6)
%core-packages))
-(define %cross-targets
- '("mips64el-linux-gnu"
- "arm-linux-gnueabihf"
- "aarch64-linux-gnu"
- "powerpc-linux-gnu"
- "powerpc64le-linux-gnu"
- "riscv64-linux-gnu"
- "i586-pc-gnu" ;aka. GNU/Hurd
- "i686-w64-mingw32"
- "x86_64-w64-mingw32"))
-
(define (cross-jobs store system)
"Return a list of cross-compilation jobs for SYSTEM."
(define (from-32-to-64? target)
@@ -221,7 +210,7 @@ (define (either proc1 proc2 proc3)
package target system))
(packages-to-cross-build target)))
(remove (either from-32-to-64? same? pointless?)
- %cross-targets)))
+ (targets))))
(define* (guix-jobs store systems #:key source commit)
"Return a list of jobs for Guix itself."
* gnu/ci.scm (%cross-targets): Remove it ... (cross-jobs): ... and use the targets procedure instead. * etc/release-manifest.scm: Adapt it. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> --- etc/release-manifest.scm | 4 ++-- gnu/ci.scm | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-)