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
Merge pull request #3620 from NOTtheMessiah/master

added implicit and storableEndian to haskellPackages for ImplicitCAD