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
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.
haskell-HaskellNet-SSL: re-generate with cabal2nix
RcmdrPlugin_ROC: remove broken package

This build goes into an endless loop and produces gigabytes of useless
output. :-(
update haskellPackages.imm to 0.6.0.2

Uses latest version of tls; builds without patching
Merge pull request #3618 from bergey/imm

update haskellPackages.imm to 0.6.0.2
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
Bump haskellPackages.hdaemonize to 0.5.0.0
Remove empty line.