From 3cc2f27208de71f9dd0b37593db974b7c1a305f3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Dec 2018 19:05:45 +0100 Subject: [PATCH] bootstrap: Switch to official bootstrap urls. * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): Switch to official bootstrap urls. (%bootstrap-mescc-tools): Likewise. (%bootstrap-mes): Likewise. --- gnu/packages/bootstrap.scm | 41 +++++++++++++------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a835cbc206..eac729f785 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -405,17 +405,10 @@ $out/bin/guile --version~%" (lambda (system) (origin (method url-fetch) - (uri (match system - ("i686-linux" - (string-append - "http://lilypond.org/janneke/guix/20181124/" - "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz")) - ("x86_64-linux" - (string-append - "http://lilypond.org/janneke/guix/20181124/" - "linux-libre-headers-stripped-4.14.67-x86_64-linux.tar.xz")) - (_ (error "linux-libre-headers-bootstrap: system not supported:" - (%current-system))))) + (uri (map (cute string-append <> + "/i686-linux/20181020/" + "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (base32 "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s")))) @@ -656,15 +649,11 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ,(bootstrap-origin (origin (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/guix/20181124/" - (match (%current-system) - ("i686-linux" - "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz") - ("x86_64-linux" - "mescc-tools-static-0.5.2-0.bb062b0-x86_64-linux.tar.xz") - (_ (error "bootstrap-mescc-tools: system not supported:" - (%current-system)))))) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (base32 "11lniw0vg61kmyhvnwkmcnkci9ym6hbmiksiqggd0hkipbq7hvlz"))))))) @@ -708,13 +697,11 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ,(bootstrap-origin (origin (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/guix/20181124/" - (match (%current-system) - ("i686-linux" - "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz") - ("x86_64-linux" - "mes-minimal-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz")))) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (match (%current-system) ((or "i686-linux" "x86_64-linux") -- 2.19.2