distro: Fetch bootstrap binaries from alpha.gnu.org.

* build-aux/download.scm (%url-base): Change to alpha.gnu.org.
* distro/packages/bootstrap.scm (%bootstrap-base-url): Rename to...
  (%bootstrap-base-urls): ... this.  Add alpha.gnu.org as the first
  URL.  Update users.
This commit is contained in:
Ludovic Courtès 2013-01-15 11:34:54 +01:00
parent e2034de5d0
commit 04732c37ca
2 changed files with 20 additions and 13 deletions

View File

@ -28,7 +28,11 @@
(guix utils)) (guix utils))
(define %url-base (define %url-base
"http://www.fdn.fr/~lcourtes/software/guix/packages") "http://alpha.gnu.org/gnu/guix/bootstrap"
;; Alternately:
;;"http://www.fdn.fr/~lcourtes/software/guix/packages"
)
(define (file-name->uri file) (define (file-name->uri file)
"Return the URI for FILE." "Return the URI for FILE."

View File

@ -194,18 +194,19 @@ $out/bin/guile --version~%"
(home-page #f) (home-page #f)
(license lgpl3+)))) (license lgpl3+))))
(define %bootstrap-base-url (define %bootstrap-base-urls
;; This is where the initial binaries come from. ;; This is where the initial binaries come from.
"http://www.fdn.fr/~lcourtes/software/guix/packages") '("http://alpha.gnu.org/gnu/guix/bootstrap"
"http://www.fdn.fr/~lcourtes/software/guix/packages"))
(define %bootstrap-coreutils&co (define %bootstrap-coreutils&co
(package-from-tarball "bootstrap-binaries" (package-from-tarball "bootstrap-binaries"
(lambda (system) (lambda (system)
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (map (cut string-append <> "/" system
%bootstrap-base-url "/" "/20130105/static-binaries.tar.xz")
system "/20130105/static-binaries.tar.xz")) %bootstrap-base-urls))
(sha256 (sha256
(match system (match system
("x86_64-linux" ("x86_64-linux"
@ -222,9 +223,9 @@ $out/bin/guile --version~%"
(lambda (system) (lambda (system)
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (map (cut string-append <> "/" system
%bootstrap-base-url "/" "/20130105/binutils-2.22.tar.xz")
system "/20130105/binutils-2.22.tar.xz")) %bootstrap-base-urls))
(sha256 (sha256
(match system (match system
("x86_64-linux" ("x86_64-linux"
@ -276,8 +277,9 @@ $out/bin/guile --version~%"
(bootstrap-origin (bootstrap-origin
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append %bootstrap-base-url "/" system (uri (map (cut string-append <> "/" system
"/20130105/glibc-2.17.tar.xz")) "/20130105/glibc-2.17.tar.xz")
%bootstrap-base-urls))
(sha256 (sha256
(match system (match system
("x86_64-linux" ("x86_64-linux"
@ -347,8 +349,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
(bootstrap-origin (bootstrap-origin
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append %bootstrap-base-url "/" system (uri (map (cut string-append <> "/" system
"/20130105/gcc-4.7.2.tar.xz")) "/20130105/gcc-4.7.2.tar.xz")
%bootstrap-base-urls))
(sha256 (sha256
(match system (match system
("x86_64-linux" ("x86_64-linux"