38/155: import cran: Move guix-name to top-level.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit 2b205324d0d761ad8918f90cbd838df782506fff
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Jul 6 12:42:38 2016 +0200

    import cran: Move guix-name to top-level.
    
    * guix/import/cran.scm (guix-name): Move to top-level.
---
 guix/import/cran.scm |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index ee34ead..c98ab88 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -148,16 +148,17 @@ empty list when the FIELD cannot be found."
                         (string-any char-set:whitespace item)))
                   (map string-trim-both items))))))
 
+(define (guix-name name)
+  "Return a Guix package name for a given R package name."
+  (string-append "r-" (string-map (match-lambda
+                                    (#\_ #\-)
+                                    (#\. #\-)
+                                    (chr (char-downcase chr)))
+                                  name)))
+
 (define (description->package repository meta)
   "Return the `package' s-expression for an R package published on REPOSITORY
 from the alist META, which was derived from the R package's DESCRIPTION file."
-  (define (guix-name name)
-    (string-append "r-" (string-map (match-lambda
-                                      (#\_ #\-)
-                                      (#\. #\-)
-                                      (chr (char-downcase chr)))
-                                    name)))
-
   (let* ((base-url   (case repository
                        ((cran)         %cran-url)
                        ((bioconductor) %bioconductor-url)))