Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

2 files changed, 20 insertions, 21 deletions

diff --git a/nixpkgs/pkgs/servers/openvscode-server/default.nix b/nixpkgs/pkgs/servers/openvscode-server/default.nix
index 67f525d46a07..4953ac8592c2 100644
--- a/nixpkgs/pkgs/servers/openvscode-server/default.nix
+++ b/nixpkgs/pkgs/servers/openvscode-server/default.nix
@@ -13,7 +13,8 @@ let
   vsBuildTarget = {
     x86_64-linux = "linux-x64";
     aarch64-linux = "linux-arm64";
-    x86_64-darwin = "darwin";
+    x86_64-darwin = "darwin-x64";
+    aarch64-darwin = "darwin-arm64";
   }.${system} or (throw "Unsupported system ${system}");
 
   # replaces esbuild's download script with a binary from nixpkgs
@@ -26,13 +27,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "openvscode-server";
-  version = "1.62.3";
+  version = "1.69.2";
 
   src = fetchFromGitHub {
     owner = "gitpod-io";
     repo = "openvscode-server";
     rev = "openvscode-server-v${version}";
-    sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j";
+    sha256 = "e2vEEZg2H37oFRN+0kZnWW5RU2ma2JJR66XLFDNEOXc=";
   };
 
   yarnCache = stdenv.mkDerivation {
@@ -55,7 +56,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk";
+    outputHash = "sha256-5wOR7rKzGLE8EAlGd4CkrFUsUOEJOdwuNWQzEdbAL+g=";
   };
 
   # 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
 
     # 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 ln -s ${ripgrep}/bin/rg {}/bin/rg \;
   '' + lib.optionalString stdenv.isDarwin ''
@@ -150,13 +151,9 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/libexec
-
-    cp -R -T ../vscode-reh-web-${vsBuildTarget} "$out/libexec"
-
-    ln -s ${nodejs}/bin/node $out/libexec
-
-    makeWrapper "$out/libexec/server.sh" "$out/bin/openvscode-server"
+    mkdir -p $out
+    cp -R -T ../vscode-reh-web-${vsBuildTarget} $out
+    ln -s ${nodejs}/bin/node $out
   '';
 
   meta = with lib; {
@@ -167,7 +164,7 @@ in stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/gitpod-io/openvscode-server";
     license = licenses.mit;
-    maintainers = with maintainers; [ dguenther ghuntley ];
-    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ dguenther ghuntley emilytrau ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/openvscode-server/remove-node-download.patch b/nixpkgs/pkgs/servers/openvscode-server/remove-node-download.patch
index 9262be5b293d..c53b79de019e 100644
--- a/nixpkgs/pkgs/servers/openvscode-server/remove-node-download.patch
+++ b/nixpkgs/pkgs/servers/openvscode-server/remove-node-download.patch
@@ -1,15 +1,17 @@
---- ./build/gulpfile.reh.js
-+++ ./build/gulpfile.reh.js
-@@ -277,8 +277,6 @@
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index a44941a1e73..5fc924cb367 100644
+--- 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(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 });
  
  		let web = [];
  		if (type === 'reh-web') {
-@@ -296,7 +294,6 @@
+@@ -284,7 +282,6 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  			license,
  			sources,
  			deps,
@@ -17,11 +19,11 @@
  			...web
  		);
  
-@@ -376,7 +373,6 @@
+@@ -382,7 +379,6 @@ function tweakProductForServerWeb(product) {
  			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
  
  			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)),
  				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
  			));