From ead6bc4a57da107357527d5f8d20350cfc8102d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Nov 2014 19:33:58 +0100 Subject: [PATCH] R: run the test suite only when recommended packages are built --- pkgs/applications/science/math/R/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 6bbcba1a5d8..097de96e3e3 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - # Test suite fails: https://bugs.r-project.org/bugzilla/show_bug.cgi?id=15975. - doCheck = false; + # The test suite fails when building without the recommended packages. + doCheck = withRecommendedPackages; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb678c04f71..633a056d647 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7275,7 +7275,7 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - withRecommendedPackages = false; + withRecommendedPackages = true; }; rWrapper = callPackage ../development/r-modules/wrapper.nix {