Merge pull request #127798 from PhDyellow/r_bump_version
R: 4.0.4 -> 4.1.0
This commit is contained in:
commit
1350415b52
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
|
||||
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib
|
||||
, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
|
||||
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch
|
||||
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
|
||||
, withRecommendedPackages ? true
|
||||
, enableStrictBarrier ? false
|
||||
# R as of writing does not support outputting both .so and .a files; it outputs:
|
||||
|
@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "R";
|
||||
version = "4.0.4";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj";
|
||||
sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji";
|
||||
};
|
||||
|
||||
dontUseImakeConfigure = true;
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./no-usr-local-search-paths.patch
|
||||
./fix-failing-test.patch
|
||||
./skip-check-for-aarch64.patch
|
||||
];
|
||||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001
|
||||
From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
|
||||
Date: Mon, 30 Mar 2020 19:15:59 +0000
|
||||
Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack
|
||||
3.9.0
|
||||
|
||||
git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41
|
||||
---
|
||||
tests/reg-tests-1d.R | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R
|
||||
index 6b7de765a95..fafd6911e7a 100644
|
||||
--- a/tests/reg-tests-1d.R
|
||||
+++ b/tests/reg-tests-1d.R
|
||||
@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") ))
|
||||
## norm(<matrix-w-NA>, "F")
|
||||
(m <- cbind(0, c(NA, 0), 0:-1))
|
||||
nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2"
|
||||
-stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN
|
||||
+print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME
|
||||
+ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN
|
||||
## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
diff -ur a/src/library/stats/man/nls.Rd b/src/library/stats/man/nls.Rd
|
||||
--- a/src/library/stats/man/nls.Rd 2021-05-21 19:15:02.000000000 -0300
|
||||
+++ b/src/library/stats/man/nls.Rd 2021-08-12 12:39:00.094758280 -0300
|
||||
@@ -287,7 +287,7 @@
|
||||
options(digits = 10) # more accuracy for 'trace'
|
||||
## IGNORE_RDIFF_BEGIN
|
||||
try(nlm1 <- update(nlmod, control = list(tol = 1e-7))) # where central diff. work here:
|
||||
- (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE), trace=TRUE))
|
||||
+ (nlm2 <- update(nlmod, control = list(tol = 8e-8, nDcentral=TRUE, warnOnly=TRUE), trace=TRUE))
|
||||
## --> convergence tolerance 4.997e-8 (in 11 iter.)
|
||||
## IGNORE_RDIFF_END
|
Loading…
Reference in New Issue
Block a user