Added jmacro-*
polipo: update to 1.1.1
Add haskell-simple-conduit
blaze-from-html: add version 0.3.2.1
Update haskell-simple-conduit
Fix various Haskell packages for 7.8
haskell-git-annex: corrections for darwin
haskell-djinn: corrections for darwin
update haskell-taggy-lens to version 0.1.2
haskellPackages.ekgCarbon: New expression
import Haskell template library from Hackage
Import the haskell cabal template creator, "hi" from Hackage

note: depends on template
wpa_supplicant: update 2.1 -> 2.2, drop a patch

Fixes #3238.
Revert "Update titanium node package and others"

This reverts commit 7dce55d0fd1a8d39c0156d2f05e4017931c4ca9b.
Re-generate Haskell expressions with cabal2nix.
Merge pull request #3298 from MP2E/hi_import

Import the cabal new project template creator, "hi"
Merge pull request #3297 from soenkehahn/master

update haskell-taggy-lens to version 0.1.2
Merge pull request #3294 from nilcons/haskellfixes

Fix various Haskell packages for 7.8
Merge pull request #3293 from codygman/blaze-from-html

blaze-from-html: add version 0.3.2.1
update coroutine-object 0.2 -> 0.3, xournal-parser 0.5.0.2 -> 0.5.0.3