diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-02-27 14:02:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 14:02:13 +0100 |
| commit | 4ccb553b700ed56ee1118bbf0dfac922d1197fd2 (patch) | |
| tree | 6a3edde530ab91bbd886bc45d834db767523623d /pkgs/applications | |
| parent | 7ed28a0b78f07eff2dba32bbc84ee4de9870f4e1 (diff) | |
| parent | 4c2d75f58c8e0133e8148ea1191e52f70d88dc4d (diff) | |
Merge pull request #22817 from jbedo/r
R: 3.2.4 -> 3.3.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/math/R/zlib-version-check.patch | 20 |
2 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index dea095c834ff..d9bbda9512a7 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.2.4"; + name = "R-3.3.2"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0l6k3l3cy6fa9xkn23zvz5ykpw10s45779x88yz3pzn2x5gl1zds"; + sha256 = "0k2i9qdd83g09fcpls2198q4ykxkii5skczb514gnx7mx4hsv56j"; }; buildInputs = [ bzip2 gfortran libX11 libXmu libXt @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ]; - patches = [ ./no-usr-local-search-paths.patch ]; + patches = [ ./no-usr-local-search-paths.patch ./zlib-version-check.patch ]; preConfigure = '' configureFlagsArray=( @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { --with-libpng --with-jpeglib --with-libtiff - --with-system-zlib - --with-system-bzlib - --with-system-pcre - --with-system-xz --with-ICU ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"} --enable-R-shlib @@ -69,7 +65,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - doCheck = true; + doCheck = withRecommendedPackages; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/R/zlib-version-check.patch b/pkgs/applications/science/math/R/zlib-version-check.patch new file mode 100644 index 000000000000..83cfed2cac4c --- /dev/null +++ b/pkgs/applications/science/math/R/zlib-version-check.patch @@ -0,0 +1,20 @@ +diff --git a/configure b/configure +index cf368ce..dc528ff 100755 +--- a/configure ++++ b/configure +@@ -35507,10 +35507,11 @@ else + #include <string.h> + #include <zlib.h> + int main() { +-#ifdef ZLIB_VERSION +-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such +- version on the master site zlib.net */ +- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0); ++#ifdef ZLIB_VERNUM ++ if (ZLIB_VERNUM < 0x01250) { ++ exit(1); ++ } ++ exit(0); + #else + exit(1); + #endif |