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
nodejs: Update to 0.10.30
teamspeak_client: 3.0.13.1 -> 3.0.16
Fix default icon location in 'wrapFirefox'
tigervnc: upgrade to 1.3.1 security release

The source is on github archive now. Therefore switch to fetchurl.
flexget: Updated to 1.2.161, with additional dependancies added.
Also made deluge plugin support conditional on deluge being installed,
and added similar conditional support for the transmission plugin.
Vim-plugins: add vim-pathogen
mailutils: fix for sendmail path
Merge remote-tracking branch 'upstream/master'
Added implicit and storableEndian to haskellPackages for ImplicitCAD
add the Haskell algebra library
update Algebra to v4.1
cabal.mkDerivation: Use defaultMain if no Setup.{l,}hs exists.

This mirrors the default behaviour of cabal-install for the Simple build type
coq_HEAD: 8.5pre-fff9e2f7 -> 8.5pre-8bc01590
texlive: Fix build for users of Mavericks
haskell-aeson: Add version 0.7.0.6