Added gcolor2
Merge branch 'master' of https://github.com/NOTtheMessiah/nixpkgs
Update default.nix
added license for gcolor2 and myself to maintainers
Merge branch 'master' of https://github.com/NOTtheMessiah/nixpkgs
Merge remote-tracking branch 'upstream/master'
Added implicit and storableEndian to haskellPackages for ImplicitCAD
haskell-bits-extras: add version 0.1.3
haskell-base32-bytestring: add version 0.2.1.0
elasticsearch: fix darwin, needs getopt
Merge pull request #3627 from Fuuzetsu/base32-bytestring

Base32 bytestring
Merge pull request #3620 from NOTtheMessiah/master

added implicit and storableEndian to haskellPackages for ImplicitCAD
haskell-ghc-heap-view: mark as broken for 7.8.3
haskell-ghc-vis: don't build on Hydra (broken dep)