gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vscode: 1.119.0 -> 1.122.1 (#525492)

Browse Source
This commit is contained in:
K900
2026-06-02 08:28:02 +00:00
committed by GitHub
parent 1f2a077471 08a2d5fff7
commit 9ad99deda7
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vscode/generic.nix
+30 -4
View File
@@ -338,8 +338,10 @@ stdenv.mkDerivation (
# Remove native encryption code, as it derives the key from the executable path which does not work for us.
# The credentials should be stored in a secure keychain already, so the benefit of this is questionable
# in the first place.
# Also remove prebuilt Copilot binaries that seemingly have been added by accident.
+ ''
rm -rf $out/lib/${libraryName}/resources/app/node_modules/vscode-encrypt
rm -rf $out/lib/${libraryName}/resources/app/node_modules/@github/copilot-linuxmusl*
''
)
+ ''
@@ -407,14 +409,38 @@ stdenv.mkDerivation (
)
+ (
let
vscodeRipgrep =
nodeModulesPath =
if stdenv.hostPlatform.isDarwin then
if lib.versionAtLeast vscodeVersion "1.94.0" then
"Contents/Resources/app/node_modules/@vscode/ripgrep/bin/rg"
"Contents/Resources/app/node_modules"
else
"Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg"
"Contents/Resources/app/node_modules.asar.unpacked"
else
"resources/app/node_modules/@vscode/ripgrep/bin/rg";
"resources/app/node_modules";
# see https://www.npmjs.com/package/@vscode/ripgrep-universal?activeTab=code
ripgrepSystem =
{
x86_64-darwin = "darwin-x64";
aarch64-darwin = "darwin-arm64";
armv7l-linux = "linux-arm";
aarch64-linux = "linux-arm64";
i686-linux = "linux-ia32";
powerpc64-linux = "linux-ppc64";
riscv64-linux = "linux-riscv64";
s390x-linux = "linux-s390x";
x86_64-linux = "linux-x64";
}
.${stdenv.hostPlatform.system}
or (throw "Unknown system for ripgrep-universal: ${stdenv.hostPlatform.system}");
ripgrepPath =
if lib.versionAtLeast vscodeVersion "1.122.0" then
"@vscode/ripgrep-universal/bin/${ripgrepSystem}/rg"
else
"@vscode/ripgrep/bin/rg";
vscodeRipgrep = "${nodeModulesPath}/${ripgrepPath}";
in
if !useVSCodeRipgrep then
''
pkgs/applications/editors/vscode/vscode.nix
+8 -8
View File
@@ -35,17 +35,17 @@ let
hash =
{
x86_64-linux = "sha256-HcZIRGB0y8U5huxXN9jNrhMD0Jjmn+QNUU60EHGduXo=";
x86_64-darwin = "sha256-mMDxEAt/Lst4ifeczcL+QT8mVVXNk8fDNTM1YHGZ8tY=";
aarch64-linux = "sha256-o0JV1Vc6utTmJkH9uTSylBsYM3mAfiDIgwg3LUOBWb0=";
aarch64-darwin = "sha256-8ixVOUe4EcNX/z0jnux1hXOhnG1JuhbssH2BARqU80o=";
armv7l-linux = "sha256-KxrSOVCdfa4L9RlnHybwGLRciMFwC/COsctX+5nqR/c=";
x86_64-linux = "sha256-t26YN3E5XaSJ7gki8nm06hVh4ZvXDEU77M749ZrqfAo=";
x86_64-darwin = "sha256-jOnwhiDJmU+EqU30wg1+frqDDxJgfngETx414i2YTIg=";
aarch64-linux = "sha256-8sYanI12qDMPgVG7S0QKLEkU0i/SICkJ5wz/OwhP+i4=";
aarch64-darwin = "sha256-oXeZZWAvpUn5KItEOR8yX9iQ0Fp6EzXGux0jvYbZqtU=";
armv7l-linux = "sha256-16cUu1C389edf0aHxXxTLJwjxmpHxM8mv1YFnPDLgP4=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.119.0";
version = "1.122.1";
# The update server (update.code.visualstudio.com) expects the version path
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@@ -53,7 +53,7 @@ let
downloadVersion = lib.versions.pad 3 version;
# This is used for VS Code - Remote SSH test
rev = "8b640eef5a6c6089c029249d48efa5c99adf7d51";
rev = "8761a5560cfd65fdd19ce7e2bd18dab5c0a4d84e";
in
buildVscode {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -86,7 +86,7 @@ buildVscode {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
hash = "sha256-FyRpbjxY8PWr8z+ttn1H93ud4raFAJz704Vn38+LYCM=";
hash = "sha256-7n8KvIYEDYO8qqJjfbuUsgUwCxq9FJ6i/EuDBd1HQDk=";
};
stdenv = stdenvNoCC;
};