pyrox.dev
rstudio: 1.1.414 -> 1.1.423
Also fixes the version number displayed in GUI.
+21
-34
pkgs/applications/editors/rstudio/default.nix
+21
-34
pkgs/applications/editors/rstudio/default.nix
···
4
4
}:
5
5
6
6
let
7
-
version = "1.1.414";
7
+
verMajor = "1";
8
+
verMinor = "1";
9
+
verPatch = "423";
10
+
version = "${verMajor}.${verMinor}.${verPatch}";
8
11
ginVer = "1.5";
9
12
gwtVer = "2.7.0";
10
13
in
···
19
22
owner = "rstudio";
20
23
repo = "rstudio";
21
24
rev = "v${version}";
22
-
sha256 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8";
25
+
sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf";
23
26
};
24
27
25
28
# Hack RStudio to only use the input R.
26
29
patches = [ ./r-location.patch ];
27
30
postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
28
31
29
-
inherit ginVer;
30
32
ginSrc = fetchurl {
31
33
url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip";
32
34
sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm";
33
35
};
34
36
35
-
inherit gwtVer;
36
37
gwtSrc = fetchurl {
37
38
url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip";
38
39
sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda";
39
40
};
40
41
41
-
hunspellDictionaries = builtins.attrValues hunspellDicts;
42
+
hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts);
42
43
43
44
mathJaxSrc = fetchurl {
44
45
url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
45
46
sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
46
47
};
47
48
48
-
rmarkdownSrc = fetchFromGitHub {
49
-
owner = "rstudio";
50
-
repo = "rmarkdown";
51
-
rev = "v1.8";
52
-
sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb";
53
-
};
54
-
55
-
rsconnectSrc = fetchFromGitHub {
56
-
owner = "rstudio";
57
-
repo = "rsconnect";
58
-
rev = "953c945779dd180c1bfe68f41c173c13ec3e222d";
59
-
sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z";
60
-
};
61
-
62
49
rstudiolibclang = fetchurl {
63
50
url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip;
64
51
sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c";
···
71
58
72
59
preConfigure =
73
60
''
61
+
export RSTUDIO_VERSION_MAJOR=${verMajor}
62
+
export RSTUDIO_VERSION_MINOR=${verMinor}
63
+
export RSTUDIO_VERSION_PATCH=${verPatch}
64
+
74
65
GWT_LIB_DIR=src/gwt/lib
75
66
76
-
mkdir -p $GWT_LIB_DIR/gin/$ginVer
77
-
unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer
67
+
mkdir -p $GWT_LIB_DIR/gin/${ginVer}
68
+
unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer}
78
69
79
-
unzip $gwtSrc
70
+
unzip ${gwtSrc}
80
71
mkdir -p $GWT_LIB_DIR/gwt
81
-
mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer
72
+
mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
82
73
83
74
mkdir dependencies/common/dictionaries
84
-
for dict in $hunspellDictionaries; do
85
-
for i in "$dict/share/hunspell/"*
86
-
do ln -sv $i dependencies/common/dictionaries/
87
-
done
75
+
for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
76
+
for i in "$dict/share/hunspell/"*; do
77
+
ln -sv $i dependencies/common/dictionaries/
78
+
done
88
79
done
89
80
90
-
unzip $mathJaxSrc -d dependencies/common/mathjax-26
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/
81
+
unzip ${mathJaxSrc} -d dependencies/common/mathjax-26
95
82
mkdir -p dependencies/common/libclang/3.5
96
-
unzip $rstudiolibclang -d dependencies/common/libclang/3.5
83
+
unzip ${rstudiolibclang} -d dependencies/common/libclang/3.5
97
84
mkdir -p dependencies/common/libclang/builtin-headers
98
-
unzip $rstudiolibclangheaders -d dependencies/common/libclang/builtin-headers
85
+
unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers
99
86
100
87
mkdir -p dependencies/common/pandoc
101
88
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/