[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-hurd updated: gnu: bootstrap: Use fall-back mechanism for boo
From: |
guix-commits |
Subject: |
branch wip-hurd updated: gnu: bootstrap: Use fall-back mechanism for bootstrap-executables. |
Date: |
Mon, 16 Mar 2020 03:33:10 -0400 |
This is an automated email from the git hooks/post-receive script.
janneke pushed a commit to branch wip-hurd
in repository guix.
The following commit(s) were added to refs/heads/wip-hurd by this push:
new c4943c4 gnu: bootstrap: Use fall-back mechanism for
bootstrap-executables.
c4943c4 is described below
commit c4943c489bd4234927c29a98a3b7143e3c6bd96a
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Mon Mar 16 08:17:16 2020 +0100
gnu: bootstrap: Use fall-back mechanism for bootstrap-executables.
* gnu/packages/bootstrap.scm (%bootstrap-executable-base-urls): New
variable.
(bootstrap-executable-file-name): New function.
(bootstrap-executable): Use them to implement fall-back for donwloads of
bootstrap executables.
---
gnu/packages/bootstrap.scm | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 726944f..6d146a1 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -123,15 +123,17 @@
("xz"
,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5")))))
-(define (bootstrap-executable-url program system)
- "Return the URL where PROGRAM can be found for SYSTEM."
- (if (equal? (or (%current-target-system) (%current-system)) "i586-gnu")
- (string-append
- "http://lilypond.org/janneke/guix/i586-gnu/20200315/" program)
- (string-append
-
"https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/"
- system "/" program
- "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))
+(define %bootstrap-executable-base-urls
+ ;; This is where the bootstrap executables come from.
+ '("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/"
+ "http://lilypond.org/janneke/guix/"))
+
+(define (bootstrap-executable-file-name system program)
+ "Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM."
+ (match system
+ ("i586-gnu" (string-append system "/20200315/" program))
+ (_ (string-append system "/" program
+ "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e"))))
(define bootstrap-executable
(mlambda (program system)
@@ -152,7 +154,9 @@ for system '~a'")
((sha256)
(origin
(method url-fetch/executable)
- (uri (bootstrap-executable-url program system))
+ (uri (map (cute string-append <>
+ (bootstrap-executable-file-name system program))
+ %bootstrap-executable-base-urls))
(file-name program)
(sha256 sha256)))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-hurd updated: gnu: bootstrap: Use fall-back mechanism for bootstrap-executables.,
guix-commits <=