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

import: Rename "cran-fetch" to "fetch-description". 

* guix/import/cran.scm (cran-fetch): Rename procedure ...
(fetch-description): ... to this.
This commit is contained in:
Ricardo Wurmus 2015-12-16 14:28:43 +01:00
parent d1c116089b
commit 34a75d35bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/import/cran.scm
View File

@ -109,11 +109,11 @@ package definition."
(define %cran-url "http://cran.r-project.org/web/packages/") (define %cran-url "http://cran.r-project.org/web/packages/")
(define (cran-fetch name) (define (fetch-description base-url name)
"Return an alist of the contents of the DESCRIPTION file for the R package "Return an alist of the contents of the DESCRIPTION file for the R package
NAME, or #f on failure. NAME is case-sensitive." NAME, or #f on failure. NAME is case-sensitive."
;; This API always returns the latest release of the module. ;; This API always returns the latest release of the module.
(let ((url (string-append %cran-url name "/DESCRIPTION"))) (let ((url (string-append base-url name "/DESCRIPTION")))
(description->alist (read-string (http-fetch url))))) (description->alist (read-string (http-fetch url)))))
(define (listify meta field) (define (listify meta field)
@ -196,7 +196,7 @@ which was derived from the R package's DESCRIPTION file."
(define (cran->guix-package package-name) (define (cran->guix-package package-name)
"Fetch the metadata for PACKAGE-NAME from cran.r-project.org, and return the "Fetch the metadata for PACKAGE-NAME from cran.r-project.org, and return the
`package' s-expression corresponding to that package, or #f on failure." `package' s-expression corresponding to that package, or #f on failure."
(let ((module-meta (cran-fetch package-name))) (let ((module-meta (fetch-description %cran-url package-name)))
(and=> module-meta description->package))) (and=> module-meta description->package)))
@ -230,7 +230,7 @@ which was derived from the R package's DESCRIPTION file."
(package->upstream-name (specification->package package))) (package->upstream-name (specification->package package)))
(define meta (define meta
(cran-fetch upstream-name)) (fetch-description %cran-url upstream-name))
(and meta (and meta
(let ((version (assoc-ref meta "Version"))) (let ((version (assoc-ref meta "Version")))