diff options
Diffstat (limited to 'pkgs/servers/openvscode-server/default.nix')
-rw-r--r-- | pkgs/servers/openvscode-server/default.nix | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 67f525d46a078..99ef62210bf98 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/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.66.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j"; + sha256 = "g5QaxZDVXvE/vOe2BjBXlqYLGZ2EG4nTKdUlLdt8H8A="; }; yarnCache = stdenv.mkDerivation { @@ -55,7 +56,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk"; + outputHash = "sha256-BeVJsruiRLReGMwThfcEm/ez4UFcr0oI4wwevJwxt58="; }; # 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" ]; }; } |