public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

R: update to version 3.1.3

Browse Source
This commit is contained in:
Peter Simons 2015-03-09 15:55:17 +01:00
parent 97feb65c00
commit 3f7de179f5
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/science/math/R/default.nix
View File

@ -6,11 +6,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "R-3.1.2"; name = "R-3.1.3";
src = fetchurl { src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; 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 buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
@ -54,8 +54,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install" "install-info" "install-pdf" ]; installTargets = [ "install" "install-info" "install-pdf" ];
# The test suite fails when building without the recommended packages. doCheck = true;
doCheck = withRecommendedPackages;
enableParallelBuilding = true; enableParallelBuilding = true;

10
pkgs/top-level/all-packages.nix
View File

@ -7925,14 +7925,14 @@ let
R = callPackage ../applications/science/math/R { R = callPackage ../applications/science/math/R {
inherit (xlibs) libX11 libXt; inherit (xlibs) libX11 libXt;
texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
withRecommendedPackages = true; withRecommendedPackages = false;
}; };
rWrapper = callPackage ../development/r-modules/wrapper.nix { rWrapper = callPackage ../development/r-modules/wrapper.nix {
# Those packages are usually installed as part of the R build. recommendedPackages = with rPackages; [
recommendedPackages = with rPackages; [ boot class cluster codetools boot class cluster codetools foreign KernSmooth lattice MASS
foreign KernSmooth lattice MASS Matrix mgcv nlme nnet rpart Matrix mgcv nlme nnet rpart spatial survival
spatial survival ]; ];
# Override this attribute to register additional libraries. # Override this attribute to register additional libraries.
packages = []; packages = [];
}; };