Making hydra build ddd.
Adding a patch that brings the windows key to rdesktop

Taken from upstream, will be on next release.

(cherry picked from commit 8997cac7859b29c6a80228561949d911ef8ca150)
pidgin: maintenance+security update

Fixes CVE-2014-3694..3698

Added a note to clean the expression, CC #4602.

(cherry picked from commit e63d9554b4ba24d75c6c98fdaf232796735f392a)

Conflicts:
	pkgs/applications/networking/instant-messengers/pidgin/default.nix
Merge remote-tracking branch 'official/release-14.04'
chatzilla: Use firefox instead of xulrunner

Thanks to @nbp for pointing out that we don't need xulrunner anymore.

(cherry picked from commit 4de72baf03d1ad64eb9a724d2a36642c3fa17c3c)
chatzilla: Update to 0.9.91

(cherry picked from commit 71c34a45e18daa0d09b471fa616613ce6ec2c397)
Add openjdk to the small channel

(cherry picked from commit 4ecb762ee532889dd086ef9e95dea6e7488a57d8)
Remove obsolete Hydra package

(cherry picked from commit d4d0e449d7b96704eeaa2570255fb41c85c49613)
sqlite: Enable optimization

Commit a28940d9d542f3d7f2a5f88c4f2701a1818cf153 changed the SQLite
build to use CFLAGS instead of NIX_CFLAGS_COMPILE, but that's really
bad because it clobbers the default -O2 flag. So all this time we had
an unoptimized SQLite build. (This is one of the reasons why
NIX_CFLAGS_COMPILE exists - messing with CFLAGS is almost never a good
idea.)

(cherry picked from commit 2b5ccf8a53489f907116df3158c2354b99497bd1)
linux: Update to 3.12.31

(cherry picked from commit bac50c5c1fef4294035f2d78ddd0d412c9891dec)
rdesktop: update to version 1.8.2

rdesktop: add meta fields
(cherry picked from commit 6ad299460caccd4c4ab928d7988f7a1f0460fea8)

Conflicts:
	pkgs/applications/networking/remote/rdesktop/default.nix
Merge remote-tracking branch 'official/release-14.04'
sudo: allow adding extra configuration options to the bottom of sudoers