;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
(use-modules (guix config)
(guix store)
+ (guix grafts)
+ (guix profiles)
(guix packages)
(guix derivations)
(guix monads)
((guix licenses) #:select (gpl3+))
((guix utils) #:select (%current-system))
((guix scripts system) #:select (read-operating-system))
+ ((guix scripts pack)
+ #:select (lookup-compressor self-contained-tarball))
(gnu packages)
(gnu packages gcc)
(gnu packages base)
(gnu packages compression)
(gnu packages multiprecision)
(gnu packages make-bootstrap)
- (gnu packages commencement)
(gnu packages package-management)
(gnu system)
(gnu system vm)
(gnu system install)
+ (gnu tests)
(srfi srfi-1)
(srfi srfi-26)
(ice-9 match))
(define* (package->alist store package system
#:optional (package-derivation package-derivation))
"Convert PACKAGE to an alist suitable for Hydra."
- `((derivation . ,(derivation-file-name
- (package-derivation store package system
- #:graft? #f)))
- (description . ,(package-synopsis package))
- (long-description . ,(package-description package))
- (license . ,(package-license package))
- (home-page . ,(package-home-page package))
- (maintainers . ("bug-guix@gnu.org"))
-
- ;; Work around versions of 'hydra-eval-guile-jobs' before Hydra commit
- ;; 61448ca (27 Feb. 2014) which used a default timeout of 2h.
- (timeout . 72000)))
+ (parameterize ((%graft? #f))
+ `((derivation . ,(derivation-file-name
+ (package-derivation store package system
+ #:graft? #f)))
+ (description . ,(package-synopsis package))
+ (long-description . ,(package-description package))
+ (license . ,(package-license package))
+ (home-page . ,(package-home-page package))
+ (maintainers . ("bug-guix@gnu.org"))
+ (max-silent-time . ,(or (assoc-ref (package-properties package)
+ 'max-silent-time)
+ 3600)) ;1 hour by default
+ (timeout . ,(or (assoc-ref (package-properties package) 'timeout)
+ 72000))))) ;20 hours by default
(define (package-job store job-name package system)
"Return a job called JOB-NAME that builds PACKAGE on SYSTEM."
;; Note: Don't put the '-final' package variants because (1) that's
;; implicit, and (2) they cannot be cross-built (due to the explicit input
;; chain.)
- (list gcc-4.8 gcc-4.7 glibc binutils
+ (list gcc-4.8 gcc-4.9 gcc-5 glibc binutils
gmp mpfr mpc coreutils findutils diffutils patch sed grep
- gawk gnu-gettext hello guile-2.0 zlib gzip xz
+ gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz
%bootstrap-binaries-tarball
%binutils-bootstrap-tarball
- %glibc-bootstrap-tarball
+ (%glibc-bootstrap-tarball)
%gcc-bootstrap-tarball
%guile-bootstrap-tarball
%bootstrap-tarballs))
(define %cross-targets
'("mips64el-linux-gnu"
- "mips64el-linux-gnuabi64"))
+ "mips64el-linux-gnuabi64"
+ "arm-linux-gnueabihf"
+ "aarch64-linux-gnu"
+ "powerpc-linux-gnu"
+ "i586-pc-gnu" ;aka. GNU/Hurd
+ "i686-w64-mingw32"))
-(define (demo-os)
- "Return the \"demo\" 'operating-system' structure."
- (let* ((dir (dirname (assoc-ref (current-source-location) 'filename)))
- (file (string-append dir "/demo-os.scm")))
- (read-operating-system file)))
+(define %guixsd-supported-systems
+ '("x86_64-linux" "i686-linux"))
(define (qemu-jobs store system)
"Return a list of jobs that build QEMU images for SYSTEM."
(define (->job name drv)
(let ((name (symbol-append name (string->symbol ".")
(string->symbol system))))
- `(,name . ,(cut ->alist drv))))
+ `(,name . ,(lambda ()
+ (parameterize ((%graft? #f))
+ (->alist drv))))))
(define MiB
(expt 2 20))
- (if (member system '("x86_64-linux" "i686-linux"))
- (list (->job 'qemu-image
- (run-with-store store
- (mbegin %store-monad
- (set-guile-for-build (default-guile))
- (system-qemu-image (demo-os)
- #:disk-image-size
- (* 1400 MiB))))) ; 1.4 GiB
- (->job 'usb-image
+ (if (member system %guixsd-supported-systems)
+ (list (->job 'usb-image
(run-with-store store
(mbegin %store-monad
(set-guile-for-build (default-guile))
(system-disk-image installation-os
#:disk-image-size
- (* 850 MiB))))))
+ (* 1024 MiB))))))
+ '()))
+
+(define (system-test-jobs store system)
+ "Return a list of jobs for the system tests."
+ (define (test->thunk test)
+ (lambda ()
+ (define drv
+ (run-with-store store
+ (mbegin %store-monad
+ (set-current-system system)
+ (set-grafting #f)
+ (set-guile-for-build (default-guile))
+ (system-test-value test))))
+
+ `((derivation . ,(derivation-file-name drv))
+ (description . ,(format #f "GuixSD '~a' system test"
+ (system-test-name test)))
+ (long-description . ,(system-test-description test))
+ (license . ,gpl3+)
+ (home-page . ,%guix-home-page-url)
+ (maintainers . ("bug-guix@gnu.org")))))
+
+ (define (->job test)
+ (let ((name (string->symbol
+ (string-append "test." (system-test-name test)
+ "." system))))
+ (cons name (test->thunk test))))
+
+ (if (member system %guixsd-supported-systems)
+ (map ->job (all-system-tests))
'()))
(define (tarball-jobs store system)
(define (->job name drv)
(let ((name (symbol-append name (string->symbol ".")
(string->symbol system))))
- `(,name . ,(cut ->alist drv))))
+ `(,name . ,(lambda ()
+ (parameterize ((%graft? #f))
+ (->alist drv))))))
;; XXX: Add a job for the stable Guix?
(list (->job 'binary-tarball
(run-with-store store
(mbegin %store-monad
(set-guile-for-build (default-guile))
- (self-contained-tarball))
+ (>>= (profile-derivation (packages->manifest (list guix)))
+ (lambda (profile)
+ (self-contained-tarball "guix-binary" profile
+ #:localstatedir? #t
+ #:compressor
+ (lookup-compressor "xz")))))
#:system system))))
(define job-name
(match (package-transitive-inputs package)
(((_ inputs _ ...) ...)
inputs))))
- %final-inputs))))
+ (%final-inputs)))))
(lambda (store package system)
"Return a job for PACKAGE on SYSTEM, or #f if this combination is not
valid."
#f)))))
\f
-(define %hydra-supported-systems
- ;; This is the list of system types for which build slaves are available.
- '("x86_64-linux" "i686-linux" "mips64el-linux"))
-
;;;
;;; Hydra entry point.
;;;
(define (cross-jobs system)
(define (from-32-to-64? target)
- ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit.
- ;; This hacks prevents known-to-fail cross-builds from i686-linux to
+ ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit. This hack
+ ;; prevents known-to-fail cross-builds from i686-linux or armhf-linux to
;; mips64el-linux-gnuabi64.
- (and (string-prefix? "i686-" system)
- (string-suffix? "64" target)))
+ (and (or (string-prefix? "i686-" system)
+ (string-prefix? "i586-" system)
+ (string-prefix? "armhf-" system))
+ (string-contains target "64"))) ;x86_64, mips64el, aarch64, etc.
(define (same? target)
;; Return true if SYSTEM and TARGET are the same thing. This is so we
;; don't try to cross-compile to 'mips64el-linux-gnu' from
;; 'mips64el-linux'.
- (string-contains target system))
+ (or (string-contains target system)
+ (and (string-prefix? "armhf" system) ;armhf-linux
+ (string-prefix? "arm" target)))) ;arm-linux-gnueabihf
+
+ (define (pointless? target)
+ ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
+ (and (string-contains target "mingw")
+ (not (string=? "x86_64-linux" system))))
- (define (either proc1 proc2)
+ (define (either proc1 proc2 proc3)
(lambda (x)
- (or (proc1 x) (proc2 x))))
+ (or (proc1 x) (proc2 x) (proc3 x))))
(append-map (lambda (target)
(map (lambda (package)
(package-cross-job store (job-name package)
package target system))
%packages-to-cross-build))
- (remove (either from-32-to-64? same?) %cross-targets)))
-
- ;; Return one job for each package, except bootstrap packages.
- (append-map (lambda (system)
- (case subset
- ((all)
- ;; Build everything.
- (fold-packages (lambda (package result)
- (let ((job (package->job store package
- system)))
- (if job
- (cons job result)
- result)))
- (append (qemu-jobs store system)
- (tarball-jobs store system)
- (cross-jobs system))))
- ((core)
- ;; Build core packages only.
- (append (map (lambda (package)
- (package-job store (job-name package)
- package system))
- %core-packages)
- (cross-jobs system)))
- (else
- (error "unknown subset" subset))))
- %hydra-supported-systems))
+ (remove (either from-32-to-64? same? pointless?)
+ %cross-targets)))
+
+ ;; Turn off grafts. Grafting is meant to happen on the user's machines.
+ (parameterize ((%graft? #f))
+ ;; Return one job for each package, except bootstrap packages.
+ (append-map (lambda (system)
+ (case subset
+ ((all)
+ ;; Build everything, including replacements.
+ (let ((all (fold-packages
+ (lambda (package result)
+ (cond ((package-replacement package)
+ (cons* package
+ (package-replacement package)
+ result))
+ ((package-superseded package)
+ result) ;don't build it
+ (else
+ (cons package result))))
+ '()))
+ (job (lambda (package)
+ (package->job store package
+ system))))
+ (append (filter-map job all)
+ (qemu-jobs store system)
+ (system-test-jobs store system)
+ (tarball-jobs store system)
+ (cross-jobs system))))
+ ((core)
+ ;; Build core packages only.
+ (append (map (lambda (package)
+ (package-job store (job-name package)
+ package system))
+ %core-packages)
+ (cross-jobs system)))
+ (else
+ (error "unknown subset" subset))))
+ %hydra-supported-systems)))
HCoop / jackhill / guix / guix.git / blobdiff