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
..
aliases.nix	foomatic-filters: align attrname with pkgname	2016-08-26 08:45:16 +02:00
all-packages.nix	Merge staging into master	2016-09-01 13:27:27 +03:00
default.nix
dotnet-packages.nix	dotnetPackages.GitVersionTree: init at 2013-10-01	2016-08-19 18:28:03 +01:00
emacs-packages.nix	Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"	2016-08-19 15:09:41 -05:00
emscripten-packages.nix
guile-2-test.nix	Revert "lsh: remove last references"	2016-08-23 15:31:33 +00:00
haskell-packages.nix	haskell.compiler.ghcHEAD: update to latest upstream (20160826).	2016-08-26 21:15:04 +02:00
impure.nix
lua-packages.nix	treewide: Use explicit 'dev' references to glibc	2016-08-30 03:11:09 +03:00
make-tarball.nix
metrics.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix	perlPackages.FileMimeInfo: 0.23 -> 0.27	2016-08-28 23:42:05 +01:00
php-packages.nix	treewide: Make explicit that 'dev' output of imagemagick is used	2016-08-23 03:52:06 +03:00
platforms.nix
pure-packages.nix
python-packages.nix	fixup	2016-09-01 12:03:10 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix	Fix #4210: Remove builderDefs	2016-08-31 11:34:46 +02:00
release.nix	release.nix: tiny improvements on top of #18059	2016-08-28 18:18:44 +02:00
rust-packages.nix	rust registry: 2016-08-10 -> 2016-08-23	2016-08-23 21:25:27 +02:00
stdenv.nix