guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/36: import: Rename "cran-fetch" to "fetch-description".


From: Ricardo Wurmus
Subject: 02/36: import: Rename "cran-fetch" to "fetch-description".
Date: Thu, 07 Jan 2016 16:19:03 +0000

rekado pushed a commit to branch master
in repository guix.

commit 34a75d35bb8366136309be62000baa6ba1067399
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Dec 16 14:28:43 2015 +0100

    import: Rename "cran-fetch" to "fetch-description".
    
    * guix/import/cran.scm (cran-fetch): Rename procedure ...
    (fetch-description): ... to this.
---
 guix/import/cran.scm |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index bf46d17..fc27090 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -109,11 +109,11 @@ package definition."
 
 (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
 NAME, or #f on failure.  NAME is case-sensitive."
   ;; 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)))))
 
 (define (listify meta field)
@@ -196,7 +196,7 @@ which was derived from the R package's DESCRIPTION file."
 (define (cran->guix-package package-name)
   "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."
-  (let ((module-meta (cran-fetch package-name)))
+  (let ((module-meta (fetch-description %cran-url package-name)))
     (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)))
 
   (define meta
-    (cran-fetch upstream-name))
+    (fetch-description %cran-url upstream-name))
 
   (and meta
        (let ((version (assoc-ref meta "Version")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]