diff options
Diffstat (limited to 'pkgs/applications/science/math/R/default.nix')
-rw-r--r-- | pkgs/applications/science/math/R/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index bc0f7ed88316..517fc9d7b320 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.6.1"; + name = "R-3.6.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv"; + sha256 = "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx"; }; dontUseImakeConfigure = true; @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which openblas curl - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] + pkgconfig bison imake which openblas curl tcl tk + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] ++ stdenv.lib.optional javaSupport jdk; patches = [ @@ -62,8 +61,6 @@ stdenv.mkDerivation rec { RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" '' + stdenv.lib.optionalString stdenv.isDarwin '' - --without-tcltk - --without-aqua --disable-R-framework OBJC="clang" CPPFLAGS="-isystem ${libcxx}/include/c++/v1" |