diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-11 09:38:49 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-11 09:38:49 -0500 |
| commit | 77448857311318fc9cd866afcb85ca98fccdb25b (patch) | |
| tree | efed3a71d1f7b2c2cc292e7e4ba1884c4d26a9e4 /guix/import/gnu.scm | |
| parent | 62c155c0bcbc0d71b1bc35e966193b6e8de03246 (diff) | |
| parent | 0009ed71ad288358cbc7828954b5e1a3f18fd525 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import/gnu.scm')
| -rw-r--r-- | guix/import/gnu.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm index 1947f489fb..7160fcf7ba 100644 --- a/guix/import/gnu.scm +++ b/guix/import/gnu.scm @@ -18,6 +18,7 @@ (define-module (guix import gnu) #:use-module (guix gnu-maintenance) + #:use-module (guix import utils) #:use-module (guix utils) #:use-module (guix store) #:use-module (guix hash) @@ -38,10 +39,6 @@ ;;; ;;; Code: -(define (file-sha256 file) - "Return the SHA256 hash of FILE as a bytevector." - (call-with-input-file file port-sha256)) - (define (qualified-url url) "Return a fully-qualified URL based on URL." (if (string-prefix? "/" url) @@ -102,7 +99,7 @@ details.)" (let ((version (gnu-release-version release))) (match (find-packages (regexp-quote name)) ((info . _) - (gnu-package->sexp info release)) + (gnu-package->sexp info release #:key-download key-download)) (() (raise (condition (&message |