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

rstudio: 1.1.216 -> 1.1.351

Browse Source
This commit is contained in:
Simon Lackerbauer 2017-08-29 13:26:03 +02:00 committed by Robin Gloster
parent d0e4aef32a
commit 40cbf90861
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/editors/rstudio/default.nix
View File

@ -1,24 +1,30 @@
{ stdenv, fetchurl, makeDesktopItem, cmake, boost163, zlib, openssl, { stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl,
R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
}: }:
let let
version = "1.1.216"; version = "1.1.351";
ginVer = "1.5"; ginVer = "1.5";
gwtVer = "2.7.0"; gwtVer = "2.7.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "RStudio-${version}"; name = "RStudio-${version}";
buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ]; buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ];
src = fetchurl { src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
sha256 = "07lp2ybvj7ippdrp7fv7j54dp0mm6k19j1vqdvjdk95acg3xgcjf"; sha256 = "0dpzmkq7jkdndidmmgdcr849q33ypmzkqwx22fraaqcy7w4f0pcn";
}; };
# Hack RStudio to only use the input R. # Hack RStudio to only use the input R.
patches = [ ./r-location.patch ]; patches = [
./r-location.patch
(fetchpatch {
url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git;
sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d";
})
];
postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
inherit ginVer; inherit ginVer;
@ -115,7 +121,7 @@ stdenv.mkDerivation rec {
{ description = "Set of integrated tools for the R language"; { description = "Set of integrated tools for the R language";
homepage = http://www.rstudio.com/; homepage = http://www.rstudio.com/;
license = licenses.agpl3; license = licenses.agpl3;
maintainers = [ maintainers.ehmry maintainers.changlinli ]; maintainers = with maintainers; [ ehmry changlinli ciil ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }