Unverified Commit 85b00a0e authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #232280 from K900/vscode-1.78.2 

VSCode, VSCodium 1.78.2 + cleanups
parents 2981e3cb 72ffc999

pkgs/applications/editors/vscode/generic.nix

+0 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
}:



let

  inherit (stdenv.hostPlatform) system;

  unwrapped = stdenv.mkDerivation {



    inherit pname version src sourceRoot dontFixup;
@@ -135,9 +134,6 @@ let 


      # this fixes bundled ripgrep

      chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg

    '' + lib.optionalString (lib.versionOlder version "1.78.0" && stdenv.isLinux) ''

      # see https://github.com/gentoo/gentoo/commit/4da5959

      chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper

    '';



    inherit meta;

pkgs/applications/editors/vscode/update-vscodium.sh

+0 −2
Original line number Diff line number Diff line
@@ -36,5 +36,3 @@ update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip 
update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz



update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip
 


update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz

pkgs/applications/editors/vscode/vscode.nix

+6 −6
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ let 
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";



  sha256 = {

    x86_64-linux = "11ibgnpcs0qvirgjnk799zkb63zp0nbc8y636l5g9nay6jm8lr8s";

    x86_64-darwin = "0wg2xbvg3v20w4dh9vf27xcf95r5dv2l118vxxjfz2chfxmkk1qw";

    aarch64-linux = "1gff1ildisczwb0dx7a0jvhj8rgn60n93rzcj1d7lihkgd00zjg6";

    aarch64-darwin = "1zmfg1lv6izv1dmhawmnjs108pg99kq37pi6adyqnfw9yssn0ar5";

    armv7l-linux = "10gr9p5vf0wcc9dgyc79p20vip12ja15qas4i3kwdp9lp4hzh1ss";

    x86_64-linux = "0kir1grd150gb7im6yx2l16hi43wwsi8q3dlpgah4m7na064xgyd";

    x86_64-darwin = "1fw73483ja4zav8xd0j03ygib5zbviy3kd02jzmgbbbsac5li96m";

    aarch64-linux = "1w0dxpvrj06m1d15q45xi4sl4g3fk0nf04vh2ar956lg67dqj7i6";

    aarch64-darwin = "0i5vj3km6wkdc2mrks2rjbqbn1isg4l4ss6zs7qfra3zcj62bkc2";

    armv7l-linux = "1jx8cz43ac35as414mxsj9abpkr4a7v10fg1msjy2ykcrzv9v3dr";

  }.${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.78.0";

    version = "1.78.2";

    pname = "vscode";



    executableName = "code" + lib.optionalString isInsiders "-insiders";

pkgs/applications/editors/vscode/vscodium.nix

+5 −6
Original line number Diff line number Diff line
@@ -15,11 +15,10 @@ let 
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";



  sha256 = {

    x86_64-linux = "049vn3gwwl0sxf8hvd8raaamy9f0x2z9p3sz8xzafa1h129iiybr";

    x86_64-darwin = "1gbpbi3b0ag6v9znm02amvp35j05kpxs2mfsdq6dwmvg3hxmff2f";

    aarch64-linux = "14pvsrpl7rsjvni7n2ch7wmvgpj9n8mwla7s7mlmi7wv46ykpk2a";

    aarch64-darwin = "1x5bw928yp4fb57bc3qff46w7020zlyp1mfpm7vakjfaqnfwzzzn";

    armv7l-linux = "0xliai5c3dd6qbgb9agvmn18n230zh4qxx3jjmaqn2851d6sx5xz";

    x86_64-linux = "0ymgy0xisfxqrrmwpy0ga2rhlzhxqq39ppjfawxaf0dfdnkhgkgr";

    x86_64-darwin = "1q5fg7cm8d4iwvx8b589aqby5vw1b66y85dxgrq6sapz9cg2pvhz";

    aarch64-linux = "13vdqbhap9qd96y5n0immlwr61v8f7yvbwc9m0qas06f30b71f3z";

    aarch64-darwin = "01dc7hv13ngr0xv2cmd2likmdc2gz0jbmgashmkm12gdrjp4q968";

  }.${system} or throwSystem;



  sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +28,7 @@ in 


    # Please backport all compatible updates to the stable release.

    # This is important for the extension ecosystem.

    version = "1.77.3.23102";

    version = "1.78.2.23132";

    pname = "vscodium";



    executableName = "codium";