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	Replace ./../* with ../* in Nix expressions (#16414)	2016-06-22 10:39:50 +02:00
attrsets.nix	stdenv.mkDerivation: Use chooseDevOutputs	2016-08-29 14:49:51 +03:00
composable-derivation.nix	treewide: Make explicit that 'dev' output of curl is used	2016-05-19 10:00:29 +02:00
customisation.nix
debug.nix	debug.nix: deprecate strict	2016-06-26 02:05:45 +02:00
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	lib/sources.nix@commitIdFromGitRepo: parenthesize what should always have been	2016-08-08 11:46:41 +01:00
strings-with-deps.nix
strings.nix	getVersion: first try drv.version before parsing drv.name	2016-08-13 17:17:36 +02:00
systems.nix
tests.nix
trivial.nix	lib.{warn, info}: add simple helpers	2016-08-15 13:54:23 -04:00
types.nix	Use shell packages to select the user's shell	2016-06-12 20:35:34 +01:00