diff options
author | Shadaj Laddad <shadaj@users.noreply.github.com> | 2023-02-02 23:04:56 -0800 |
---|---|---|
committer | Shadaj Laddad <shadaj@users.noreply.github.com> | 2023-02-03 10:49:07 -0800 |
commit | 2021045e4ccdf8b0d9c78dec3548f1540826d6b7 (patch) | |
tree | d0257183de7564572e8f5256a3927895f63f0a08 /pkgs/servers/openvscode-server | |
parent | 89fae351e4a69b429182e6ffdd348202dd28522e (diff) |
openvscode-server: 1.73.1 -> 1.74.3
Diffstat (limited to 'pkgs/servers/openvscode-server')
-rw-r--r-- | pkgs/servers/openvscode-server/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index e6e7130e3fdb6..1253a6ef8fc3c 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep +, esbuild, nodejs-16_x, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x-openssl_1_1; + nodejs = nodejs-16_x; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; @@ -40,19 +40,19 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.73.1"; + version = "1.74.3"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "DZWAzNRRRZ/eElwRGvSK7TxstKK6X1Tj+uAxD4SOScQ="; + sha256 = "2+/5I0dpQsmoWA7Q0dCgPO85dkOKQWHeO34cueH4sjQ="; }; yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - nativeBuildInputs = [ cacert yarn git ]; + nativeBuildInputs = [ cacert yarn' git ]; buildPhase = '' export HOME=$PWD @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-7UBXigQj7c+fuHPIM5BbRe02DuL+cs6VbQ/D84Yk8i4="; + outputHash = "sha256-4B/ESi4lM2p+pY0dfUKWgwmYkwqPYaNuCLJ99ByjwWE="; }; nativeBuildInputs = [ @@ -142,6 +142,8 @@ in stdenv.mkDerivation rec { jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json popd '' + '' + export NODE_OPTIONS=--openssl-legacy-provider + # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts |