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
composable-derivation.nix
customisation.nix
debug.nix
default.nix
deprecated.nix
licenses.nix
lists.nix
maintainers.nix
meta.nix
minver.nix
modules.nix
options.nix
platforms.nix
sandbox.nix
sources.nix
strings-with-deps.nix
strings.nix
systems.nix
tests.nix
trivial.nix
types.nix