haskell-linear: update to version 1.15.4
haskell-pipes: update to version 4.1.4
haskell-yesod-form: update to version 1.4.1.1
haskell-yesod: update to version 1.4.1
haskell-elm-get: jailbreak to fix build with recent http-client
haskell-twitter-conduit: patch build to load the edited Cabal file from Hackage
haskell-ekg-bosun: jailbreak to fix build with recent http-client
haskell-snaplet-stripe: jailbreak to fix build with recent lens-family-core
Update Calligra to 2.8.6.
Merge pull request #5114 from vandenoever/calligra

Update Calligra to 2.8.6.
nixos/cupsd: Ignore collisions in cups-progs.

There currently are collisions between the main CUPS package and the
filters package, which are:

  * $storepath/share/cups/banners/classified
  * $storepath/share/cups/banners/confidential
  * $storepath/share/cups/banners/secret
  * $storepath/share/cups/banners/standard
  * $storepath/share/cups/banners/topsecret
  * $storepath/share/cups/banners/unclassified
  * $storepath/share/cups/data/testprint

And they actually have different content, so let's ignore those for now
until we have a better fix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
qtractor: update from 0.6.3 to 0.6.4
racket: add libreadline to ffi libs - enables xrepl.
nixos/unifi: Properly depend on mountpoints
faust: rename to faust-compiler (close #5113)

@vcunat adjusted coding style slightly.
Merge pull request #5006 from daogames/este/customgitoliteuser

enable different useraccount name for gitolite user
Revert "mesa: Don't depend on Wayland"

This reverts commit 7ff232e9584b6bd78a38b0d6b85dd2c6e0ebce4e.
See discussion at the original commit.

CC: #4999, #5001, #5061, #5071.
Merge branch 'master' into staging
openimageio: update from 1.4.13 to 1.4.14
nvidia_x11: update to 340.58

Picked from #5070.