diff options
| author | Justin Bedo <cu@cua0.org> | 2021-11-02 17:42:34 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2021-11-02 17:42:34 +1100 |
| commit | 257a939cfc516662ec01dd117d0bb45a5338f6a5 (patch) | |
| tree | f73158bb6d09e31500f1d003b018e8eb05b88856 | |
| parent | f7add18261df368ee871f608700ec1437d7fe660 (diff) | |
| download | nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.tar nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.tar.gz nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.tar.bz2 nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.tar.lz nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.tar.xz nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.tar.zst nixpkgs-257a939cfc516662ec01dd117d0bb45a5338f6a5.zip | |
R: 4.1.1 -> 4.1.2
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/science/math/R/skip-check-for-aarch64.patch | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index dbd2fb095e0..0a9a976f18a 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.1"; + version = "4.1.2"; src = fetchurl { 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; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ./skip-check-for-aarch64.patch ]; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/math/R/skip-check-for-aarch64.patch b/pkgs/applications/science/math/R/skip-check-for-aarch64.patch deleted file mode 100644 index 8721bf6b422..00000000000 --- a/pkgs/applications/science/math/R/skip-check-for-aarch64.patch +++ /dev/null @@ -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 |