mbox does not support i686
Merge pull request #4755 from ehmry/mbox

mbox does not support i686
postgresql 9.4beta3, but keep beta2 around because they are not compatible
nixos/nat: Fix override so that sysctls are properly preserved
easytag: update from 2.2.4 to 2.3.1

Also cleanup: preConfigure seems to not be necessary, gtk2 support was
dropped, wrapping done so it doesn't crash at startup and icon theme
pulled in.
tibia: update to 10.61
python: 3.2.5 -> 3.2.6
python: 3.3.5 -> 3.3.6
Upgrade Coq
Momentary hack to git-annex to allow it to build
Changes for Hakyll so that it can build
Apply patch for Pango on Yosemite
verasco: new expression
Merge remote-tracking branch 'origin/master' into test
Merge branch 'master' of github.com:joelteon/nixpkgs into new-darwin