Upgrade rsyslog to latest (v7) stable release. Added liblogging (new dependency of rsyslog).

(cherry picked from commit 83e1ff846c9e0383ca41aa35376dc484a05ff08a)
linux: Update to 3.12.24

CVE-2014-4508, CVE-2014-0206.

(cherry picked from commit 1596c3a012517297d98f0c94a17249e2397213bf)
Manual: html -> xhtml

(cherry picked from commit 2737291b5d925c13aee4ac4180983f4edc925625)
gperftools: Support Darwin

(cherry picked from commit 63aff93c9b0711255c05261f5935af9d06b23c08)
libxklavier: fix not finding xkbcomp (fixes #3173)

Also refactor the expression a bit,
and add description+license.

(cherry picked from commit 45ad92276370615f17df6f4346d479ae502062e5)
eclipse: add Eclipse Standard 4.4 Luna
nixos/log2html: Remove schema from jQuery URLs.

This allows viewing test logs for example when using a Hydra running
with HTTPS.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 622673495b6b00843c2bbacc932b377e2389cc8b)
Adding retroshare 0.6 (unstable)
linux_*: update, including CVE-2014-4699 (most likely)

CC #3196. No updates yet on 3.2 and 3.12 branches.

(cherry picked from commit eb659e89b41efae33b4b68a23c238b662d13e541)

Conflicts (some updates previously not backported before):
	pkgs/os-specific/linux/kernel/linux-3.10.nix
	pkgs/os-specific/linux/kernel/linux-3.14.nix
	pkgs/os-specific/linux/kernel/linux-3.15.nix
	pkgs/os-specific/linux/kernel/linux-3.4.nix
tzdata: Update to 2014e

(cherry picked from commit 0a11e405969934dc7f232e903bea636a7dd94e26)
Fix info command

The "info" command has been broken on NixOS since
457fdb38425fd00378f213f9bd5c306ed99395bf (proving that nobody uses
info).

(cherry picked from commit 973c9abdbe697ac532aa83dd2c12e73281d56b41)
docker: update to version 1.0.1

Conflicts:
	pkgs/applications/virtualization/docker/default.nix
Merge changes from offlinehacker

Conflicts:
	pkgs/applications/virtualization/docker/default.nix
passwordsafe: new package
plan9port: initial attempt of update to version 20140306
vagrant: my first modifying attempt
vimb: update to version 2.5

Conflicts:
	pkgs/applications/networking/browsers/vimb/default.nix
vimb: fixed ssl certs
plan9port: added needed perl
Bitlbee: attempt at upgrading