diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/download.scm | 20 | ||||
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 15 |
2 files changed, 23 insertions, 12 deletions
diff --git a/build-aux/download.scm b/build-aux/download.scm index 18b820a153..0e98bef55b 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,13 +41,18 @@ "Return the URI for FILE." (match (string-tokenize file (char-set-complement (char-set #\/))) ((_ ... system basename) - (string->uri (string-append %url-base "/" system - (match system - ("armhf-linux" - "/20150101/") - (_ - "/20131110/")) - basename))))) + (string->uri + (match system + ("aarch64-linux" + (string-append "http://flashner.co.il/guix/bootstrap/aarch64-linux" + "/20170217/" basename)) + (_ (string-append %url-base "/" system + (match system + ("armhf-linux" + "/20150101/") + (_ + "/20131110/")) + basename))))))) (match (command-line) ((_ file expected-hash) diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 105ed8375d..507c6abe0e 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -127,6 +127,8 @@ SYSTEM." "mips64el-linux-gnuabi64" "arm-linux-gnueabihf" "aarch64-linux-gnu" + "powerpc-linux-gnu" + "i586-pc-gnu" ;aka. GNU/Hurd "i686-w64-mingw32")) (define %guixsd-supported-systems @@ -303,11 +305,14 @@ valid." ;; Build everything, including replacements. (let ((all (fold-packages (lambda (package result) - (if (package-replacement package) - (cons* package - (package-replacement package) - result) - (cons 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 |