haskellPackages.digestiveFunctorsAeson: Update to 1.1.9
Jailbreak haskellPackages.websockets

This is needed until https://github.com/jaspervdj/websockets/issues/71
is resolved.
Jailbreak haskellPackages.fb

This is necessary until https://github.com/meteficha/fb/issues/24 is
resolved.
haskellPackages.jsonAssertions: Update to 1.0.3
Added cuda6 compiler as package cudatoolkit6.
Wrap haddock 2.10+ to find GHC packages
Wrap ghc-modi to find GHC packages
agda: fix dependency on more recent 'binary'
idris: fix dependency on older 'parsers'
agda-stdlib: no need to jailbreak anymore
tweak
Merge pull request #3016 from danielzinn/add_cuda_6

Added cuda6 compiler as package cudatoolkit6.
Add missing dependency to gtk-vnc
alsa-plugins: upgrade to 1.0.28

adding libogg as dependency should fix the build
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