From d16c38a260ef41ae648f994918f491437fb7c75c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Apr 2017 16:42:05 +0200 Subject: [PATCH] R: update to version 3.4.0 The new version needs TZ configured to a value other than "UTC" for the test suite to succeed. Otherwise, an assumption in "reg-tests-1d.R" won't hold that expects d <- as.POSIXlt("2016-12-06"); d$zone <- 1; format(d) to throw an error about an invalid time zone. --- pkgs/applications/science/math/R/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f87a26cda8a..20ae791c31b 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.3.3"; + name = "R-3.4.0"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss"; + sha256 = "14cb8bwi3akvdb6934kqic2862f2qgav6cq4g0h7gi2p4ka9x3i8"; }; buildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; doCheck = true; - preCheck = "bin/Rscript -e 'sessionInfo()'"; + preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true;