01/01: download: Provide a fall-back guile for older daemons.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 9f05908fb1e3707cae593d94688748294717a546
Author: Leo Famulari <address@hidden>
Date:   Thu Feb 23 13:48:11 2017 -0500

    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.
    
    Written-by: Ricardo Wurmus <address@hidden>
---
 guix/download.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/download.scm b/guix/download.scm
index 813f51f..86f8598 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