Jan Tojnar d910a8b8a5 Merge branch 'staging-next' into staging ... ; Conflicts: ; pkgs/data/icons/zafiro-icons/default.nix		2022-07-07 14:24:09 +02:00
..
applications	Merge branch 'staging-next' into staging	2022-07-07 14:24:09 +02:00
build-support	Merge pull request #179801 from hercules-ci/fix-footgun-dockerTools-buildImage-contents	2022-07-07 09:51:41 +02:00
common-updater
data	Merge branch 'staging-next' into staging	2022-07-07 14:24:09 +02:00
desktops	mate.caja: 1.26.0 -> 1.26.1	2022-07-07 08:16:39 +00:00
development	Merge branch 'staging-next' into staging	2022-07-07 14:24:09 +02:00
games	Merge pull request #180380 from atemp/emp_ddnet_16.2	2022-07-06 17:40:17 -03:00
misc	Merge pull request #180066 from helsinki-systems/rem/nodejs-12_x	2022-07-06 23:09:28 +02:00
os-specific	Merge master into staging-next	2022-07-06 12:01:31 +00:00
pkgs-lib
servers	Merge pull request #180066 from helsinki-systems/rem/nodejs-12_x	2022-07-06 23:09:28 +02:00
shells	oil: 0.10.1 -> 0.11.0 (#179637)	2022-07-05 16:46:40 -04:00
stdenv	stdenv: start deprecating non-list mesonFlags	2022-07-06 15:23:20 +03:00
test	Merge pull request #178869 from Artturin/curlies	2022-07-06 17:30:45 +03:00
tools	Merge branch 'staging-next' into staging	2022-07-07 14:24:09 +02:00
top-level	Merge branch 'staging-next' into staging	2022-07-07 14:24:09 +02:00