Merge branch 'master' of git://github.com/soenkehahn/nixpkgs

Update haskell-wai and haskell-warp
Add nvidia-texture-tools.
Add Gloox.
Add 0 A.D.
syncthing: update from 0.8.11 to 0.8.15
pypy: correctly bump the version
chromium: Update beta channel to v36.0.1985.84.

Tested and successfully built on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
The folder $url/steam/archive seems to be empty...

Changed the URLs to the packages over to the steam folder inside <code>pool/steam/s/steam</code>. If the archive folder has been repopulated the next 24hrs ignore this.
haskellPackages.authenticateOauth: Update to 1.5
release-python: heavily reduce list of built packages
php-packages: add zmq
haskell-hedis: re-generate with cabal2nix
haskell-snaplet-redis: re-generate with cabal2nix
ShellCheck: re-generate with cabal2nix
haskell-BoundedChan: update to version 1.0.3.0
Update zotero 4.0.20 -> 4.0.21.1
haskell-compdata: update to version 0.8.1.2
haskell-distributed-static: update to version 0.3.0.0
haskell-fay: update to version 0.20.1.0
haskell-foldl: update to version 1.0.5