Vladimír Čunát 44b36397c2 Merge branch 'master' into staging-next ... Conflicts - GitHub wouldn't auto-resolve them but my local git did: pkgs/development/cuda-modules/cuda/overrides.nix		2024-07-04 10:10:22 +02:00
..
plugins	Merge pull request #324494 from GaetanLepage/codesnap	2024-07-04 09:41:01 +02:00
cflags-prune.diff
common.nix	vim: 9.1.0412 -> 9.1.0509	2024-06-21 08:29:07 +00:00
default.nix	vim: fix build on FreeBSD cross	2024-06-07 21:22:39 -07:00
full.nix	treewide: wrapGAppsHook → wrapGAppsHook3	2024-04-27 02:23:22 +02:00
macvim-configurable.nix	macvim: fix overrides	2024-06-03 20:51:19 -07:00
macvim.nix	treewide: remove lilyball	2024-07-02 15:32:33 -04:00
macvim.patch	macvim: 8.2.3455 -> 178	2024-06-26 17:39:23 -07:00
vimacs.nix