openvscode-server: switch to nodejs 18

+12 -14
+2 -6
pkgs/servers/openvscode-server/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper 2 2 , cacert, moreutils, jq, git, pkg-config, yarn, python3 3 - , esbuild, nodejs_16, libsecret, xorg, ripgrep 3 + , esbuild, nodejs, libsecret, xorg, ripgrep 4 4 , AppKit, Cocoa, Security, cctools, nixosTests }: 5 5 6 6 let 7 7 system = stdenv.hostPlatform.system; 8 8 9 - nodejs = nodejs_16; 10 9 yarn' = yarn.override { inherit nodejs; }; 11 10 defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; 12 11 ··· 108 107 109 108 # set offline mirror to yarn cache we created in previous steps 110 109 yarn --offline config set yarn-offline-mirror "${yarnCache}" 111 - 112 - # set nodedir, so we can build binaries later 113 - npm config set nodedir "${nodejs}" 114 110 ''; 115 111 116 112 buildPhase = '' ··· 147 143 # rebuild binaries, we use npm here, as yarn does not provide an alternative 148 144 # that would not attempt to try to reinstall everything and break our 149 145 # patching attempts 150 - npm --prefix ./remote rebuild --build-from-source 146 + npm --prefix ./remote rebuild --build-from-source --nodedir ${nodejs} 151 147 152 148 # run postinstall scripts after patching 153 149 find . -path "*node_modules" -prune -o \
+9 -8
pkgs/servers/openvscode-server/remove-node-download.patch
··· 1 1 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js 2 - index a44941a1e73..5fc924cb367 100644 2 + index 4630eaad3cc..96b165b0949 100644 3 3 --- a/build/gulpfile.reh.js 4 4 +++ b/build/gulpfile.reh.js 5 - @@ -265,8 +265,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa 5 + @@ -271,9 +271,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa 6 6 .pipe(util.stripSourceMappingURL()) 7 7 .pipe(jsFilter.restore); 8 - 8 + 9 9 - const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; 10 10 - const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); 11 - 11 + - 12 12 let web = []; 13 13 if (type === 'reh-web') { 14 - @@ -284,7 +282,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa 14 + web = [ 15 + @@ -290,7 +287,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa 15 16 license, 16 17 sources, 17 18 deps, 18 19 - node, 19 20 ...web 20 21 ); 21 - 22 - @@ -382,7 +379,6 @@ function tweakProductForServerWeb(product) { 22 + 23 + @@ -408,7 +404,6 @@ function tweakProductForServerWeb(product) { 23 24 const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; 24 - 25 + 25 26 const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( 26 27 - gulp.task(`node-${platform}-${arch}`), 27 28 util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
+1
pkgs/top-level/all-packages.nix
··· 34952 34952 vscodium-fhsWithPackages = vscodium.fhsWithPackages; 34953 34953 34954 34954 openvscode-server = callPackage ../servers/openvscode-server { 34955 + nodejs = nodejs_18; 34955 34956 inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; 34956 34957 inherit (darwin) cctools; 34957 34958 };