From 1030469295f031d89bc6f6ba854fab32f1190f81 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 May 2023 21:10:56 +0300 Subject: [PATCH 1/3] vscode: 1.78.0 -> 1.78.2 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ee9ac930575..d1c851c1c5fc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -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"; From 6d148248b1327c66298bfbd690f34ecc54c8264f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 May 2023 21:11:13 +0300 Subject: [PATCH 2/3] vscodium: 1.77.3.23102 -> 1.78.2.23132, drop armhf armhf was dropped upstream: https://github.com/VSCodium/vscodium/commit/7afbfe03adf1d91f0fbd9df9608bc94e350c1828 --- pkgs/applications/editors/vscode/update-vscodium.sh | 2 -- pkgs/applications/editors/vscode/vscodium.nix | 11 +++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index c7d9c1068b14..bfb171e395cb 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -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 diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 6e9cefae79e9..b2cc9d41b15f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -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"; From 72ffc9994d1f563e302c9b875fe669413f473086 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 16 May 2023 21:11:54 +0300 Subject: [PATCH 3/3] vscode: clean up generic expression now that everything is 1.78 --- pkgs/applications/editors/vscode/generic.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 8f547534cabd..a7aa4eae44f3 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -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;