From d37edcd3d5d764b2ac2b9b03835adf744dc596c9 Mon Sep 17 00:00:00 2001
From: Phil Dyer <phildyer@protonmail.com>
Date: Wed, 11 Aug 2021 16:41:53 +1000
Subject: [PATCH] R: 4.1.0 ->  4.1.1

---
 pkgs/applications/science/math/R/default.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0c9f700bd42..f016dc460c6 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "R";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
-    sha256 = "109732arm6dq6d6v3fl1nyx63lcvv9569j8g6r3s2b18sxcqkrp8";
+    sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji";
   };
 
   dontUseImakeConfigure = true;
@@ -30,19 +30,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-usr-local-search-paths.patch
-  ] ++ lib.optionals (!withRecommendedPackages) [
-    (fetchpatch {
-       name = "fix-tests-without-recommended-packages.patch";
-       url = "https://github.com/wch/r-source/commit/7715c67cabe13bb15350cba1a78591bbb76c7bac.patch";
-       # this part of the patch reverts something that was committed after R 4.1.0, so ignore it.
-       excludes = [ "tests/Pkgs/xDir/pkg/DESCRIPTION" ];
-       sha256 = "sha256-iguLndCIuKuCxVCi/4NSu+9RzBx5JyeHx3K6IhpYshQ=";
-    })
-    (fetchpatch {
-      name = "use-codetools-conditionally.patch";
-      url = "https://github.com/wch/r-source/commit/7543c28b931db386bb254e58995973493f88e30d.patch";
-      sha256 = "sha256-+yHXB5AItFyQjSxfogxk72DrSDGiBh7OiLYFxou6Xlk=";
-    })
   ];
 
   prePatch = lib.optionalString stdenv.isDarwin ''