Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
haskell-stm-containers: add package version 0.1.2 and its dependencies
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
vagrant: upgrade to 1.6.3
Added jmacro-*
polipo: update to 1.1.1
blaze-from-html: add version 0.3.2.1
Fix various Haskell packages for 7.8
update haskell-taggy-lens to version 0.1.2
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