Martin Weinelt 176a56c40f Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: - pkgs/applications/misc/blender/default.nix - pkgs/development/web/nodejs/nodejs.nix		2024-07-11 01:06:28 +02:00
..
drivers	treewide: remove Enzime	2024-07-09 14:32:33 +10:00
cups-pk-helper.nix	pkgs/misc: remove licenses.gpl2	2024-07-03 14:24:14 +03:00
default.nix	cups: 2.4.8 -> 2.4.10	2024-06-24 13:17:02 +00:00
filters.nix	pkgs/misc: remove licenses.gpl2	2024-07-03 14:24:14 +03:00