guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu: r-with-tests: Fix reference to grep.


From: guix-commits
Subject: 01/03: gnu: r-with-tests: Fix reference to grep.
Date: Sun, 16 Jul 2023 04:49:23 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit ff0d34a29bc0f19b1dd2714fc0a3bd73a244aebe
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Jul 15 23:11:31 2023 +0200

    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.
---
 gnu/packages/statistics.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index f28e60362c..2043bf2fd3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]