cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

R: 4.1.1 -> 4.1.2

Browse source
This commit is contained in:
Justin Bedo 2021-11-02 17:42:34 +11:00
parent f7add18261
commit 257a939cfc
No known key found for this signature in database
GPG key ID: 2C18202C56C182BD
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/science/math/R/default.nix
View file

@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "R"; pname = "R";
version = "4.1.1"; version = "4.1.2";
src = fetchurl { src = fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji"; sha256 = "sha256-IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8=";
}; };
dontUseImakeConfigure = true; dontUseImakeConfigure = true;
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./no-usr-local-search-paths.patch ./no-usr-local-search-paths.patch
./skip-check-for-aarch64.patch
]; ];
prePatch = lib.optionalString stdenv.isDarwin '' prePatch = lib.optionalString stdenv.isDarwin ''

11
pkgs/applications/science/math/R/skip-check-for-aarch64.patch
View file

@ -1,11 +0,0 @@
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