diff options
author | Ryan Lahfa <masterancpp@gmail.com> | 2023-11-05 12:10:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-05 12:10:10 +0100 |
commit | e1301f29e0bbdcfb3bd2952f62d369dd859d63d4 (patch) | |
tree | d110303e5a9e3e37541402dfc047e9bd3986311d | |
parent | 197629b470f184a47b2a5716312d25b09454bbf8 (diff) | |
parent | aa7b68e77997576004e02e2e47e9a89288b16bbb (diff) | |
download | nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.tar nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.tar.gz nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.tar.bz2 nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.tar.lz nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.tar.xz nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.tar.zst nixlib-e1301f29e0bbdcfb3bd2952f62d369dd859d63d4.zip |
Merge pull request #261125 from shadaj/bump-openvscode-1.83
-rw-r--r-- | pkgs/servers/openvscode-server/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 43f9d7a7fe73..422ee821cd50 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -12,7 +12,9 @@ , python3 , esbuild , nodejs +, node-gyp , libsecret +, libkrb5 , xorg , ripgrep , AppKit @@ -37,12 +39,12 @@ let esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.16.17"; + version = "0.17.14"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -58,13 +60,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.79.2"; + version = "1.84.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-u5LuDcKTN4CEpRnFCeEbni6hiDDwTV9LUEmXaQYJvJw="; + hash = "sha256-kYKvJrHWKHDIqJsN0j1WFN3OBWwEyNgY5hjNHBg+kKQ="; }; yarnCache = stdenv.mkDerivation { @@ -87,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-P6mzeE3HnS/KoP7kCXJlDkFWkTKiGjJkOUXfGOru/xE="; + outputHash = "sha256-oW/JngHpXb8kscikscI7N9csSyZsZQgG75jOdWll6dw="; }; nativeBuildInputs = [ @@ -102,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ (with xorg; [ libX11 libxkbfile ]) + ++ (with xorg; [ libX11 libxkbfile libkrb5 ]) ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa @@ -140,8 +142,16 @@ stdenv.mkDerivation (finalAttrs: { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" - # set nodedir, so we can build binaries later - npm config set nodedir "${nodejs}" + # set nodedir to prevent node-gyp from downloading headers + # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + + # use updated node-gyp. fixes the following error on Darwin: + # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' + export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js runHook postConfigure ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ae04e17e699..6ff592e67fdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36345,9 +36345,10 @@ with pkgs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; openvscode-server = callPackage ../servers/openvscode-server { - nodejs = nodejs_16; + nodejs = nodejs_18; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; inherit (darwin) cctools; + inherit (nodePackages) node-gyp; }; code-server = callPackage ../servers/code-server { |