diff --git a/guix/import/cran.scm b/guix/import/cran.scm index b24a732af97..ca194af500b 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -570,7 +570,7 @@ referenced in build system files." ;; Quiet imports "(suppressPackageStartupMessages\\()?" ;; the actual import statement. - "(require|library)\\(\"?([^, \")]+)" + "(require|library|check_installed)\\(\"?([^, \")]+)" ;; Or perhaps... "|" ;; ...direct namespace access. diff --git a/tests/import/cran.scm b/tests/import/cran.scm index 6b1bcc297dd..0b6303370ae 100644 --- a/tests/import/cran.scm +++ b/tests/import/cran.scm @@ -103,6 +103,11 @@ Date/Publication: 2015-07-14 14:15:16 (set->list ((@ (guix import cran) extract-imports) "this:is:not::a:procedure"))) +(test-equal "extract-imports: matches things before a comma" + (list "MASS") + (set->list ((@ (guix import cran) extract-imports) + "check_installed(\"MASS\","))) + (test-equal "r-minimal is not a cran package" #f ((@@ (guix import cran) cran-package?) r-minimal))