Paste number 339796: commit message

Index of paste annotations: 1

Paste number 339796: commit message
Pasted by: lfam
When:4 years, 9 months ago
Share:Tweet this! | http://paste.lisp.org/+7A6S
Channel:None
Paste contents:
Raw Source | XML | Display As
    download: Provide a fall-back guile for older daemons.
    
    Fixes <http://bugs.gnu.org/25775>.
    
    * guix/download.scm (in-band-download): Use %bootstrap-guile as a
    fall-back when using older daemons that do not have a built-in
    downloader.

Annotations for this paste:

Annotation number 1: full patch
Pasted by: lfam
When:4 years, 9 months ago
Share:Tweet this! | http://paste.lisp.org/+7A6S/1
Paste contents:
Raw Source | Display As
From 0c90846ebdcef00ae8eb26dbe911e5551438ae06 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 23 Feb 2017 13:48:11 -0500
Subject: [PATCH] download: Provide a fall-back guile for older daemons.

Fixes <http://bugs.gnu.org/25775>.

* guix/download.scm (in-band-download): Use %bootstrap-guile as a
fall-back when using older daemons that do not have a built-in
downloader.
---
 guix/download.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/download.scm b/guix/download.scm
index 813f51f48..86f859881 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -418,7 +418,10 @@ GnuTLS itself and its dependencies.  See <http://bugs.gnu.org/22774>."
                        ;; hash of the expected result.
                        #:verify-certificate? #f)))))
 
-  (mlet %store-monad ((guile (package->derivation guile system)))
+  (mlet %store-monad ((guile (package->derivation
+                              (or guile
+                                  (@@ (gnu packages bootstrap) %bootstrap-guile))
+                              system)))
     (gexp->derivation file-name builder
                       #:guile-for-build guile
                       #:system system
-- 
2.11.1

Colorize as:
Show Line Numbers

Lisppaste pastes can be made by anyone at any time. Imagine a fearsomely comprehensive disclaimer of liability. Now fear, comprehensively.