Tuomas Tynkkynen 8c4aeb1780 Merge staging into master ... Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix		2016-09-01 13:27:27 +03:00
..
admin
archivers
audio
backup
bluetooth
bootloaders/refind
cd-dvd
compression
filesystems	Merge staging into master	2016-09-01 13:27:27 +03:00
graphics	Merge staging into master	2016-09-01 13:27:27 +03:00
inputmethods
misc	Merge staging into master	2016-09-01 13:27:27 +03:00
networking	Merge staging into master	2016-09-01 13:27:27 +03:00
package-management	Merge staging into master	2016-09-01 13:27:27 +03:00
security	Merge staging into master	2016-09-01 13:27:27 +03:00
system	Merge staging into master	2016-09-01 13:27:27 +03:00
text
typesetting
video
virtualization
X11