Merge pull request #3998 from bobvanderlinden/libfreefare

added libfreefare
Export options.json & options.xml for building tools for NixOS.
Annotate option-set options with the file in which they are declared.

This modification improves NixOS manual by listing in which file, each
submodule option is declared.  This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
Merge options having the submodule type.

Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type.  If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.

In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
Merge pull request #3811 from nbp/options-json

Export the list of options to XML & JSON, such that external tools can use it.
Merge pull request #3856 from nbp/submodule-declarations

Annotate option-set options with the file in which they are declared.
Replace environment.profileVariables by environment.profileRelativeEnvVars
Remove types.functionTo.
mpi4py: Disable for Python3 and PyPy

Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.

[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
Merge pull request #3866 from nbp/remove-functionTo-type

Remove types.functionTo
Update version of 'lua' and 'lua5' attributes to lua 5.2.

@vcunat kindly pointed out that earlier versions are vulnerable to
CVE-2014-5461. There remain a whole lot of packages that have hard-coded
use of version 5.1, unfortunately.
Merge pull request #4001 from aherrmann/pr_mpi

mpi4py: Disable for Python3 and PyPy
highlight: update to version 3.18 to fix build errors with Lua 5.2
Merge remote-tracking branch 'origin/staging'

Conflicts:
	pkgs/applications/version-management/subversion/default.nix
Do not assert absolute path for nodev grub device. Closes #3996
haskellPackages.twitterConduit: Update to 0.0.5.8 and remove 'broken' flag
Fix Nixpkgs evaluation

error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
Typo
gradm: Update from 3.0-201405281853 -> 3.0-201408301734
paxctl: Update from 0.8 -> 0.9