Merge pull request #3137 from flosse/lua5-prefix-fix

use wrapper to set LUA_PATH variable to fix #3036
Merge pull request #3155 from doublec/inferno

Add inferno, a distributed cross-platform hosted OS
Merge pull request #3127 from tailhook/myenv-name

Add `NIX_MYENV_NAME` environment variable in `myEnvFun`
dbus: DOS-security update 1.8.4 -> .6

CVE-2014-{3532,3533}
libvdpau: minor update, fix license

Suse and wikipedia classify it as MIT,
although it seems the headers in sources aren't all consistent.
Merge master into x-updates

Adds the mass-rebuilding python update.
python click-2.1
python plumbum-1.4.2
python pip-1.5.6
rust: Update to 0.11
lua: add 'lua' attribute pointing to 'lua5'
Merge pull request #3166 from tailhook/rust0.11

rust: Update to 0.11
Added snapWebRoutes to haskellPackages.
Added snapletPostgresqlSimple to haskellPackages.
Merge pull request #3168 from fluffynukeit/add-haskell-snap-web-routes

Added snapWebRoutes to haskellPackages.
Merge pull request #3169 from fluffynukeit/add-haskell-snaplet-postgresql-simple

Added snapletPostgresqlSimple to haskellPackages.
Adds biniou
mu: Bump to 0.9.9.6.
linux: Update to 3.14.10
grsecurity: Update stable and test patches

stable: 3.0-3.14.9-201406262057 -> 3.0-3.14.10-201407012152
test:   3.0-3.15.2-201406262058 -> 3.0-3.15.3-201407012153