diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/math/R/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/science/math/R/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix index 517fc9d7b320..3ee62fad44da 100644 --- a/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -7,15 +7,14 @@ # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false -, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) }: stdenv.mkDerivation rec { - name = "R-3.6.2"; + name = "R-3.6.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx"; + sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"; }; dontUseImakeConfigure = true; @@ -23,12 +22,15 @@ 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 tcl tk - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] - ++ stdenv.lib.optional javaSupport jdk; + pkgconfig bison imake which openblas curl tcl tk jdk + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ + # Remove a test which fails on aarch64. + # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 + ./0001-Disable-test-pending-upstream-fix.patch ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -57,7 +59,7 @@ stdenv.mkDerivation rec { CC=$(type -p cc) CXX=$(type -p c++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" - ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""} + JAVA_HOME="${jdk}" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -86,7 +88,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = http://www.r-project.org/; + homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; license = licenses.gpl2Plus; |