mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 06:38:22 +03:00
R: update to version 3.3.3
This commit is contained in:
parent
b94e253e69
commit
fac139e723
@ -7,21 +7,21 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "R-3.3.2";
|
name = "R-3.3.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 = "0k2i9qdd83g09fcpls2198q4ykxkii5skczb514gnx7mx4hsv56j";
|
sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bzip2 gfortran libX11 libXmu libXt
|
buildInputs = [
|
||||||
libXt libjpeg libpng libtiff ncurses pango pcre perl readline
|
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
|
||||||
texLive xz zlib less texinfo graphviz icu pkgconfig bison imake
|
pango pcre perl readline texLive xz zlib less texinfo graphviz icu
|
||||||
which jdk openblas curl ]
|
pkgconfig bison imake which jdk openblas curl
|
||||||
++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
|
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
|
++ 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 = ''
|
preConfigure = ''
|
||||||
configureFlagsArray=(
|
configureFlagsArray=(
|
||||||
@ -58,6 +58,9 @@ stdenv.mkDerivation rec {
|
|||||||
echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
|
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 ''
|
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|/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
|
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;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
homepage = "http://www.r-project.org/";
|
homepage = "http://www.r-project.org/";
|
||||||
description = "Free software environment for statistical computing and graphics";
|
description = "Free software environment for statistical computing and graphics";
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
GNU R is a language and environment for statistical computing and
|
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.
|
user-defined recursive functions and input and output facilities.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
platforms = platforms.all;
|
||||||
hydraPlatforms = stdenv.lib.platforms.linux;
|
hydraPlatforms = platforms.linux;
|
||||||
|
|
||||||
maintainers = [ stdenv.lib.maintainers.peti ];
|
maintainers = [ maintainers.peti ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
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
|
|
Loading…
Reference in New Issue
Block a user