diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d9bbda9512a7..424c8172dd11 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,21 +7,21 @@ }: stdenv.mkDerivation rec { - name = "R-3.3.2"; + name = "R-3.3.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0k2i9qdd83g09fcpls2198q4ykxkii5skczb514gnx7mx4hsv56j"; + sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss"; }; - buildInputs = [ bzip2 gfortran libX11 libXmu libXt - libXt libjpeg libpng libtiff ncurses pango pcre perl readline - texLive xz zlib less texinfo graphviz icu pkgconfig bison imake - which jdk openblas curl ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] + buildInputs = [ + bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses + pango pcre perl readline texLive xz zlib less texinfo graphviz icu + pkgconfig bison imake which jdk openblas curl + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ]; - patches = [ ./no-usr-local-search-paths.patch ./zlib-version-check.patch ]; + patches = [ ./no-usr-local-search-paths.patch ]; preConfigure = '' configureFlagsArray=( @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in ''; + # This Darwin-specific patch has almost certainly become unnecessary. Can + # some Darwin user please verify that the R build still succeeds if this is + # removed? postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c @@ -71,10 +74,10 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; longDescription = '' GNU R is a language and environment for statistical computing and @@ -95,9 +98,9 @@ stdenv.mkDerivation rec { user-defined recursive functions and input and output facilities. ''; - platforms = stdenv.lib.platforms.all; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = platforms.all; + hydraPlatforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/applications/science/math/R/zlib-version-check.patch b/pkgs/applications/science/math/R/zlib-version-check.patch deleted file mode 100644 index 83cfed2cac4c..000000000000 --- a/pkgs/applications/science/math/R/zlib-version-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/configure b/configure -index cf368ce..dc528ff 100755 ---- a/configure -+++ b/configure -@@ -35507,10 +35507,11 @@ else - #include - #include - 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