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
..
documentation	man-pages: Don't have a separate docdev output	2016-09-01 10:57:25 +02:00
fonts	Merge staging into master	2016-09-01 13:27:27 +03:00
icons	numix-icon-theme-circle: 2016-05-25 -> 2016-06-10	2016-06-13 10:03:24 +02:00
misc	poppler_data: install pkgconfig files	2016-08-18 16:09:34 +03:00
sgml+xml	docbook_xml_dtd_*: Add meta.platforms	2016-08-28 18:04:09 +03:00
soundfonts/fluid