Add openjdk to the small channel
Update ImageMagick version
chatzilla: Use firefox instead of xulrunner

Thanks to @nbp for pointing out that we don't need xulrunner anymore.
chatzilla: Update to 0.9.91
Merge pull request #4598 from jbedo/master

Update ImageMagick version
Merge pull request #4588 from edwtjo/dhcpcd-update

dhcpcd: 6.4.7 -> 6.5.1
tsocks: fix LD_PRELOAD references
tsocks: support poll(2) applications
Merge pull request #4579 from offlinehacker/pkgs/pythonPackages/graphitePager

pythonPackages: add graphite pager
Let the kernel load firmware directly

Loading firmware via udevd is obsolete. Fixes #4552.
linux: Enable FW_LOADER_USER_HELPER_FALLBACK

We don't really need this anymore, except that our docs say that you
can put firmware in /root/test-firmware, which doesn't work via
/sys/module/firmware_class/parameters/path.
nixos/graphite: update docs, add graphite pager
nixos/graphite: fix grahite api documentation url
pythonPackages.cjson: disable on pypy/py3k
nixos: prosody was clashing with seeks unix ids
fix eval
vim-plugins: rename simpleDerivation to buildVimPlugin
vim-plugins: prefix all plugin names with 'vimplugin-'

Currently some plugins use "vim-" prefix, some use "-vim" suffix and
some have no prefix or suffix at all.

I chose "vimplugin-" prefix to match the attribute path: vimPlugins.*
vim-plugins: buildVimPlugin: drop needless 'path' argument

Derive 'path' from the plugin name instead.
vim-plugins: update source hash for command-t

And use fetchzip instead of fetchurl towards github.com to not let this
happen again. (fetchzip checks the hash on the *extracted* archive, so
changes in compression algo etc. doesn't change the hash.)