pyrox.dev
Merge pull request #33901 from sifmelcara/fix/rstudio
rstudio: 1.1.383 -> 1.1.414
authored by Jörg Thalheim and committed by GitHub 5d8b359d 1cfdc984
+24
-22
pkgs/applications/editors/rstudio/default.nix
+24
-22
pkgs/applications/editors/rstudio/default.nix
···
1
-
{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
2
-
, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
3
-
, gnumake, makeWrapper, pandoc
1
+
{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost
2
+
, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts
3
+
, unzip, ant, jdk, gnumake, makeWrapper, pandoc
4
4
}:
5
5
6
6
let
7
-
version = "1.1.383";
7
+
version = "1.1.414";
8
8
ginVer = "1.5";
9
9
gwtVer = "2.7.0";
10
10
in
···
15
15
16
16
buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
17
17
18
-
src = fetchurl {
19
-
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
20
-
sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f";
18
+
src = fetchFromGitHub {
19
+
owner = "rstudio";
20
+
repo = "rstudio";
21
+
rev = "v${version}";
22
+
sha256 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8";
21
23
};
22
24
23
25
# Hack RStudio to only use the input R.
24
-
patches = [
25
-
./r-location.patch
26
-
(fetchpatch {
27
-
url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git;
28
-
sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d";
29
-
})
30
-
];
26
+
patches = [ ./r-location.patch ];
31
27
postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
32
28
33
29
inherit ginVer;
···
49
45
sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
50
46
};
51
47
52
-
rmarkdownSrc = fetchurl {
53
-
url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip";
54
-
sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah";
48
+
rmarkdownSrc = fetchFromGitHub {
49
+
owner = "rstudio";
50
+
repo = "rmarkdown";
51
+
rev = "v1.8";
52
+
sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb";
55
53
};
56
54
57
-
rsconnectSrc = fetchurl {
58
-
url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip";
59
-
sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p";
55
+
rsconnectSrc = fetchFromGitHub {
56
+
owner = "rstudio";
57
+
repo = "rsconnect";
58
+
rev = "953c945779dd180c1bfe68f41c173c13ec3e222d";
59
+
sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z";
60
60
};
61
61
62
62
rstudiolibclang = fetchurl {
···
88
88
done
89
89
90
90
unzip $mathJaxSrc -d dependencies/common/mathjax-26
91
-
unzip $rmarkdownSrc -d dependencies/common/rmarkdown
92
-
unzip $rsconnectSrc -d dependencies/common/rsconnect
91
+
mkdir -p dependencies/common/rmarkdown
92
+
ln -s $rmarkdownSrc dependencies/common/rmarkdown/
93
+
mkdir -p dependencies/common/rsconnect
94
+
ln -s $rsconnectSrc dependencies/common/rsconnect/
93
95
mkdir -p dependencies/common/libclang/3.5
94
96
unzip $rstudiolibclang -d dependencies/common/libclang/3.5
95
97
mkdir -p dependencies/common/libclang/builtin-headers