Amarok: Fix build against KDE 4.8
Merge pull request #853 from errge/master

Add ncurses haskell library
Drop inferred, because "it was supposed to be used at every location
which has no type" according to pierron - but isn't used in
nixos/nixpkgs
List should be an alias of listOf, and it should no longer be used.
Add deprecation notice to list.
Nixos has already been ported from list to listOf (8b2256686b4082f8ce6f8f61cba1eb6c1e786471).
Improve the error message for uniq option type.
Improve option types documentation.
Deprecate lib.zip in favor of lib.zipAttrsWith.
Add deprecation trace message.
Nixos has been ported away from lib.zip in d705c0c3a4b84768907ade90b3f420d62db422a2.
Replace fold by all because its more readable and shorter
Always merge functions "merge" and "check" if type defines them.
Add re2, an efficient, principled regular expression library
Refactor: introduce isType reducing redundancy (trivial change)
Improve error messages.

Improve function name: ensureDefaultType: It runs the check function, so
checkDefault is much easier to understand.
Merge pull request #856 from offlinehacker/pkgs.re2

Add re2, an efficient, principled regular expression library
haskell-packages.nix: fix builds of 'terminfo' and 'readline'

These builds depend on the ncurses library, but that package was
shadowed when the 'ncurses' Haskell library was added.
Merge pull request #854 from lovek323/vimPlugins.eighties

vimPlugin.eighties: add expression
vimPlugins.taglist: add expression
OpenSSH: add Kerberos support
ati-proprietary: update, make it build with linux 3.10, fix breakage.
with contributions by Jaka Hudoklin.
lcms2: update the hash

Upstream changed one line in the source, without bumping the version.
ghostscript: bugfix update (old tarball removed upstream)

There was some incompatibility problem with the last update,
so upstream retracted the previous release.