Martin Weinelt 93f4195fe0 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/applications/graphics/seamly2d/default.nix		2024-07-26 18:05:04 +02:00
..
darwin.patch	blender: un-break darwin	2024-05-07 21:32:26 +02:00
default.nix	Merge master into staging-next	2024-07-24 18:01:18 +00:00
draco.patch	blender: 4.1.1 -> 4.2.0	2024-07-16 11:40:11 -04:00
fix-include.patch
libdecor.patch	blender: 3.6.5 -> 4.0.1 (#267511)	2023-11-17 20:45:35 -05:00
test-cuda.py	blender: add CUDA discovery test	2024-06-26 00:35:42 +00:00
wrapper.nix	treewide: remove unused lib (and other) arguments	2024-07-26 11:18:09 +02:00