diff options
| author | Phil Dyer <phildyer@protonmail.com> | 2021-06-22 22:27:21 +1000 |
|---|---|---|
| committer | Phil Dyer <phildyer@protonmail.com> | 2021-07-27 12:32:00 +1000 |
| commit | 9a88197fe7825f486052e3a9eca4a68192335978 (patch) | |
| tree | 243f4bb780d14597dc45f6578b4c69bce35220e4 /pkgs/applications/science/math/R/default.nix | |
| parent | 17abd470695604fc4b5bb25bbfd100c3c7177b44 (diff) | |
R: 4.0.4 -> 4.1.0
Co-authored-by: Mauricio Collares <244239+collares@users.noreply.github.com>
Diffstat (limited to 'pkgs/applications/science/math/R/default.nix')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 827c817fd1a6f..0c9f700bd4234 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.0.4"; + version = "4.1.0"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj"; + sha256 = "109732arm6dq6d6v3fl1nyx63lcvv9569j8g6r3s2b18sxcqkrp8"; }; dontUseImakeConfigure = true; @@ -30,7 +30,19 @@ stdenv.mkDerivation rec { patches = [ ./no-usr-local-search-paths.patch - ./fix-failing-test.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 '' |