nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 04:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167166 from emilytrau/openvscode-server-1.66.0

Browse Source 
openvscode-server: 1.62.3 -> 1.66.0
This commit is contained in:
Sandro 2022-05-03 00:14:07 +02:00 committed by GitHub
commit d498f89548
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/servers/openvscode-server/default.nix
View File

@ -13,7 +13,8 @@ let
vsBuildTarget = { vsBuildTarget = {
x86_64-linux = "linux-x64"; x86_64-linux = "linux-x64";
aarch64-linux = "linux-arm64"; aarch64-linux = "linux-arm64";
x86_64-darwin = "darwin"; x86_64-darwin = "darwin-x64";
aarch64-darwin = "darwin-arm64";
}.${system} or (throw "Unsupported system ${system}"); }.${system} or (throw "Unsupported system ${system}");
# replaces esbuild's download script with a binary from nixpkgs # replaces esbuild's download script with a binary from nixpkgs
@ -26,13 +27,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "openvscode-server"; pname = "openvscode-server";
version = "1.62.3"; version = "1.66.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gitpod-io"; owner = "gitpod-io";
repo = "openvscode-server"; repo = "openvscode-server";
rev = "openvscode-server-v${version}"; rev = "openvscode-server-v${version}";
sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j"; sha256 = "g5QaxZDVXvE/vOe2BjBXlqYLGZ2EG4nTKdUlLdt8H8A=";
}; };
yarnCache = stdenv.mkDerivation { yarnCache = stdenv.mkDerivation {
@ -55,7 +56,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk"; outputHash = "sha256-BeVJsruiRLReGMwThfcEm/ez4UFcr0oI4wwevJwxt58=";
}; };
# Extract the Node.js source code which is used to compile packages with # Extract the Node.js source code which is used to compile packages with
@ -123,7 +124,7 @@ in stdenv.mkDerivation rec {
patchShebangs ./remote/node_modules patchShebangs ./remote/node_modules
# put ripgrep binary into bin so postinstall does not try to download it # put ripgrep binary into bin so postinstall does not try to download it
find -name vscode-ripgrep -type d \ find -path "*@vscode/ripgrep" -type d \
-execdir mkdir -p {}/bin \; \ -execdir mkdir -p {}/bin \; \
-execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
@ -150,13 +151,9 @@ in stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/libexec mkdir -p $out
cp -R -T ../vscode-reh-web-${vsBuildTarget} $out
cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec" ln -s ${nodejs}/bin/node $out
ln -s ${nodejs}/bin/node $out/libexec
makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server"
''; '';
meta = with lib; { meta = with lib; {
@ -167,7 +164,7 @@ in stdenv.mkDerivation rec {
''; '';
homepage = "https://github.com/gitpod-io/openvscode-server"; homepage = "https://github.com/gitpod-io/openvscode-server";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ dguenther ghuntley ]; maintainers = with maintainers; [ dguenther ghuntley emilytrau ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
}; };
} }

16
pkgs/servers/openvscode-server/remove-node-download.patch
View File

@ -1,15 +1,17 @@
--- ./build/gulpfile.reh.js diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+++ ./build/gulpfile.reh.js index a44941a1e73..5fc924cb367 100644
@@ -277,8 +277,6 @@ --- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -265,8 +265,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
.pipe(util.stripSourceMappingURL()) .pipe(util.stripSourceMappingURL())
.pipe(jsFilter.restore); .pipe(jsFilter.restore);
- const nodePath = `.build/node/v${nodeVersion}/${platform}-${platform === 'darwin' ? 'x64' : arch}`; - const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;
- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); - const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
let web = []; let web = [];
if (type === 'reh-web') { if (type === 'reh-web') {
@@ -296,7 +294,6 @@ @@ -284,7 +282,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
license, license,
sources, sources,
deps, deps,
@ -17,11 +19,11 @@
...web ...web
); );
@@ -376,7 +373,6 @@ @@ -382,7 +379,6 @@ function tweakProductForServerWeb(product) {
const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
- gulp.task(`node-${platform}-${platform === 'darwin' ? 'x64' : arch}`), - gulp.task(`node-${platform}-${arch}`),
util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
packageTask(type, platform, arch, sourceFolderName, destinationFolderName) packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
)); ));