From 2e5f32ce1b2d552527b8eb9a85a100a92d6d252a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 17 May 2016 15:06:44 +0200 Subject: import cran: Remove more invalid characters from package names. * guix/import/cran.scm (guix-name): Replace period and underscore with dash; always prepend package names with "r-". --- guix/import/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'guix/import') diff --git a/guix/import/cran.scm b/guix/import/cran.scm index d2add6f633..ee34eade94 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -152,9 +152,11 @@ empty list when the FIELD cannot be found." "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) - (if (string-prefix? "r-" name) - (string-downcase name) - (string-append "r-" (string-downcase name)))) + (string-append "r-" (string-map (match-lambda + (#\_ #\-) + (#\. #\-) + (chr (char-downcase chr))) + name))) (let* ((base-url (case repository ((cran) %cran-url) -- cgit v1.2.3