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

..

default.nix

Merge remote-tracking branch 'origin/staging-next' into staging

2024-07-11 01:06:28 +02:00

fix-bubblewrap-paths.patch

…