Merge pull request #2774 from CodeBlock/screenfetch

add screenfetch
Merge pull request #2773 from ederoyd46/master

Added goaccess package
Merge pull request #2751 from jwiegley/newhask2

Add three more Haskell expressions
Merge pull request #2765 from hrdinka/haskell-GLUtil

haskell-glutil: add version 0.7.4
Updating syncthing to 0.8.11.
ncmpc: another attempt to fix linkage on darwin
Add TeamSpeak 3 server & service module (close #2056)

Conflicts (trivial):
	lib/maintainers.nix
	nixos/modules/misc/ids.nix
Merge pull request #2756 from jwiegley/machines

Add Haskell expression for machines
Merge pull request #2755 from jwiegley/yesod-bin

Wrap yesod-bin so that yesod devel works with Nix
Correctly locate Haddocks in hoogle-local expression

On some versions of GHC, documentation is at, for example:

    LIB/share/doc/

In others, it is at:

    LIB/share/doc/x86_64-darwin-ghc7.6.3/

This change will pick up documentation first from the second location, then
from the first.
Merge pull request #2754 from jwiegley/lhfix

Fix to local Hoogle expression
Add expression for building crafty and craftyFull
Merge pull request #2753 from jwiegley/chessdb

Add expression for ChessDB
Merge pull request #2772 from Fuuzetsu/tibia

tibia: 10.41
mono: fix libgdiplus finding
Merge #2030: add openra game (C&C RTS engine)

Modifications from @vcunat, who tried Dune,
but it typically segfaults in mono after a few minutes
(IMHO unlikely to be a problem with packaging it).
Merge pull request #2752 from jwiegley/crafty

Add expression for building crafty and craftyFull
Add grafana, A Graphite & InfluxDB Dashboard and Graph Editor
handbrake: disable unfree faac, as it doesn't build with it
Merge #2487: add handbrake and update/patch dependents