R: 4.1.3 -> 4.2.0
Patch needed to past test, as there are extra warnings in a sandbox build due to lack of internet access. x
This commit is contained in:
parent
602748c14b
commit
5eb9f35c44
|
@ -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;
|
||||
|
||||
|
|
15
pkgs/applications/science/math/R/test-reg-packages.patch
Normal file
15
pkgs/applications/science/math/R/test-reg-packages.patch
Normal file
|
@ -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
|
||||
|
||||
|
Loading…
Reference in a new issue