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
..
tests
attrsets.nix	stdenv.mkDerivation: Use chooseDevOutputs	2016-08-29 14:49:51 +03:00
composable-derivation.nix
customisation.nix
debug.nix
default.nix
deprecated.nix
licenses.nix	lib.licenses: Fix typo in fdl13 license description (#18053)	2016-08-28 07:56:40 +00:00
lists.nix	Use builtins.partition if available	2016-08-29 17:50:06 +02:00
maintainers.nix	add maintainers	2016-08-30 12:28:13 +02:00
meta.nix
minver.nix
modules.nix	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
options.nix
platforms.nix
sandbox.nix
sources.nix
strings-with-deps.nix
strings.nix
systems.nix
tests.nix
trivial.nix
types.nix