pyrox.dev
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.
authored by Alex Branham and committed by Peter Simons 4264ad4c 83886b3d
+10
-4
pkgs/applications/science/math/R/default.nix
+10
-4
pkgs/applications/science/math/R/default.nix
···
1
1
{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
2
2
, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
3
3
, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
4
-
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
4
+
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch
5
5
, withRecommendedPackages ? true
6
6
, enableStrictBarrier ? false
7
7
, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
8
8
}:
9
9
10
10
stdenv.mkDerivation rec {
11
-
name = "R-3.5.3";
11
+
name = "R-3.6.0";
12
12
13
13
src = fetchurl {
14
14
url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
15
-
sha256 = "1337irx9y0r3jm1rcq1dcwnxsgfhnvgjs5wadcyh17vhpnvkgyib";
15
+
sha256 = "02bmylmzrm9sdidirmwy233lghmd2346z725ca71ari68lzarz1n";
16
16
};
17
17
18
18
dontUseImakeConfigure = true;
···
25
25
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
26
26
++ stdenv.lib.optional javaSupport jdk;
27
27
28
-
patches = [ ./no-usr-local-search-paths.patch ];
28
+
patches = [
29
+
./no-usr-local-search-paths.patch
30
+
(fetchpatch {
31
+
url = "https://github.com/wch/r-source/commit/aeb75e12863019be06fe6c762ab705bf5ed8b38c.patch";
32
+
sha256 = "03xv1g1yw1dbhx4paw6pn6hkawj8sny86km3748l1vnasbham82g";
33
+
})
34
+
];
29
35
30
36
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
31
37
substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"