vscode: 1.99.3 -> 1.100.1 (#406642)
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
wayland,
|
||||
libglvnd,
|
||||
libkrb5,
|
||||
openssl,
|
||||
|
||||
# Populate passthru.tests
|
||||
tests,
|
||||
@@ -51,6 +52,7 @@
|
||||
sourceExecutableName ? executableName,
|
||||
useVSCodeRipgrep ? false,
|
||||
ripgrep,
|
||||
hasVsceSign ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (
|
||||
@@ -233,6 +235,11 @@ stdenv.mkDerivation (
|
||||
dontConfigure = true;
|
||||
noDumpEnvVars = true;
|
||||
|
||||
stripExclude = lib.optional hasVsceSign [
|
||||
# vsce-sign is a single executable application built with Node.js, and it becomes non-functional if stripped
|
||||
"lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign"
|
||||
];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
@@ -324,13 +331,20 @@ stdenv.mkDerivation (
|
||||
''
|
||||
);
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf \
|
||||
--add-needed ${libglvnd}/lib/libGLESv2.so.2 \
|
||||
--add-needed ${libglvnd}/lib/libGL.so.1 \
|
||||
--add-needed ${libglvnd}/lib/libEGL.so.1 \
|
||||
$out/lib/${libraryName}/${executableName}
|
||||
'';
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
''
|
||||
patchelf \
|
||||
--add-needed ${libglvnd}/lib/libGLESv2.so.2 \
|
||||
--add-needed ${libglvnd}/lib/libGL.so.1 \
|
||||
--add-needed ${libglvnd}/lib/libEGL.so.1 \
|
||||
$out/lib/${libraryName}/${executableName}
|
||||
''
|
||||
+ (lib.optionalString hasVsceSign ''
|
||||
patchelf \
|
||||
--add-needed ${lib.getLib openssl}/lib/libssl.so \
|
||||
$out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign
|
||||
'')
|
||||
);
|
||||
|
||||
inherit meta;
|
||||
}
|
||||
|
||||
@@ -36,22 +36,22 @@ let
|
||||
|
||||
sha256 =
|
||||
{
|
||||
x86_64-linux = "0d9qfifxslwkyv9v42y2h7nbqndq5w16z08qar4vly1hnjnmzzxl";
|
||||
x86_64-darwin = "1yyfkgif0nyhgb28wn1wmdq9wyzxybgdfp8j9nknh0nmvmf1r9w6";
|
||||
aarch64-linux = "05xj9fswgf24l9mx98hcapzq90820dwwp9mskbbzai3kxy915yqx";
|
||||
aarch64-darwin = "0a41szz9gljf31pq5czqwiyrxms5cf1x1058rsacaihvx8vn38ya";
|
||||
armv7l-linux = "0iq3y8vj4gm20bxkcrsrnb3g0nf5lg5mpb1bxrg2cy4dgaxjl170";
|
||||
x86_64-linux = "07q8vym10qz91wxn8g7ysksqraj6dr2csyxiclc514k2ifvjh7rx";
|
||||
x86_64-darwin = "068ylhrx4sf7ypynmd17kxrgnjiza7qp5bz63m75vz61vqy655f7";
|
||||
aarch64-linux = "1pl30h3vxsms1xdqvcgsqcl7isc5fz4sxvdy3iml45mg78809hj5";
|
||||
aarch64-darwin = "05das18ks3m4kjq612vwn50sl7sb1mgfjdvzshh662z2spqs6ncb";
|
||||
armv7l-linux = "1xbhkak6gipras6mngsyxnq7k6702dccmqp8az5nig45l54rxfm9";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.99.3";
|
||||
version = "1.100.1";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "17baf841131aa23349f217ca7c570c76ee87b957";
|
||||
rev = "91fa95bccb027ece6a968589bb1d662fa9c8e170";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "02b2hbdhambi4viyxsxsdayj294g45i49n5yj828nwigw71asysv";
|
||||
sha256 = "1jwy61nypha77iq8mwp2c8jmfxic61m9rkq3p3sjh2i442n0lnwq";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
@@ -89,6 +89,8 @@ callPackage ./generic.nix rec {
|
||||
# See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information.
|
||||
dontFixup = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
hasVsceSign = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Open source source code editor developed by Microsoft for Windows,
|
||||
|
||||
Reference in New Issue
Block a user