nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

download: Add 'url-fetch/executable'. 

* guix/download.scm (built-in-download): Add #:executable? parameter.
Pass #:recursive? to 'raw-derivation' and add "executable" to the #:env-vars
alist when EXECUTABLE? is true.
(url-fetch): Add #:executable? and pass it to 'built-in-download'.
(url-fetch/executable): New procedure.
This commit is contained in:
Ludovic Courtès 2019-06-14 15:04:09 +02:00
parent 44f07d1dc6
commit 267966f911
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
guix/download.scm
View File

@ -36,6 +36,7 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (%mirrors #:export (%mirrors
url-fetch url-fetch
url-fetch/executable
url-fetch/tarbomb url-fetch/tarbomb
url-fetch/zipbomb url-fetch/zipbomb
download-to-store)) download-to-store))
@ -420,8 +421,10 @@
(define* (built-in-download file-name url (define* (built-in-download file-name url
#:key system hash-algo hash #:key system hash-algo hash
mirrors content-addressed-mirrors mirrors content-addressed-mirrors
executable?
(guile 'unused)) (guile 'unused))
"Download FILE-NAME from URL using the built-in 'download' builder. "Download FILE-NAME from URL using the built-in 'download' builder. When
EXECUTABLE? is true, make the downloaded file executable.
This is an \"out-of-band\" download in that the returned derivation does not This is an \"out-of-band\" download in that the returned derivation does not
explicitly depend on Guile, GnuTLS, etc. Instead, the daemon performs the explicitly depend on Guile, GnuTLS, etc. Instead, the daemon performs the
@ -433,6 +436,7 @@ download by itself using its own dependencies."
#:system system #:system system
#:hash-algo hash-algo #:hash-algo hash-algo
#:hash hash #:hash hash
#:recursive? executable?
#:inputs `((,mirrors) #:inputs `((,mirrors)
(,content-addressed-mirrors)) (,content-addressed-mirrors))
@ -444,7 +448,10 @@ download by itself using its own dependencies."
#:env-vars `(("url" . ,(object->string url)) #:env-vars `(("url" . ,(object->string url))
("mirrors" . ,mirrors) ("mirrors" . ,mirrors)
("content-addressed-mirrors" ("content-addressed-mirrors"
. ,content-addressed-mirrors)) . ,content-addressed-mirrors)
,@(if executable?
'(("executable" . "1"))
'()))
;; Do not offload this derivation because we cannot be ;; Do not offload this derivation because we cannot be
;; sure that the remote daemon supports the 'download' ;; sure that the remote daemon supports the 'download'
@ -455,11 +462,13 @@ download by itself using its own dependencies."
(define* (url-fetch url hash-algo hash (define* (url-fetch url hash-algo hash
#:optional name #:optional name
#:key (system (%current-system)) #:key (system (%current-system))
(guile (default-guile))) (guile (default-guile))
executable?)
"Return a fixed-output derivation that fetches URL (a string, or a list of "Return a fixed-output derivation that fetches URL (a string, or a list of
strings denoting alternate URLs), which is expected to have hash HASH of type strings denoting alternate URLs), which is expected to have hash HASH of type
HASH-ALGO (a symbol). By default, the file name is the base name of URL; HASH-ALGO (a symbol). By default, the file name is the base name of URL;
optionally, NAME can specify a different file name. optionally, NAME can specify a different file name. When EXECUTABLE? is true,
make the downloaded file executable.
When one of the URL starts with mirror://, then its host part is When one of the URL starts with mirror://, then its host part is
interpreted as the name of a mirror scheme, taken from %MIRROR-FILE. interpreted as the name of a mirror scheme, taken from %MIRROR-FILE.
@ -490,10 +499,21 @@ in the store."
#:system system #:system system
#:hash-algo hash-algo #:hash-algo hash-algo
#:hash hash #:hash hash
#:executable? executable?
#:mirrors %mirror-file #:mirrors %mirror-file
#:content-addressed-mirrors #:content-addressed-mirrors
%content-addressed-mirror-file))))) %content-addressed-mirror-file)))))
(define* (url-fetch/executable url hash-algo hash
#:optional name
#:key (system (%current-system))
(guile (default-guile)))
"Like 'url-fetch', but make the downloaded file executable."
(url-fetch url hash-algo hash name
#:system system
#:guile guile
#:executable? #t))
(define* (url-fetch/tarbomb url hash-algo hash (define* (url-fetch/tarbomb url hash-algo hash
#:optional name #:optional name
#:key (system (%current-system)) #:key (system (%current-system))