Jan Tojnar b8b9f52393 Merge branch 'master' into staging-next ... Conflicts: - pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0 and f6c5761935.		2022-05-21 17:52:39 +02:00
..
extensions	vscode-extensions.rust-lang.rust-analyzer: 0.2.1048 -> 0.3.1059	2022-05-21 05:04:10 -04:00
generic.nix	wrapGAppsHook: rename argument to makeWrapper	2022-05-10 22:07:56 +02:00
update-shell.nix	vscode: update the updaters!	2022-02-18 08:25:22 -03:00
update-vscode.sh	vscode: update the updaters!	2022-02-18 08:25:22 -03:00
update-vscodium.sh	vscodium: Add support for aarch64-darwin (M1)	2022-04-27 22:06:01 -04:00
vscode.nix	vscode: 1.67.0 -> 1.67.1	2022-05-11 00:23:22 +00:00
vscodium.nix	vscodium: 1.66.2 -> 1.67.1	2022-05-15 00:24:02 +00:00
with-extensions.nix	vscode: update example to match #131589	2021-08-14 20:26:44 +01:00