From bfa0c752bc19810f7b4908c3d0f4a1dd7832c1b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Jul 2016 12:42:38 +0200 Subject: 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(-) (limited to 'guix/import/cran.scm') diff --git a/guix/import/cran.scm b/guix/import/cran.scm index ee34eade94..c98ab88aec 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))) -- cgit v1.2.3