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
..
darwin	darwin binutils: Fix binutils-raw output references	2016-08-30 02:57:43 +03:00
gnu	Fix lots of fetchgit hashes (fallout from #15469)	2016-06-03 17:17:08 +03:00
linux	Merge staging into master	2016-09-01 13:27:27 +03:00
windows	mingw: update 3.1.0 -> 4.0.6	2016-04-21 13:38:20 +02:00