haskell-highlighting-kate: re-generate with cabal2nix
haskell-happstack-server: re-generate with cabal2nix
idris: re-generate with cabal2nix
trifecta-1.2: re-generate with cabal2nix
Merge pull request #1581 from offlinehacker/pkgs/docker/add

Add docker
junixsocket: Ensure that the native library can be found
haskellPackages.fay: New expression
haskellPackages.fayBase: New expression
youtubeDL: update from 2014.01.23.1 to 2014.01.23.4
rfkill: Update to 0.5
rcs: Update to 5.9.2
wdiff: Update to 1.2.1
haskellPackages.iCalendar: New expression
clang: the --sysroot purity trick doesn't take care of the -dynamic-linker setting

Signed-off-by: Shea Levy <shea@shealevy.com>
Added SublimeText3 support. SublimeText2 and SublimeText3 can be installed side by side.
They provide 'sublime', 'sublime2' and 'sublime3' commands. SublimeText3 has lower precedense than SublimeText2
because its in beta mode (for over a year now)
Merge pull request #1614 from ocharles/haskellPackages.iCalendar

haskellPackages.iCalendar: New expression
Merge pull request #1612 from ocharles/haskellPackages.fay

haskellPackages.fay: New expression
Merge pull request #1178 from chexxor/fix-httpd-ssh

HTTPD: Check for SSL Cert value before building with SSL support.
zfstools: Add new package

zfstools is an OpenSolaris-like and compatible auto snapshotting script
for ZFS, which also supports auto snapshotting mysql databases.
Add keepassx 2.0alpha5, contributed by Thomas Tuegel.