From 108111114d5269e608f961d44955d0d4613b9c15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Nov 2021 09:40:41 +0000 Subject: [PATCH] gnu: r-with-tests: Remove trailing #T. * gnu/packages/statistics.scm (r-with-tests)[arguments]: Remove trailing #T from build phases. --- gnu/packages/statistics.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 038258a8bc..eb6898e60d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -215,8 +215,7 @@ (define r-with-tests ;; This ensures that Guix can detect embedded store references; ;; see bug #28157 for details. (substitute* "src/library/base/makebasedb.R" - (("compress = TRUE") "compress = FALSE")) - #t)) + (("compress = TRUE") "compress = FALSE")))) (add-before 'configure 'patch-coreutils-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((coreutils (assoc-ref inputs "coreutils")) @@ -225,8 +224,7 @@ (define r-with-tests (substitute* "src/scripts/R.sh.in" (("uname") uname-bin)) (substitute* "src/unix/sys-std.c" - (("rm -Rf ") (string-append rm-bin " -Rf ")))) - #t)) + (("rm -Rf ") (string-append rm-bin " -Rf ")))))) (add-after 'unpack 'build-reproducibly (lambda _ ;; The documentation contains time stamps to demonstrate @@ -285,17 +283,15 @@ (define r-with-tests ;; that is suspected to be the culprit. (substitute* "src/library/methods/DESCRIPTION.in" (("\\(2008\\)\n") "(2008) ") - ((" ``Software") "``Software")) - #t)) + ((" ``Software") "``Software")))) (add-before 'build 'set-locales (lambda _ (setlocale LC_ALL "C") - (setenv "LC_ALL" "C") - #t)) + (setenv "LC_ALL" "C"))) (add-before 'configure 'set-default-pager ;; Set default pager to "cat", because otherwise it is "false", ;; making "help()" print nothing at all. - (lambda _ (setenv "PAGER" "cat") #t)) + (lambda _ (setenv "PAGER" "cat"))) (add-before 'check 'set-timezone ;; Some tests require the timezone to be set. However, the ;; timezone may not just be "UTC", or else a brittle regression @@ -304,8 +300,7 @@ (define r-with-tests (setenv "TZ" "UTC+1") (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - #t)) + "/share/zoneinfo")))) (add-after 'build 'make-info (lambda _ (invoke "make" "info"))) (add-after 'build 'install-info