Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ... Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix		2018-03-15 22:30:56 +02:00
..
admin
archivers
audio
backup
bluetooth
bootloaders/refind
cd-dvd
compression
filesystems
graphics
inputmethods
misc	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
nagstamon
networking	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
nix/info
package-management
security	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
system
text	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
typesetting	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
video
virtualization
X11