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
..
applications	Merge staging into master	2016-09-01 13:27:27 +03:00
build-support	Merge staging into master	2016-09-01 13:27:27 +03:00
data	Merge staging into master	2016-09-01 13:27:27 +03:00
desktops
development	Merge staging into master	2016-09-01 13:27:27 +03:00
games
misc	Merge staging into master	2016-09-01 13:27:27 +03:00
os-specific	Merge staging into master	2016-09-01 13:27:27 +03:00
servers	Merge staging into master	2016-09-01 13:27:27 +03:00
shells
stdenv
test
tools	Merge staging into master	2016-09-01 13:27:27 +03:00
top-level	Merge staging into master	2016-09-01 13:27:27 +03:00