Added jmacro-*
blender: Update to 2.71
fftw: Update to 3.3.4
blender: Fix jackaudio dependency
blender: Enable ocean modifier
blender: Don't use system openjpeg

It was ignored anyway (instead using the internal openjpeg copy).
Fix virtualbox image building with new nix
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.