Jonathan Ringer d1d37feb6d Merge branch 'master' into staging-next ... Conflicts: pkgs/servers/x11/xorg/default.nix		2021-06-15 19:32:36 -07:00
..
applications	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
build-support	Merge master into staging-next	2021-06-14 00:08:48 +00:00
common-updater
data	Merge pull request #125663 from Vonfry/update/emacs-all-the-icons	2021-06-15 12:52:42 +02:00
desktops	Merge pull request #126851 from musfay/xfce.xfce4-settings-4.16.2	2021-06-16 03:03:08 +02:00
development	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
games	Merge branch 'master' into staging-next	2021-06-15 11:19:41 +02:00
misc	Merge pull request #125890 from mweinelt/brother-mfc9140cdn	2021-06-16 00:42:18 +02:00
os-specific	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
shells	Merge pull request #126720 from fortuneteller2k/hilbish	2021-06-15 21:41:24 +02:00
stdenv	darwin: expose bootstrapLlvmVersion as argument in the stdenv	2021-06-13 17:32:06 +02:00
test
tools	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
top-level	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00