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.
This commit is contained in:
Alex Branham 2019-04-26 07:34:14 -05:00 committed by Peter Simons
parent 83886b3d91
commit 4264ad4c2b

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas , 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 , withRecommendedPackages ? true
, enableStrictBarrier ? false , enableStrictBarrier ? false
, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) , javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "R-3.5.3"; name = "R-3.6.0";
src = fetchurl { src = fetchurl {
url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "1337irx9y0r3jm1rcq1dcwnxsgfhnvgjs5wadcyh17vhpnvkgyib"; sha256 = "02bmylmzrm9sdidirmwy233lghmd2346z725ca71ari68lzarz1n";
}; };
dontUseImakeConfigure = true; dontUseImakeConfigure = true;
@ -25,7 +25,13 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
++ stdenv.lib.optional javaSupport jdk; ++ 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 '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"