diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 36 | ||||
| -rw-r--r-- | build-aux/hydra/guix.scm | 10 | ||||
| -rwxr-xr-x | build-aux/list-packages.scm | 97 |
3 files changed, 98 insertions, 45 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index d7bdb2d7e4..8206be22ff 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -79,7 +79,7 @@ SYSTEM." ,(cute package->alist store package system (cut package-cross-derivation <> <> target <>)))) -(define %packages-to-cross-build +(define %core-packages (list gmp mpfr mpc coreutils findutils diffutils patch sed grep gawk gettext hello guile-2.0 %bootstrap-binaries-tarball @@ -89,6 +89,9 @@ SYSTEM." %guile-bootstrap-tarball %bootstrap-tarballs)) +(define %packages-to-cross-build + %core-packages) + (define %cross-targets '("mips64el-linux-gnu" "mips64el-linux-gnuabi64")) @@ -106,6 +109,11 @@ SYSTEM." (_ (list (%current-system))))) + (define subset + (match (assoc-ref arguments 'subset) + ("core" 'core) ; only build core packages + (_ 'all))) ; build everything + (define job-name (compose string->symbol package-full-name)) @@ -127,11 +135,23 @@ SYSTEM." inputs)))) %final-inputs)))) (append-map (lambda (system) - (fold-packages (lambda (package result) - (if (member package base-packages) - result - (cons (package-job store (job-name package) - package system) - result))) - (cross-jobs system))) + (case subset + ((all) + ;; Build everything. + (fold-packages (lambda (package result) + (if (member package base-packages) + result + (cons (package-job store (job-name package) + package system) + result))) + (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)))) systems))) diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm index f2107479e0..dbc935d897 100644 --- a/build-aux/hydra/guix.scm +++ b/build-aux/hydra/guix.scm @@ -41,7 +41,9 @@ (guix packages) (guix utils) (guix build-system gnu) + (gnu packages version-control) (gnu packages package-management) + (gnu packages graphviz) (srfi srfi-1) (srfi srfi-26) (ice-9 match)) @@ -75,9 +77,11 @@ containing a Git checkout of Guix." ;; Comment out `git' invocations, since Hydra provides ;; us with a checkout that includes sub-modules. (substitute* "bootstrap" - (("git submodule init") - "true\n"))) - ,p))))))) + (("git ") "true git "))) + ,p)))) + (native-inputs `(("git" ,git) + ("graphviz" ,graphviz) + ,@(package-native-inputs dist)))))) (define (hydra-jobs store arguments) "Return Hydra jobs." diff --git a/build-aux/list-packages.scm b/build-aux/list-packages.scm index 9cb07c19f7..3e798fc6d1 100755 --- a/build-aux/list-packages.scm +++ b/build-aux/list-packages.scm @@ -156,50 +156,79 @@ exec guile -l "$0" \ "Return the CSS for the list-packages page." (format #t "<style> -a {transition: all 0.3s} -div#intro {margin-bottom: 5em} -div#intro div, div#intro p {padding:0.5em} -div#intro div {float:left} -table#packages, table#packages tr, table#packages tbody, table#packages td, -table#packages th {border: 0px solid black} -div.package-description {position: relative} -table#packages tr:nth-child(even) {background-color: #FFF} -table#packages tr:nth-child(odd) {background-color: #EEE} -table#packages tr:hover, table#packages tr:focus, table#packages tr:active {background-color: #DDD} +/* license: CC0 */ +a { + transition: all 0.3s; +} +div#intro { + margin-bottom: 2em; +} +div#intro div, div#intro p { + padding:0.5em; +} +div#intro div { + float:left; +} +div#intro img { + float:left; + padding:0.75em; +} +table#packages, table#packages tr, table#packages tbody, table#packages td, table#packages th { + border: 0px solid black; + clear: both; +} +table#packages tr:nth-child(even) { + background-color: #FFF; +} +table#packages tr:nth-child(odd) { + background-color: #EEE; +} +table#packages tr:hover, table#packages tr:focus, table#packages tr:active { + background-color: #DDD; +} table#packages tr:first-child, table#packages tr:first-child:hover, table#packages tr:first-child:focus, table#packages tr:first-child:active { -background-color: #333; -color: #fff; + background-color: #333; + color: #fff; } -table#packages td -{ -margin:0px; -padding:0.2em 0.5em; +table#packages td { + margin:0px; + padding:0.2em 0.5em; } table#packages td:first-child { -width:10%; -text-align:center; + width:10%; + text-align:center; +} +table#packages td:nth-child(2) { + width:30%; +} +table#packages td:last-child { + width:60%; } -table#packages td:nth-child(2){width:30%;} -table#packages td:last-child {width:60%} img.package-logo { -float: left; -padding-right: 1em; + float: left; + padding: 0.75em; +} +table#packages span { + font-weight: 700; +} +table#packages span a { + float: right; + font-weight: 500; } -table#packages span a {float: right} a#top { -position:fixed; -right:2%; -bottom:2%; -font-size:150%; -background-color:#EEE; -padding:1.125% 0.75% 0% 0.75%; -text-decoration:none; -color:#000; -border-radius:5px; + position:fixed; + right:10px; + bottom:10px; + font-size:150%; + background-color:#EEE; + padding:10px 7.5px 0 7.5px; + text-decoration:none; + color:#000; + border-radius:5px; } a#top:hover, a#top:focus { -background-color:#333; -color:#fff; + background-color:#333; + color:#fff; } </style>")) |