diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-15 11:34:54 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-15 11:34:54 +0100 |
| commit | 04732c37ca2d714652a7895709622b7ef7441422 (patch) | |
| tree | 10d96c99219c8fc50f471c92afa01fa9772ae4d5 | |
| parent | e2034de5d0b16827d2b9353da56480780e3bc1bf (diff) | |
| download | guix-04732c37ca2d714652a7895709622b7ef7441422.tar.gz guix-04732c37ca2d714652a7895709622b7ef7441422.zip | |
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.
| -rw-r--r-- | build-aux/download.scm | 6 | ||||
| -rw-r--r-- | distro/packages/bootstrap.scm | 27 |
2 files changed, 20 insertions, 13 deletions
diff --git a/build-aux/download.scm b/build-aux/download.scm index 97a74b123a..62956378ed 100644 --- a/build-aux/download.scm +++ b/build-aux/download.scm @@ -28,7 +28,11 @@ (guix utils)) (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) "Return the URI for FILE." diff --git a/distro/packages/bootstrap.scm b/distro/packages/bootstrap.scm index 9bf815b2d7..27183162b5 100644 --- a/distro/packages/bootstrap.scm +++ b/distro/packages/bootstrap.scm @@ -194,18 +194,19 @@ $out/bin/guile --version~%" (home-page #f) (license lgpl3+)))) -(define %bootstrap-base-url +(define %bootstrap-base-urls ;; 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 (package-from-tarball "bootstrap-binaries" (lambda (system) (origin (method url-fetch) - (uri (string-append - %bootstrap-base-url "/" - system "/20130105/static-binaries.tar.xz")) + (uri (map (cut string-append <> "/" system + "/20130105/static-binaries.tar.xz") + %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" @@ -222,9 +223,9 @@ $out/bin/guile --version~%" (lambda (system) (origin (method url-fetch) - (uri (string-append - %bootstrap-base-url "/" - system "/20130105/binutils-2.22.tar.xz")) + (uri (map (cut string-append <> "/" system + "/20130105/binutils-2.22.tar.xz") + %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" @@ -276,8 +277,9 @@ $out/bin/guile --version~%" (bootstrap-origin (origin (method url-fetch) - (uri (string-append %bootstrap-base-url "/" system - "/20130105/glibc-2.17.tar.xz")) + (uri (map (cut string-append <> "/" system + "/20130105/glibc-2.17.tar.xz") + %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" @@ -347,8 +349,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (bootstrap-origin (origin (method url-fetch) - (uri (string-append %bootstrap-base-url "/" system - "/20130105/gcc-4.7.2.tar.xz")) + (uri (map (cut string-append <> "/" system + "/20130105/gcc-4.7.2.tar.xz") + %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" |