R: 4.2.1 -> 4.2.2

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:

pkgs/applications/science/math/R/test-reg-packages.patch

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

pkgs/top-level/all-packages.nix

@@ -23530,7 +23530,7 @@ with pkgs;
   R = callPackage ../applications/science/math/R {
     # TODO: split docs into a separate output
     texLive = texlive.combine {
-      inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super;
+      inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super rsfs;
     };
     withRecommendedPackages = false;
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;