dcfldd: added advanced dd replacement
r-jsonlite: update to 0.9.11
r-rgdal/rgeos: adding gdal geos and proj as dependency
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.
Configure gnupg to use pinentry by default.

This makes gnupg much more usable out of the box.
Remove obsolete patch.
Remove use* options and let the user set optional dependies to null if
they don't want to use them.
Apply recent changes from gnupg/default.nix to gnupg/git.nix

gnupg/git.nix doesn't build, but it didn't build before either.
krb5: Update to 12.2.2.

Fixes security vulnerabilities CVE-2014-4341, CVE-2014-4342,
CVE-2014-4343, CVE-2014-4344 and CVE-2014-4345.
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