Jan Tojnar 91171e2955 Merge branch 'master' into staging-next ... Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.		2021-06-15 11:19:41 +02:00
..
applications	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
build-support
common-updater
data	whitesur-icon-theme: init at 2021-05-20 (#126783)	2021-06-15 03:30:36 +02:00
desktops	Merge pull request #126861 from r-ryantm/auto-update/bulky	2021-06-15 06:52:47 +02:00
development	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
games	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
misc	Merge pull request #126575 from mbrgm/cups-kyocera-ecosys-m552x-p502x	2021-06-14 20:14:55 +02:00
os-specific	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
shells	Merge pull request #126530 from mweinelt/zsh-p10k	2021-06-14 19:26:34 +02:00
stdenv
test
tools	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
top-level	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00