VM tests: Run hwclock in the initrd

Needed for the installer tests, since otherwise mounting a filesystem
may fail as it has a last-mounted date in the future.

http://hydra.nixos.org/build/9846712
Bump texlive download versions *0215->*0314
bsdiff: adopt and clean up

Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Merge branch 'mysql-5.5.37' of git://github.com/proger/nixpkgs

mysql upgrade to 5.5.37
Merge branch 'texlive-bump' of git://github.com/jacobhinkle/nixpkgs

Bump texlive download versions *0215->*0314
Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs

shellinabox: unhardcode /bin/login, apply vt100 '-' fixup
Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs

Updated dwb to latest revision
Merge branch 'clang-fix-fsanitize' of git://github.com/redbaron/nixpkgs

Fix -fsanitize=... options for clang
Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs

Add mps 1.113.0, fix usage of Sleepycat license
Merge branch 'bsdiff' of git://github.com/thoughtpolice/nixpkgs

bsdiff: adopt and clean up
Merge branch 'master' of git://github.com/fmap/nixpkgs

Add Mnemosyne 2.2.1
Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs

icedtea7, icedtea7_web: New packages
Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs

nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
Revert "ccid: Update from 1.4.14 -> 1.4.15"

ccid was already updated in master

This reverts commit a7077973a50908f46f796fc85c390d5306e67dd8.
Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs

Update Smartcard Utils + Fix Daemon Expression
Merge branch 'disable-acpid' of git://github.com/ambrop72/nixpkgs

power-management: Don't enable acpid.
Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs

z3: version 4.3.1
Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs

add normal theme support for slim and slimlock
Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs

Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
Merge branch 'webkit' of git://github.com/iyzsong/nixpkgs

webkit: update to 2.4.0, add gtk2 version