Merge pull request #3231 from madjar/master

spotify: Updated to 0.9.11.26 and fixed expression
erlang: Add manpages to all release packages.

This puts manpages into "$out/lib/erlang/man" and also symlinks them
into "$out/share/man" with an "erl" suffix (similar to how Debian is
handling this) so those manpages are unlikely to collide with any other
manpages, like for example inet(3).

Closes #3396.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Moritz Ulrich <moritz@tarn-vedra.de>
nixos/tests/containers.nix: Don't ping

This randomly fails with "Destination Host Unreachable". That
shouldn't happen, since all interfaces/routes should be up after
"nixos-container start" returns. Need more investigation...
autoconf: Disable tests

These take waaaay too long.
ardour: install a desktop file

I based it on the desktop file from Arch Linux.
haskell-base-prelude: add version 0.1.3
haskell-conduit-extra: update to version 1.1.3
haskell-filestore: update to version 0.6.0.3
haskell-profunctors: update to version 4.2
haskell-stm-containers: update to version 0.1.3
haskell-wai-extra: update to version 3.0.1.1
haskell-yesod-auth: update to version 1.3.3
haskell-hlint: update to version 1.9.3
LambdaHack: disable test suite to fix build

https://github.com/LambdaHack/LambdaHack/issues/57
Revert "use wrapper to set LUA_PATH variable"

This reverts commit 807cd4b4d40813ff1d801b0b17de3c421a465b1b, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.

A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.

Conflicts:
	pkgs/development/interpreters/lua-5/5.1.nix
kernel: 3.4.98 -> 3.4.100
kernel: 3.10.48 -> 3.10.50
kernel: 3.14.12 -> 3.14.14
kernel: 3.15.5 -> 3.15.7
Merge pull request #3372 from FlorentBecker/crawl

Add dungeon crawl stone soup 0.14