diff options
| author | Peter Simons <simons@cryp.to> | 2014-11-02 16:15:53 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-11-02 16:15:53 +0100 |
| commit | a9c53037fa48abcdbb057e35152572c74321d518 (patch) | |
| tree | da69f70a5a311ed56eef04f5fc82b3d63d31f702 /pkgs/applications/science/math/R | |
| parent | aa3d54e64472a7a4a09122fcdc72fcc515a9d57c (diff) | |
| parent | a6c21ccea93cb60d95f7e53cd244ac990445c576 (diff) | |
| download | nixlib-a9c53037fa48abcdbb057e35152572c74321d518.tar nixlib-a9c53037fa48abcdbb057e35152572c74321d518.tar.gz nixlib-a9c53037fa48abcdbb057e35152572c74321d518.tar.bz2 nixlib-a9c53037fa48abcdbb057e35152572c74321d518.tar.lz nixlib-a9c53037fa48abcdbb057e35152572c74321d518.tar.xz nixlib-a9c53037fa48abcdbb057e35152572c74321d518.tar.zst nixlib-a9c53037fa48abcdbb057e35152572c74321d518.zip | |
Merge remote-tracking branch 'origin/master' into staging.
Diffstat (limited to 'pkgs/applications/science/math/R')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index edba65146a66..097de96e3e3c 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.0"; + name = "R-3.1.2"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a"; + sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = true; + # The test suite fails when building without the recommended packages. + doCheck = withRecommendedPackages; enableParallelBuilding = true; |