b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add Patch for aarch64

Browse source
This commit is contained in:
Phil Dyer 2021-08-13 10:16:59 +10:00
parent d37edcd3d5
commit 7f07184a8e
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
patches = [
./no-usr-local-search-paths.patch
./skip-check-for-aarch64.patch
];
prePatch = lib.optionalString stdenv.isDarwin ''

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

@ -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