tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00
Code Activity

Merge branch 'master' into core-updates

Browse Source
This commit is contained in:
Marius Bakke
2017-11-19 15:01:00 +01:00
parent 259b4f34ba a93447b89a
commit 2dd12924cf
202 changed files with 24545 additions and 10664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-aux/hydra/gnu-system.scm
+22 -12
View File
@@ -251,7 +251,8 @@ all its dependencies, and ready to be installed on non-GuixSD distributions.")
"Return a job for PACKAGE on SYSTEM, or #f if this combination is not
valid."
(cond ((member package base-packages)
#f)
(package-job store (symbol-append 'base. (job-name package))
package system))
((supported-package? package system)
(let ((drv (package-derivation store package system
#:graft? #f)))
@@ -261,6 +262,25 @@ valid."
(else
#f)))))
(define (all-packages)
"Return the list of packages to build."
(define (adjust package result)
(cond ((package-replacement package)
(cons* package ;build both
(package-replacement package)
result))
((package-superseded package)
result) ;don't build it
(else
(cons package result))))
(fold-packages adjust
(fold adjust '() ;include base packages
(match (%final-inputs)
(((labels packages _ ...) ...)
packages)))
#:select? (const #t))) ;include hidden packages
;;;
;;; Hydra entry point.
@@ -317,17 +337,7 @@ valid."
(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))))
'()))
(let ((all (all-packages))
(job (lambda (package)
(package->job store package
system))))