~ruther/guix-local: gnu: r-with-tests: Fix reference to grep.

ff0d34a29bc0f19b1dd2714fc0a3bd73a244aebe — Ricardo Wurmus 2 years ago 093e920

gnu: r-with-tests: Fix reference to grep.

detectCores.R fails to return the number of cores when running R in a
container without grep.

Reported-by: Jonas Freimuth.

* gnu/packages/statistics.scm (r-with-tests)[arguments]: Fix references to
grep and wc in detectCores.R.
[inputs]: Add grep.

patch browse .tar.gz

1 files changed, 10 insertions(+), 1 deletions(-)

M gnu/packages/statistics.scm

M gnu/packages/statistics.scm => gnu/packages/statistics.scm +10 -1

@@ 244,7 244,15 @@ This package also provides @command{xls2csv} to export Excel files to CSV.")
                (substitute* "src/scripts/R.sh.in"
                  (("uname") uname-bin))
                (substitute* "src/unix/sys-std.c"
-                 (("rm -Rf ") (string-append rm-bin " -Rf "))))))
+                 (("rm -Rf ") (string-append rm-bin " -Rf ")))
+               (substitute* "src/library/parallel/R/detectCores.R"
+                 (("'grep")
+                  (string-append "'"
+                                 (search-input-file inputs "/bin/grep")))
+                 (("\\| wc -l")
+                  (string-append "| "
+                                 (search-input-file inputs "/bin/wc")
+                                 " -l"))))))
          (add-after 'unpack 'patch-tests
            (lambda _
              ;; This is needed because R is run during the check phase and


@@ 401,6 409,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
            curl
            openblas
            gfortran
+           grep
            icu4c
            libjpeg-turbo
            libpng