diff options
author | Justin Bedo <cu@cua0.org> | 2022-12-02 11:25:02 +1100 |
---|---|---|
committer | Justin Bedo <cu@cua0.org> | 2022-12-14 15:52:24 +1100 |
commit | 4d394bfb48e1af09369ec731eb39b6d6946d54e7 (patch) | |
tree | e3c75bfea17a76dacf08aa2ec23c6fa2ca2bd287 /pkgs/applications/science/math/R | |
parent | 037e57cbafa882034c7bf3a20ac90170339e55f2 (diff) |
R: 4.2.1 -> 4.2.2
Diffstat (limited to 'pkgs/applications/science/math/R')
-rw-r--r-- | pkgs/applications/science/math/R/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/science/math/R/test-reg-packages.patch | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 1c8c565528e9f..83acfcfe9c37d 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.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8="; + sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU="; }; dontUseImakeConfigure = true; @@ -32,7 +32,6 @@ 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: diff --git a/pkgs/applications/science/math/R/test-reg-packages.patch b/pkgs/applications/science/math/R/test-reg-packages.patch deleted file mode 100644 index 0125565a7997f..0000000000000 --- a/pkgs/applications/science/math/R/test-reg-packages.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 - - |