diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/vscode')
4 files changed, 31 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index c51a86f888e4..1729256670c3 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -31,12 +31,12 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; in -vscode-utils.buildVscodeMarketplaceExtension rec { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.11.0"; - sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d"; + version = "1.17.3"; + sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg="; arch = "linux-x64"; }; diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 0b30d44908d8..1742c1e0a0af 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -15,11 +15,7 @@ , executableName, longName, shortName, pname, updateScript , dontFixup ? false , rev ? null, vscodeServer ? null - -# sourceExecutableName is the name of the binary in the source archive, over -# which we have no control , sourceExecutableName ? executableName - , useVSCodeRipgrep ? false , ripgrep }: @@ -73,7 +69,7 @@ let buildInputs = [ libsecret libXScrnSaver libxshmfence ] ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ]; + runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ @@ -115,9 +111,6 @@ let # The credentials should be stored in a secure keychain already, so the benefit of this is questionable # in the first place. rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt - - # Unbundle libglvnd as VSCode doesn't include libGLESv2.so.2 which is necessary for GPU acceleration - rm -rf $out/lib/vscode/libGLESv2.so '') + '' runHook postInstall ''; @@ -126,7 +119,6 @@ let gappsWrapperArgs+=( # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) @@ -161,6 +153,10 @@ let chmod +x ${vscodeRipgrep} ''); + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} + ''; + inherit meta; }; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 95123502295e..b1f0451cc174 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -5,6 +5,12 @@ , nixosTests , srcOnly , isInsiders ? false +# sourceExecutableName is the name of the binary in the source archive over +# which we have no control and it is needed to run the insider version as +# documented in https://nixos.wiki/wiki/Visual_Studio_Code#Insiders_Build +# On MacOS the insider binary is still called code instead of code-insiders as +# of 2023-08-06. +, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders" , commandLineArgs ? "" , useVSCodeRipgrep ? stdenv.isDarwin }: @@ -24,26 +30,26 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hc1pfrhmdydwgyz3mjp45nmzs101iffam7ciximqmnhf1s1x4qf"; - x86_64-darwin = "1snrr4lsa5qdpdl80wx8ymxp8h1bhd5ablhcgkhzvmj5dh7jrywk"; - aarch64-linux = "0pm5znbjm79ziwdx37cc75qnbf0jv3yrm2xg7cykavn43gz97abw"; - aarch64-darwin = "0bq5hvgv228x7vby4475cc65g24kpv9kvj06p6c0y6a2a79j45by"; - armv7l-linux = "11gxpqflakp4cwzkpqrwsd6m5fls1vnaigppc4bq9flfknwkjfrx"; + x86_64-linux = "0j3lmyj77qalhn8hrgfg3zgw6jqv8rscfy16vhkl0ir2xnmb19jf"; + x86_64-darwin = "06dx8lhw1cqignv06pcjjv8v743kr8bck1iqgl1881jmqyhggi4f"; + aarch64-linux = "0nyd452wcp5qw2cx1zj89v4fgk3jvbk3hhiix9a0gv150q48vyfa"; + aarch64-darwin = "1yfbsfnkjbf99yl1dcflpyxppa9mhnxigyyplz0jaqgpwmhs2s0b"; + armv7l-linux = "1miz95rz2fdw7xplflnydzq57hnz894xg29mhpywwiib8kypfrm7"; }.${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.81.0"; - pname = "vscode"; + version = "1.81.1"; + pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "6445d93c81ebe42c4cbd7a60712e0b17d9463e97"; + rev = "6c3e3dba23e8fadc360aed75ce363ba185c49794"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders"; - inherit commandLineArgs useVSCodeRipgrep; + inherit commandLineArgs useVSCodeRipgrep sourceExecutableName; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; @@ -62,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "07x9lmkyhra4hplsgdhh97dixsx92i7lab5z5ihs2wqvvzl69ah2"; + sha256 = "1xfyl81d5l2bl7k4vz4rnj84j1ijwv90sqgv9lnqzza2dfckfd6m"; }; }; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 45db0854edae..f714e709f69b 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0dynpi8l2102z8kbzgdm8qwbpzm7jxjqvz8a3x0vsikxbfwhsdmy"; - x86_64-darwin = "1z3vzwgcjj57xrw8mklhsdr8n9214rb4vj6jfnqv5nxpdgx4dw55"; - aarch64-linux = "0jiwp6i9q8c87pfkhvj45viqi2m5x5aq94skrvxa8wjbkyafvm1d"; - aarch64-darwin = "1as6zfrv2jymxspmc3m453vs61b7y1lh5qh34xr0ps8c4h6dbjas"; - armv7l-linux = "17yd3bb4z99q4r0d91grifrbr50wln1fkz0bjp4s4snqnj9q9gfk"; + x86_64-linux = "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6"; + x86_64-darwin = "1avq0xlhsnxf6yfay1czi0rc0hy47ahj25rg07mzgb274p4x9q95"; + aarch64-linux = "1chdcy59w4zm27ga71iph7yqq88lv2rw73br1nmmjznbqgzk9lpc"; + aarch64-darwin = "140lrka50yqqd9dp9gb93jlc2zn2fjiq9palibwvgb14nzsb3x68"; + armv7l-linux = "0qf95nxy55f9m2z91fykwjgffj7wqvlqjn2d2xnfapa457v5lbir"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.80.2.23209"; + version = "1.81.1.23222"; pname = "vscodium"; executableName = "codium"; @@ -61,7 +61,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ synthetica turion bobby285271 ]; + maintainers = with maintainers; [ synthetica bobby285271 ]; mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; |