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
..
languages-frameworks	Doc: improve python bdist_wheel fix	2016-08-30 17:16:49 +02:00
old	Fix #4210: Remove builderDefs	2016-08-31 11:34:46 +02:00
coding-conventions.xml	nixpkgs-doc: add patches to coding conventions	2016-08-06 09:05:23 +09:00
configuration.xml	nixpkgs manual: more extensible example (#15557)	2016-05-23 11:02:46 +01:00
contributing.xml	doc: make it clear the Contributing section is for the docs	2015-06-30 12:25:55 +02:00
default.nix	add epub for nixpkgs manual ( #15575 ) (#17053)	2016-07-20 17:57:31 +02:00
functions.xml	Improve overrideDerivation docs. (#16867)	2016-07-12 09:57:26 +02:00
introduction.md	nixpkgs manual introduction: improve	2016-04-05 10:06:10 +02:00
manual.xml	nixpkgs manual: cleanup (#15611)	2016-05-22 10:05:37 +01:00
meta.xml	nixpkgs manual: Fix license strings docs	2016-02-24 01:48:02 +01:00
multiple-output.xml	doc: Document changes to multiple-output conventions	2016-08-30 04:46:59 +03:00
package-notes.xml	autojump: add package note	2016-05-04 20:31:38 +01:00
quick-start.xml	hello/ex-2 -> hello	2015-09-22 20:23:23 +02:00
release-notes.xml
stdenv.xml	Merge pull request #9607 from nckx/update-doc	2016-08-31 10:02:16 +02:00
style.css
submitting-changes.xml	nixpkgs manual: more strict commit policy (close #11609)	2015-12-18 15:00:33 +01:00