added alock package
rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4

That commit changed the patch to work for the new HEAD, but that new
patch breaks 0.11. I made two patch for the two versions.
Quick hack to reduce Hydra memory consumption
collectd: add pidFile option, change default pid to /var/run/collectd.pid
syslog-ng module: Add package option
Added httptunnel package.
wicd: add urwid and curses to PYTHONPATH of wicd-curses
Make emulator script run without tools in path
Merge pull request #4131 from monocell/androidEmuFix

Make emulator script run without tools in path
Re-generate Haskell packages with cabal2nix.
haskell-git-annex: update to version 5.20140915
opencv: update 2.4.7 -> 2.4.9
Merge pull request #4115 from madjar/master

rustc: fixed build after 7068828389390dca066fb1062bd27148d49339d4
python-packages-generated.nix: fix lxml-2.3.6 by hardcoding the fix
python34Packages.sympy: disable due to test failures
dvdisaster: new package

dvdisaster: new package
add mathematica 10 (slightly borked but runs)
Merge pull request #4102 from ftrvxmtrx/alock

added alock package
strongswan: build with clang

Fixes https://lists.strongswan.org/pipermail/users/2014-September/006597.html
clamav: add myself to lib.maintainers