diff options
Diffstat (limited to 'pkgs/servers/openvscode-server/default.nix')
-rw-r--r-- | pkgs/servers/openvscode-server/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 4953ac8592c28..e4f558c790b2b 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs-14_x, libsecret, xorg, ripgrep +, esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-14_x; + nodejs = nodejs-16_x-openssl_1_1; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.69.2"; + version = "1.73.1"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "e2vEEZg2H37oFRN+0kZnWW5RU2ma2JJR66XLFDNEOXc="; + sha256 = "DZWAzNRRRZ/eElwRGvSK7TxstKK6X1Tj+uAxD4SOScQ="; }; yarnCache = stdenv.mkDerivation { @@ -56,16 +56,9 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-5wOR7rKzGLE8EAlGd4CkrFUsUOEJOdwuNWQzEdbAL+g="; + outputHash = "sha256-7UBXigQj7c+fuHPIM5BbRe02DuL+cs6VbQ/D84Yk8i4="; }; - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - nativeBuildInputs = [ nodejs yarn' python3 pkg-config makeWrapper git jq moreutils ]; @@ -102,9 +95,9 @@ in stdenv.mkDerivation rec { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" - '' + lib.optionalString stdenv.isLinux '' + # set nodedir, so we can build binaries later - npm config set nodedir "${nodeSources}" + npm config set nodedir "${nodejs}" ''; buildPhase = '' |