diff options
| author | Peter Simons <simons@cryp.to> | 2015-03-09 15:55:17 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-03-09 16:37:05 +0100 |
| commit | 3f7de179f56336f0a47013b0703e74d25c86b8e9 (patch) | |
| tree | ebcebd2b0110d49de45bd98b18a9c0255d250ba9 /pkgs | |
| parent | 97feb65c00441a645c080c9e98a165dd84f5c43a (diff) | |
| download | nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.tar nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.tar.gz nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.tar.bz2 nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.tar.lz nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.tar.xz nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.tar.zst nixlib-3f7de179f56336f0a47013b0703e74d25c86b8e9.zip | |
R: update to version 3.1.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 05f18334b991..0bd6f5a35c3f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.1.2"; + name = "R-3.1.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw"; + sha256 = "04kk6wd55bi0f0qsp98ckjxh95q2990vkgq4j83kiajvjciq7s87"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt @@ -54,8 +54,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - # The test suite fails when building without the recommended packages. - doCheck = withRecommendedPackages; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c20ea4e721..d02a677b1eaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7925,14 +7925,14 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - withRecommendedPackages = true; + withRecommendedPackages = false; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { - # Those packages are usually installed as part of the R build. - recommendedPackages = with rPackages; [ boot class cluster codetools - foreign KernSmooth lattice MASS Matrix mgcv nlme nnet rpart - spatial survival ]; + recommendedPackages = with rPackages; [ + boot class cluster codetools foreign KernSmooth lattice MASS + Matrix mgcv nlme nnet rpart spatial survival + ]; # Override this attribute to register additional libraries. packages = []; }; |