diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f91d72ff3f63..d1b1199686f6 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ff9bMzxhCUBgsqUunB2OxVzELdAp45yiKr2qkJUm/tY="; + sha256 = "sha256-OOq3cZt60JU4jwaqCQxaKyAnkZRd5g0+K7DqsfUJdIg="; }; dontUseImakeConfigure = true; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch + ./test-reg-packages.patch ]; # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { postFixup = "echo ${which} > $out/nix-support/undetected-runtime-dependencies"; doCheck = true; - preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; + preCheck = "export HOME=$TMPDIR; export TZ=CET; bin/Rscript -e 'sessionInfo()'"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/R/test-reg-packages.patch b/pkgs/applications/science/math/R/test-reg-packages.patch new file mode 100644 index 000000000000..0125565a7997 --- /dev/null +++ b/pkgs/applications/science/math/R/test-reg-packages.patch @@ -0,0 +1,15 @@ +Upper bounds shifts due to extra warnings re. internet connectivity. + +diff --git a/tests/reg-packages.R b/tests/reg-packages.R +index c9962ce..a40b0fa 100644 +--- a/tests/reg-packages.R ++++ b/tests/reg-packages.R +@@ -260,7 +260,7 @@ stopifnot(exprs = { + (lenN <- length(print(iN <- grep("^[1-9][0-9]:", tlines)))) >= 2 + iN - iw == seq_len(lenN) # these (3) lines come immediately after 'Warning', + ## and "related" to the some 'missing .. paren' above: +- 8 <= print(iw - i) & iw - i <= 20 # see ~14 ++ 8 <= print(iw - i) & iw - i <= 22 # see ~14 + }) ## failed in R <= 4.1.1 + +