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
..
altcoins	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
audio	treewide: Use explicit 'dev' references to glibc	2016-08-30 03:11:09 +03:00
backup	treewide: Use more makeLibraryPath	2016-08-23 02:56:12 +03:00
display-managers	sddm: run phase hooks	2016-06-09 12:39:02 -05:00
editors	melpaStablePackages 2016-08-31	2016-08-31 17:27:06 -05:00
gis	qgis: 2.16.1 -> 2.16.2	2016-08-30 15:10:07 +02:00
graphics	treewide: Shuffle outputs	2016-08-29 14:49:51 +03:00
inferno	Use general hardening flag toggle lists	2016-03-05 18:55:26 +01:00
misc	Merge staging into master	2016-09-01 13:27:27 +03:00
networking	enableParallelBuild -> enableParallelBuilding	2016-09-01 10:46:47 +02:00
office	libreoffice: remove a flaky test on i686	2016-08-29 18:29:12 +02:00
science	Merge staging into master	2016-09-01 13:27:27 +03:00
search	Remove pycairo from top-level	2016-08-14 13:52:42 +02:00
taxes
version-management	treewide: Fix dev references to libxml2	2016-08-30 03:02:32 +03:00
video	mkvtoolnix: 9.3.1 -> 9.4.0	2016-08-30 10:24:06 -03:00
virtualization	Merge staging into master	2016-09-01 13:27:27 +03:00
window-managers	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00