[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/155: import cran: Remove more invalid characters from package names.
From: |
John Darrington |
Subject: |
37/155: import cran: Remove more invalid characters from package names. |
Date: |
Wed, 21 Dec 2016 20:48:32 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 38c48056858bd2f5993042df537b26317516fc73
Author: Ricardo Wurmus <address@hidden>
Date: Tue May 17 15:06:44 2016 +0200
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(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index d2add6f..ee34ead 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)
- 68/155: gnu: maxima: Update to 5.39.0., (continued)
- 68/155: gnu: maxima: Update to 5.39.0., John Darrington, 2016/12/21
- 65/155: doc: Mention the d3.js backend of 'guix graph'., John Darrington, 2016/12/21
- 71/155: gnu: gnuplot: Update to 5.0.5., John Darrington, 2016/12/21
- 83/155: doc: Make 'guix pull' more visible., John Darrington, 2016/12/21
- 85/155: services: Use 'file-append' in more places., John Darrington, 2016/12/21
- 93/155: gnu: linux-libre: Fix typo., John Darrington, 2016/12/21
- 91/155: gnu: Add python-xopen., John Darrington, 2016/12/21
- 100/155: gnu: utox: Fix description., John Darrington, 2016/12/21
- 82/155: doc: Mention 'swapon'., John Darrington, 2016/12/21
- 70/155: gnu: wxmaxima: Update to 16.12.0., John Darrington, 2016/12/21
- 37/155: import cran: Remove more invalid characters from package names.,
John Darrington <=
- 38/155: import cran: Move guix-name to top-level., John Darrington, 2016/12/21
- 43/155: guix import: Print list of expressions., John Darrington, 2016/12/21
- 51/155: gnu: Add attribution line for Raoul Bonnal., John Darrington, 2016/12/21
- 60/155: tests: Adjust cpan tests., John Darrington, 2016/12/21
- 54/155: tests: Mock up http-fetch in import tests., John Darrington, 2016/12/21
- 58/155: build: check-final-inputs-self-contained has an exception for 'bash:include'., John Darrington, 2016/12/21
- 62/155: gnu: python-docutils: Update to 0.13.1, John Darrington, 2016/12/21
- 66/155: build: Add 'guix-publish.*.in' to the distribution., John Darrington, 2016/12/21
- 69/155: gnu: tor: split description into two parts for easier reading., John Darrington, 2016/12/21
- 72/155: gnu: gnumach-headers: Update to 1.8., John Darrington, 2016/12/21