Skip to content

Commit b54a112

Browse files
authored
rstudio: bump electron version (#419913)
2 parents cc07d10 + a2a5367 commit b54a112

File tree

2 files changed

+75
-3
lines changed

2 files changed

+75
-3
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json
2+
index e4cf455..f822c46 100644
3+
--- a/src/node/desktop/package-lock.json
4+
+++ b/src/node/desktop/package-lock.json
5+
@@ -18,7 +18,7 @@
6+
"line-reader": "0.4.0",
7+
"lodash.debounce": "4.0.8",
8+
"net-ipc": "2.2.0",
9+
- "node-abi": "3.71.0",
10+
+ "node-abi": "^4.10.0",
11+
"node-addon-api": "8.3.1",
12+
"node-system-fonts": "1.0.1",
13+
"properties-reader": "2.3.0",
14+
@@ -1068,6 +1068,19 @@
15+
"node": ">=12.13.0"
16+
}
17+
},
18+
+ "node_modules/@electron/rebuild/node_modules/node-abi": {
19+
+ "version": "3.75.0",
20+
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
21+
+ "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
22+
+ "dev": true,
23+
+ "license": "MIT",
24+
+ "dependencies": {
25+
+ "semver": "^7.3.5"
26+
+ },
27+
+ "engines": {
28+
+ "node": ">=10"
29+
+ }
30+
+ },
31+
"node_modules/@electron/universal": {
32+
"version": "2.0.2",
33+
"resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz",
34+
@@ -9615,15 +9628,15 @@
35+
}
36+
},
37+
"node_modules/node-abi": {
38+
- "version": "3.71.0",
39+
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz",
40+
- "integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==",
41+
+ "version": "4.10.0",
42+
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.10.0.tgz",
43+
+ "integrity": "sha512-99+BHGmmk969uU3Q4DM9t2tBvDKmqZ3prz/yumY7n+fV2zA+DAOBXuodsp9ZD/QSXK8aSKgWIpkg8tbrAe9JBg==",
44+
"license": "MIT",
45+
"dependencies": {
46+
- "semver": "^7.3.5"
47+
+ "semver": "^7.6.3"
48+
},
49+
"engines": {
50+
- "node": ">=10"
51+
+ "node": ">=22.12.0"
52+
}
53+
},
54+
"node_modules/node-abort-controller": {
55+
diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
56+
index 1fe9294..e3797cf 100644
57+
--- a/src/node/desktop/package.json
58+
+++ b/src/node/desktop/package.json
59+
@@ -76,7 +76,7 @@
60+
"line-reader": "0.4.0",
61+
"lodash.debounce": "4.0.8",
62+
"net-ipc": "2.2.0",
63+
- "node-abi": "3.71.0",
64+
+ "node-abi": "^4.10.0",
65+
"node-addon-api": "8.3.1",
66+
"node-system-fonts": "1.0.1",
67+
"properties-reader": "2.3.0",

pkgs/by-name/rs/rstudio/package.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
apple-sdk_11,
2828
boost187,
29-
electron_34,
29+
electron_36,
3030
fontconfig,
3131
gnumake,
3232
hunspellDicts,
@@ -45,7 +45,7 @@
4545
}:
4646

4747
let
48-
electron = electron_34;
48+
electron = electron_36;
4949

5050
mathJaxSrc = fetchzip {
5151
url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
@@ -211,6 +211,7 @@ stdenv.mkDerivation rec {
211211
./ignore-etc-os-release.patch
212212
./dont-yarn-install.patch
213213
./fix-darwin.patch
214+
./bump-node-abi.patch
214215
];
215216

216217
postPatch = ''
@@ -241,7 +242,11 @@ stdenv.mkDerivation rec {
241242
name = "rstudio-${version}-npm-deps";
242243
inherit src;
243244
postPatch = "cd ${npmRoot}";
244-
hash = "sha256-ispV6FJdtOELtFNIZDn1lKbwvO/iTO8mrZ8nIOs2uhs=";
245+
patches = [
246+
# needed for support for electron versions above electron_34
247+
./bump-node-abi.patch
248+
];
249+
hash = "sha256-64PJPUE/xwdQdxVGiKzy8ADnxXH/qGQtFMib0unZpoA=";
245250
};
246251

247252
preConfigure =

0 commit comments

Comments
 (0)