diff options
| author | Alex Branham <alex.branham@gmail.com> | 2019-04-26 07:34:14 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-04-29 13:35:21 +0200 |
| commit | 4264ad4c2b94aa512d2401f0880265493b6cb39e (patch) | |
| tree | f5556544d2e7011d6e782c433ce508ce725436c0 /pkgs/applications/science/math/R | |
| parent | 83886b3d91786e5cecf06901da71cc7ad3168cbf (diff) | |
R: 3.5.3 -> 3.6.0
The patch is necessary for the test suite to pass without errors. The fix has already been made upstream but didn't make it into the 3.6.0 release. Closes https://github.com/NixOS/nixpkgs/pull/60273.
Diffstat (limited to 'pkgs/applications/science/math/R')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 4111677ce455a..ed107765b4671 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, libobjc, libcxx, tzdata +, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false , javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) }: stdenv.mkDerivation rec { - name = "R-3.5.3"; + name = "R-3.6.0"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "1337irx9y0r3jm1rcq1dcwnxsgfhnvgjs5wadcyh17vhpnvkgyib"; + sha256 = "02bmylmzrm9sdidirmwy233lghmd2346z725ca71ari68lzarz1n"; }; dontUseImakeConfigure = true; @@ -25,7 +25,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] ++ stdenv.lib.optional javaSupport jdk; - patches = [ ./no-usr-local-search-paths.patch ]; + patches = [ + ./no-usr-local-search-paths.patch + (fetchpatch { + url = "https://github.com/wch/r-source/commit/aeb75e12863019be06fe6c762ab705bf5ed8b38c.patch"; + sha256 = "03xv1g1yw1dbhx4paw6pn6hkawj8sny86km3748l1vnasbham82g"; + }) + ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" |