Jonathan Ringer c1f8a15dac Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2105.xml pkgs/tools/security/sequoia/default.nix		2021-05-19 10:39:54 -07:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
common-updater
data	Merge pull request #123629 from dasj19/adwaita-qt-update	2021-05-19 14:39:56 +02:00
desktops	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
games	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
shells	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
stdenv	stdenv/darwin: add bootstrap tools for aarch64-darwin	2021-05-18 21:34:57 +02:00
test	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-19 10:39:54 -07:00