me/guix
Archived
1
0
Fork 0
Code Activity

download: Support 'file://' URLs.

Browse source 
* guix/download.scm (download-to-store): When URL has a 'file' scheme or
  no scheme, use 'add-to-store' directly.
This commit is contained in:
Ludovic Courtès 2013-10-12 16:39:10 +02:00
parent 39e9f95d05
commit d8907ac43f
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/download.scm
View file

@ -24,6 +24,7 @@
#:use-module ((guix store) #:select (derivation-path? add-to-store)) #:use-module ((guix store) #:select (derivation-path? add-to-store))
#:use-module ((guix build download) #:renamer (symbol-prefix-proc 'build:)) #:use-module ((guix build download) #:renamer (symbol-prefix-proc 'build:))
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (web uri)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (%mirrors #:export (%mirrors
@ -244,6 +245,11 @@ must be a list of symbol/URL-list pairs."
#:key (log (current-error-port))) #:key (log (current-error-port)))
"Download from URL to STORE, either under NAME or URL's basename if "Download from URL to STORE, either under NAME or URL's basename if
omitted. Write progress reports to LOG." omitted. Write progress reports to LOG."
(define uri
(string->uri url))
(if (memq (uri-scheme uri) '(file #f))
(add-to-store store name #f "sha256" (uri-path uri))
(call-with-temporary-output-file (call-with-temporary-output-file
(lambda (temp port) (lambda (temp port)
(let ((result (let ((result
@ -251,6 +257,6 @@ omitted. Write progress reports to LOG."
(build:url-fetch url temp #:mirrors %mirrors)))) (build:url-fetch url temp #:mirrors %mirrors))))
(close port) (close port)
(and result (and result
(add-to-store store name #f "sha256" temp)))))) (add-to-store store name #f "sha256" temp)))))))
;;; download.scm ends here ;;; download.scm ends here