pyrox.dev / nixpkgs
lol
fork atom

openvscode-server: 1.62.3 -> 1.66.0

Emily Trau aa010a32 ff5da2c3

+20 -21
unified split
+11 -14
pkgs/servers/openvscode-server/default.nix
··· 13 vsBuildTarget = { 14 x86_64-linux = "linux-x64"; 15 aarch64-linux = "linux-arm64"; 16 - x86_64-darwin = "darwin"; 17 }.${system} or (throw "Unsupported system ${system}"); 18 19 # replaces esbuild's download script with a binary from nixpkgs ··· 26 27 in stdenv.mkDerivation rec { 28 pname = "openvscode-server"; 29 - version = "1.62.3"; 30 31 src = fetchFromGitHub { 32 owner = "gitpod-io"; 33 repo = "openvscode-server"; 34 rev = "openvscode-server-v${version}"; 35 - sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j"; 36 }; 37 38 yarnCache = stdenv.mkDerivation { ··· 55 56 outputHashMode = "recursive"; 57 outputHashAlgo = "sha256"; 58 - outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk"; 59 }; 60 61 # Extract the Node.js source code which is used to compile packages with ··· 123 patchShebangs ./remote/node_modules 124 125 # put ripgrep binary into bin so postinstall does not try to download it 126 - find -name vscode-ripgrep -type d \ 127 -execdir mkdir -p {}/bin \; \ 128 -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; 129 '' + lib.optionalString stdenv.isDarwin '' ··· 150 ''; 151 152 installPhase = '' 153 - mkdir -p $out/libexec 154 - 155 - cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec" 156 - 157 - ln -s ${nodejs}/bin/node $out/libexec 158 - 159 - makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server" 160 ''; 161 162 meta = with lib; { ··· 167 ''; 168 homepage = "https://github.com/gitpod-io/openvscode-server"; 169 license = licenses.mit; 170 - maintainers = with maintainers; [ dguenther ghuntley ]; 171 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 172 }; 173 }
··· 13 vsBuildTarget = { 14 x86_64-linux = "linux-x64"; 15 aarch64-linux = "linux-arm64"; 16 + x86_64-darwin = "darwin-x64"; 17 + aarch64-darwin = "darwin-arm64"; 18 }.${system} or (throw "Unsupported system ${system}"); 19 20 # replaces esbuild's download script with a binary from nixpkgs ··· 27 28 in stdenv.mkDerivation rec { 29 pname = "openvscode-server"; 30 + version = "1.66.0"; 31 32 src = fetchFromGitHub { 33 owner = "gitpod-io"; 34 repo = "openvscode-server"; 35 rev = "openvscode-server-v${version}"; 36 + sha256 = "g5QaxZDVXvE/vOe2BjBXlqYLGZ2EG4nTKdUlLdt8H8A="; 37 }; 38 39 yarnCache = stdenv.mkDerivation { ··· 56 57 outputHashMode = "recursive"; 58 outputHashAlgo = "sha256"; 59 + outputHash = "sha256-BeVJsruiRLReGMwThfcEm/ez4UFcr0oI4wwevJwxt58="; 60 }; 61 62 # Extract the Node.js source code which is used to compile packages with ··· 124 patchShebangs ./remote/node_modules 125 126 # put ripgrep binary into bin so postinstall does not try to download it 127 + find -path "*@vscode/ripgrep" -type d \ 128 -execdir mkdir -p {}/bin \; \ 129 -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; 130 '' + lib.optionalString stdenv.isDarwin '' ··· 151 ''; 152 153 installPhase = '' 154 + mkdir -p $out 155 + cp -R -T ../vscode-reh-web-${vsBuildTarget} $out 156 + ln -s ${nodejs}/bin/node $out 157 ''; 158 159 meta = with lib; { ··· 164 ''; 165 homepage = "https://github.com/gitpod-io/openvscode-server"; 166 license = licenses.mit; 167 + maintainers = with maintainers; [ dguenther ghuntley emilytrau ]; 168 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 169 }; 170 }
+9 -7
pkgs/servers/openvscode-server/remove-node-download.patch
··· 1 - --- ./build/gulpfile.reh.js 2 - +++ ./build/gulpfile.reh.js 3 - @@ -277,8 +277,6 @@ 4 .pipe(util.stripSourceMappingURL()) 5 .pipe(jsFilter.restore); 6 7 - - const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`; 8 - const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); 9 10 let web = []; 11 if (type === 'reh-web') { 12 - @@ -296,7 +294,6 @@ 13 license, 14 sources, 15 deps, ··· 17 ...web 18 ); 19 20 - @@ -376,7 +373,6 @@ 21 const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; 22 23 const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( 24 - - gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`), 25 util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), 26 packageTask(type, platform, arch, sourceFolderName, destinationFolderName) 27 ));
··· 1 + diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js 2 + index a44941a1e73..5fc924cb367 100644 3 + --- a/build/gulpfile.reh.js 4 + +++ b/build/gulpfile.reh.js 5 + @@ -265,8 +265,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa 6 .pipe(util.stripSourceMappingURL()) 7 .pipe(jsFilter.restore); 8 9 + - const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; 10 - const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); 11 12 let web = []; 13 if (type === 'reh-web') { 14 + @@ -284,7 +282,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa 15 license, 16 sources, 17 deps, ··· 19 ...web 20 ); 21 22 + @@ -382,7 +379,6 @@ function tweakProductForServerWeb(product) { 23 const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; 24 25 const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( 26 + - gulp.task(`node-${platform}-${arch}`), 27 util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), 28 packageTask(type, platform, arch, sourceFolderName, destinationFolderName) 29 ));