summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/haskell')
-rw-r--r--pkgs/development/libraries/haskell/Boolean/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/Cabal/1.14.0.nix24
-rw-r--r--pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix (renamed from pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix)4
-rw-r--r--pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix26
-rw-r--r--pkgs/development/libraries/haskell/Chart-cairo/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/Chart-diagrams/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Chart-gtk/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/Chart/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ChasingBottoms/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/ConfigFile/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/CouchDB/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/DAV/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/DRBG/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/Decimal/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/EitherT/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/Extra-lib/default.nix (renamed from pkgs/development/libraries/haskell/Extra/default.nix)12
-rw-r--r--pkgs/development/libraries/haskell/FontyFruity/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix18
-rw-r--r--pkgs/development/libraries/haskell/GLURaw/default.nix (renamed from pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix18
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix19
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix19
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix20
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix20
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix20
-rw-r--r--pkgs/development/libraries/haskell/GLUT/default.nix (renamed from pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/GLUtil/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/GenericPretty/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix4
-rw-r--r--pkgs/development/libraries/haskell/HFuse/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/HPDF/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/HSH/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/HTF/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.0.6.nix18
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.0.9.nix18
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.1.1.nix18
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.1.2.nix18
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.1.nix23
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.2.nix23
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.3.nix23
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.5.nix25
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.8.nix26
-rw-r--r--pkgs/development/libraries/haskell/HTTP/default.nix (renamed from pkgs/development/libraries/haskell/HTTP/4000.2.18.nix)0
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix16
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix18
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix19
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/HUnit/default.nix (renamed from pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix)0
-rw-r--r--pkgs/development/libraries/haskell/HaTeX/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/HaXml/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/HandsomeSoup/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/HaskellNet/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/HsOpenSSL/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/IntervalMap/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/JuicyPixels-util/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/JuicyPixels/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/MFlow/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/MissingH/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/MonadPrompt/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix1
-rw-r--r--pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix (renamed from pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix)5
-rw-r--r--pkgs/development/libraries/haskell/NumInstances/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ObjectName/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix20
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix20
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix18
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/default.nix (renamed from pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix)0
-rw-r--r--pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGLRaw/default.nix (renamed from pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix)0
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.6.nix17
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix19
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/default.nix (renamed from pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix)0
-rw-r--r--pkgs/development/libraries/haskell/RSA/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/Rasterific/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/ReadArgs/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/StateVar/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/Tensor/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/Thrift/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/Unixutils/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/WAVE/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/Yampa/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/acid-state/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/active/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ad/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/aeson-pretty/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/aeson-qq/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/aeson-utils/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/aeson/0.7.0.6.nix28
-rw-r--r--pkgs/development/libraries/haskell/aeson/0.8.0.2.nix (renamed from pkgs/development/libraries/haskell/aeson/0.8.0.0.nix)4
-rw-r--r--pkgs/development/libraries/haskell/algebra/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ansi-terminal/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ariadne/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/asn1-encoding/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/asn1-parse/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/asn1-types/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/async/2.0.1.3.nix19
-rw-r--r--pkgs/development/libraries/haskell/async/2.0.1.6.nix (renamed from pkgs/development/libraries/haskell/async/2.0.1.5.nix)4
-rw-r--r--pkgs/development/libraries/haskell/atomic-primops/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/atto-lisp/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix22
-rw-r--r--pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix (renamed from pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix)8
-rw-r--r--pkgs/development/libraries/haskell/authenticate-oauth/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/auto-update/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/aws-ec2/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/aws/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/base-prelude/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/basic-prelude/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/bencode/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/bert/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/bifunctors/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/binary-conduit/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/binary-strict/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/binary/0.6.1.0.nix16
-rw-r--r--pkgs/development/libraries/haskell/binary/0.7.2.2.nix (renamed from pkgs/development/libraries/haskell/binary/0.7.2.1.nix)4
-rw-r--r--pkgs/development/libraries/haskell/bindings-libusb/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/bindings-portaudio/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/bitset/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/blank-canvas/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/blaze-builder/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/blaze-html/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/blaze-markup/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/boomerang/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/bound/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix24
-rw-r--r--pkgs/development/libraries/haskell/boundingboxes/default.nix (renamed from pkgs/development/libraries/haskell/boundingboxes/0.2.nix)6
-rw-r--r--pkgs/development/libraries/haskell/bv/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/bytes/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/bytestring-trie/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/c2hs/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/c2hsc/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/cabal-cargs/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cabal-lenses/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cabalg/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/cairo/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/call/default.nix30
-rw-r--r--pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix20
-rw-r--r--pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix (renamed from pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix)4
-rw-r--r--pkgs/development/libraries/haskell/cassava/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cereal-conduit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cereal/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix16
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix17
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix17
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix (renamed from pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix)10
-rw-r--r--pkgs/development/libraries/haskell/cgrep/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/charsetdetect-ae/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/chaselev-deque/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/cheapskate/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/checkers/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cipher-aes/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/citeproc-hs/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/clash-lib/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/clash-prelude/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/classy-prelude/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/clay/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/clean-unions/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/clientsession/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/clock/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cmdargs/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cmdtheline/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/code-builder/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/colors/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/compdata-param/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/concreteTyperep/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/concurrent-extra/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/concurrent-supply/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/cond/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/conduit-combinators/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/conduit-extra/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/conduit/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/convertible/1.0.11.1.nix19
-rw-r--r--pkgs/development/libraries/haskell/convertible/default.nix (renamed from pkgs/development/libraries/haskell/convertible/1.1.0.0.nix)0
-rw-r--r--pkgs/development/libraries/haskell/cookie/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/cprng-aes/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/criterion/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/crypto-api/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/crypto-conduit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/crypto-pubkey/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/crypto-random/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/csv-conduit/default.nix31
-rw-r--r--pkgs/development/libraries/haskell/cuda/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/cufft/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/daemons/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/data-flags/default.nix (renamed from pkgs/development/libraries/haskell/stm/2.3.nix)9
-rw-r--r--pkgs/development/libraries/haskell/data-lens-fd/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/data-lens-light/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/data-lens-template/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/data-lens/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/data-ordlist/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/dbus/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix15
-rw-r--r--pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix15
-rw-r--r--pkgs/development/libraries/haskell/derive/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/diagrams/builder/default.nix26
-rw-r--r--pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix53
-rw-r--r--pkgs/development/libraries/haskell/diagrams/cairo.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/contrib.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/core.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/gtk.nix16
-rw-r--r--pkgs/development/libraries/haskell/diagrams/lib.nix11
-rw-r--r--pkgs/development/libraries/haskell/diagrams/postscript.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/rasterific.nix25
-rw-r--r--pkgs/development/libraries/haskell/diagrams/svg.nix5
-rw-r--r--pkgs/development/libraries/haskell/digest-pure/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/digestive-functors-heist/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/digestive-functors-snap/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/dimensional-tf/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/dimensional/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/direct-sqlite/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/directory-layout/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/distributed-process-p2p/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/distributed-process-platform/default.nix37
-rw-r--r--pkgs/development/libraries/haskell/distributed-process/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/distributed-static/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/djinn/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/doctest/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/dsp/default.nix3
-rw-r--r--pkgs/development/libraries/haskell/dual-tree/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/dynamic-cabal/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/dynamic-state/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/editline/0.2.1.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/editline/default.nix (renamed from pkgs/development/libraries/haskell/editline/0.2.1.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/either/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/ekg-bosun/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/ekg-carbon/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ekg-core/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ekg/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/elerea/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/elevator/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/enclosed-exceptions/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/encoding/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/engine-io-snap/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/engine-io/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/entropy/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/equational-reasoning/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/equivalence/0.2.3.nix23
-rw-r--r--pkgs/development/libraries/haskell/equivalence/default.nix (renamed from pkgs/development/libraries/haskell/equivalence/0.2.5.nix)0
-rw-r--r--pkgs/development/libraries/haskell/esqueleto/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/exception-mtl/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/exception-transformers/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/exhaustive/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/extensible-effects/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix15
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix15
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/default.nix (renamed from pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix)0
-rw-r--r--pkgs/development/libraries/haskell/extra/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/fast-logger/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/fay-base/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/fay-text/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fay/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/fb/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.4.2.2.nix17
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.4.2.3.nix17
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.4.2.4.nix17
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.5.0.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/fgl/default.nix (renamed from pkgs/development/libraries/haskell/fgl/5.5.0.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/file-location/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/filestore/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fixed-vector/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/fixed/default.nix (renamed from pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix)10
-rw-r--r--pkgs/development/libraries/haskell/focus/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/foldl/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/force-layout/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/formatting/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/free-game/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/free/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/fsnotify/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/functor-infix/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/generic-aeson/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/generic-deriving/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/generics-sop/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/geniplate/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/ghc-heap-view/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix51
-rw-r--r--pkgs/development/libraries/haskell/ghc-mod/default.nix (renamed from pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix)23
-rw-r--r--pkgs/development/libraries/haskell/ghc-parser/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/ghc-vis/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghcjs-dom/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/ghcjs-prim/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/gio/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/github/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/gitit/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/gitlib-libgit2/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gitlib-test/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gl/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/glib/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gloss-accelerate/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gloss-banana/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gloss-raster/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/gloss-rendering/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/gloss/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/graphviz/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/greencard/default.nix (renamed from pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix)11
-rw-r--r--pkgs/development/libraries/haskell/grid/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/gtk/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gtk3/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gtksourceview2/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hS3/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/hackage-db/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/haddock-api/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/haddock-library/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hakyll/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/half/default.nix (renamed from pkgs/development/libraries/haskell/stm/2.4.nix)10
-rw-r--r--pkgs/development/libraries/haskell/handa-gdata/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix2
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-lite.nix4
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-server.nix6
-rw-r--r--pkgs/development/libraries/haskell/hashable/1.1.2.5.nix22
-rw-r--r--pkgs/development/libraries/haskell/hashable/default.nix (renamed from pkgs/development/libraries/haskell/hashable/1.2.2.0.nix)4
-rw-r--r--pkgs/development/libraries/haskell/hashtables/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/hask/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/haskell-generate/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/haskell-names/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/haskell-packages/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix26
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix27
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix26
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix28
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix38
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix39
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix39
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix41
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix43
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/Setup.hs10
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/default.nix314
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal90
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal90
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal89
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal113
-rw-r--r--pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal118
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix (renamed from pkgs/development/libraries/haskell/haskell-src-exts/default.nix)2
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix (renamed from pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix)14
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-meta/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix16
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix17
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix18
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/default.nix (renamed from pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix)0
-rw-r--r--pkgs/development/libraries/haskell/haskelldb/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/haskintex/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/haskoin/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/haskore/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/haste-compiler/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/haste-perch/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haxr/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/hcltest/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/heist/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/here/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hexpat/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/higher-leveldb/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/highlighting-kate/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/hindent/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/hinotify/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/hint/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hit/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/hledger-lib/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/hledger-web/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/hledger/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/hmatrix-gsl/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hmatrix-special/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/hmatrix/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hoauth2/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/holy-project/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/hoogle/4.2.34.nix (renamed from pkgs/development/libraries/haskell/hoogle/default.nix)1
-rw-r--r--pkgs/development/libraries/haskell/hoogle/4.2.36.nix30
-rw-r--r--pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh6
-rw-r--r--pkgs/development/libraries/haskell/hoogle/hoogle-local.diff28
-rw-r--r--pkgs/development/libraries/haskell/hoogle/local.nix106
-rw-r--r--pkgs/development/libraries/haskell/hoopl/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/hopenssl/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hosc/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/hourglass/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hplayground/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hsbencher-fusion/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/hsbencher/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/hsc3-db/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hsc3-dot/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/hsc3-lang/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/hsc3-process/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/hsc3-server/default.nix32
-rw-r--r--pkgs/development/libraries/haskell/hsc3/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/hsimport/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hspec-checkers/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/hspec-contrib/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hspec-core/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/hspec-discover/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/hspec-laws/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hspec-meta/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/hspec-wai/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/hspec/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/hspec2/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/html-conduit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/html/default.nix (renamed from pkgs/development/libraries/haskell/html/1.0.1.2.nix)0
-rw-r--r--pkgs/development/libraries/haskell/http-client/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/http-common/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/http-conduit/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/http-reverse-proxy/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/http-streams/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/http-types/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/httpd-shed/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/hxt-charproperties/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/hxt/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/iCalendar/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/ieee754/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/imm/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/implicit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/instant-generics/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/intern/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/interpolate/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/intervals/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/io-streams/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ipprint/default.nix3
-rw-r--r--pkgs/development/libraries/haskell/iteratee/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/ixdopp/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/ixset/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/jmacro-rpc/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/jmacro/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/js-flot/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/js-jquery/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/json-assertions/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/json-rpc/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/json-schema/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/json/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/jwt/default.nix30
-rw-r--r--pkgs/development/libraries/haskell/kan-extensions/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/kansas-comet/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/labeled-tree/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/lambdabot-utils/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/lambdabot/default.nix3
-rw-r--r--pkgs/development/libraries/haskell/lambdabot/deps.patch21
-rw-r--r--pkgs/development/libraries/haskell/language-c-inline/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/language-c-quote/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/language-c/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/language-java/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/lattices/default.nix (renamed from pkgs/development/libraries/haskell/stm/2.2.0.1.nix)9
-rw-r--r--pkgs/development/libraries/haskell/lens-aeson/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/lens-family-core/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/lens-family-th/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/lens-family/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/lens/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/leveldb-haskell/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/libjenkins/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/liblastfm/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/libmpd/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/libnotify/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/libsystemd-journal/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/lifted-async/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/lifted-base/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/lin-alg/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/linear-opengl/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/linear/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/linux-inotify/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/list-t/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix23
-rw-r--r--pkgs/development/libraries/haskell/llvm-general-pure/default.nix (renamed from pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix)4
-rw-r--r--pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix27
-rw-r--r--pkgs/development/libraries/haskell/llvm-general/default.nix (renamed from pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix)4
-rw-r--r--pkgs/development/libraries/haskell/logging-facade-journald/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/logging-facade/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/logging/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/logsink/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/lushtags/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/lzma-conduit/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/lzma-enumerator/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/machines-directory/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/machines-io/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/machines/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/mainland-pretty/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/managed/default.nix (renamed from pkgs/development/libraries/haskell/mtl/2.1.1.nix)9
-rw-r--r--pkgs/development/libraries/haskell/map-syntax/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/markdown/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/meep/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/mersenne-random/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/mime-mail/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/minioperational/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/miniutter/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/mmorph/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/monad-control/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/monad-journal/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/monad-logger/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix (renamed from pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix)4
-rw-r--r--pkgs/development/libraries/haskell/monad-parallel/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/monad-supply/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/monadIO/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/monadloc-pp/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/mono-traversable/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/monoid-extras/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/mtl-prelude/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/mtl/1.1.0.2.nix15
-rw-r--r--pkgs/development/libraries/haskell/mtl/2.0.1.0.nix16
-rw-r--r--pkgs/development/libraries/haskell/mtl/2.1.3.1.nix (renamed from pkgs/development/libraries/haskell/mtl/2.1.2.nix)4
-rw-r--r--pkgs/development/libraries/haskell/multiarg/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/multipart/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/mvc-updates/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/mvc/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/mwc-random/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/mysql/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/nats/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/ncurses/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/netwire/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/network-carbon/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/network-conduit-tls/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/network-data/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/network-fancy/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/network-simple/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/network-transport-tcp/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/network-transport-tests/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/network-transport/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/network-uri/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.2.1.4.nix16
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.0.2.nix17
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.0.5.nix17
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.1.0.nix18
-rw-r--r--pkgs/development/libraries/haskell/network/2.4.1.2.nix22
-rw-r--r--pkgs/development/libraries/haskell/network/2.6.0.2.nix (renamed from pkgs/development/libraries/haskell/network/2.6.0.1.nix)4
-rw-r--r--pkgs/development/libraries/haskell/non-empty/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/numeric-prelude/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/objective/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/oeis/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/ofx/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/oo-prototypes/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/opaleye/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/openssl-streams/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix (renamed from pkgs/development/libraries/haskell/optparse-applicative/default.nix)14
-rw-r--r--pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/pandoc-citeproc/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/pandoc/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/pango/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/parallel-io/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/parallel/1.1.0.1.nix15
-rw-r--r--pkgs/development/libraries/haskell/parallel/2.2.0.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/parallel/3.1.0.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/parallel/3.2.0.2.nix16
-rw-r--r--pkgs/development/libraries/haskell/parallel/3.2.0.5.nix (renamed from pkgs/development/libraries/haskell/parallel/3.2.0.4.nix)4
-rw-r--r--pkgs/development/libraries/haskell/parsec-extra/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/parsec/2.1.0.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.2.nix18
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.5.nix17
-rw-r--r--pkgs/development/libraries/haskell/parsec/default.nix (renamed from pkgs/development/libraries/haskell/parsec/3.1.3.nix)8
-rw-r--r--pkgs/development/libraries/haskell/parsek/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/parsers/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/pcap-enumerator/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/persistent-mysql/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/persistent-postgresql/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/persistent-sqlite/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/persistent-template/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/persistent/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/pipes-attoparsec/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/pipes-binary/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/pipes-csv/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/pipes-http/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/pipes-shell/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/pipes-text/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pipes-zlib/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/pipes/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pointed/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/polynomials-bernstein/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/polyparse/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/pool-conduit/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/poppler/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/postgresql-simple/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix17
-rw-r--r--pkgs/development/libraries/haskell/preprocessor-tools/default.nix (renamed from pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/presburger/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/present/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/primitive/0.5.3.0.nix1
-rw-r--r--pkgs/development/libraries/haskell/primitive/0.5.4.0.nix (renamed from pkgs/development/libraries/haskell/primitive/0.5.2.1.nix)5
-rw-r--r--pkgs/development/libraries/haskell/product-profunctors/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/profunctors/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/project-template/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/protobuf/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/protocol-buffers/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/psqueues/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/pure-cdb/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/purescript/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/pwstore-fast/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/quickcheck-instances/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/quickcheck-unicode/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/random-fu/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/random/1.0.1.3.nix1
-rw-r--r--pkgs/development/libraries/haskell/random/1.1.nix15
-rw-r--r--pkgs/development/libraries/haskell/rawStringsQq/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/reactive-banana-wx/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/recaptcha/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/reducers/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix16
-rw-r--r--pkgs/development/libraries/haskell/regex-base/0.93.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-base/default.nix (renamed from pkgs/development/libraries/haskell/regex-base/0.93.2.nix)0
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.92.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.93.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/default.nix (renamed from pkgs/development/libraries/haskell/regex-compat/0.95.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix (renamed from pkgs/development/libraries/haskell/regex-posix/0.94.4.nix)9
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.94.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.94.2.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.95.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/default.nix (renamed from pkgs/development/libraries/haskell/regex-posix/0.95.2.nix)0
-rw-r--r--pkgs/development/libraries/haskell/regular-xmlpickler/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/rematch/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/resource-pool/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/resourcet/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/rest-client/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/rest-core/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/rest-gen/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/rest-happstack/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/rest-snap/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/rest-stringmap/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/rest-types/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/rest-wai/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/rethinkdb/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/retry/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/reverse-apply/default.nix (renamed from pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix)9
-rw-r--r--pkgs/development/libraries/haskell/robots-txt/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/rope/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/rvar/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/saltine/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/sbv/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/scientific/0.3.3.3.nix (renamed from pkgs/development/libraries/haskell/scientific/0.3.3.0.nix)4
-rw-r--r--pkgs/development/libraries/haskell/scotty/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/sdl2/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/securemem/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/semigroups/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/serialport/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/servant-client/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/servant-docs/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/servant-jquery/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/servant-pool/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/servant-postgresql/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/servant-response/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/servant-scotty/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/servant-server/default.nix31
-rw-r--r--pkgs/development/libraries/haskell/servant/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/setlocale/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/shake/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/shakespeare/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/shell-conduit/default.nix25
-rw-r--r--pkgs/development/libraries/haskell/shellmate/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/shelly/0.15.4.1.nix24
-rw-r--r--pkgs/development/libraries/haskell/shelly/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/simple-conduit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/simple-sendfile/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/sitemap/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/skein/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/slack-api/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/smtps-gmail/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/snap-cors/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/snap-error-collector/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/snap-web-routes/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/snap/core.nix1
-rw-r--r--pkgs/development/libraries/haskell/snap/server.nix2
-rw-r--r--pkgs/development/libraries/haskell/snap/snap.nix8
-rw-r--r--pkgs/development/libraries/haskell/snaplet-acid-state/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/snaplet-redis/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/snaplet-stripe/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/socket-io/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/sodium/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/split/0.2.1.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/srcloc/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/state-plus/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/stm-conduit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/stm-containers/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/stm-delay/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/stm/2.1.1.2.nix15
-rw-r--r--pkgs/development/libraries/haskell/stm/2.1.2.1.nix15
-rw-r--r--pkgs/development/libraries/haskell/streaming-commons/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/string-conversions/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/stylish-haskell/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.3.nix16
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.6.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.7.nix16
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.nix16
-rw-r--r--pkgs/development/libraries/haskell/symbol/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/system-argv0/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/system-fileio/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/system-filepath/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/tables/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/tagged-transformer/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/tagged/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/taggy/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/tagsoup/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/tagstream-conduit/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/tasty-ant-xml/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/tasty-hspec/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/tasty-hunit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/tasty-program/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/tasty-quickcheck/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/tasty-rerun/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/tasty-smallcheck/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/tasty-th/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/tasty/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/template/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/terminal-size/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix17
-rw-r--r--pkgs/development/libraries/haskell/terminfo/default.nix (renamed from pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix)0
-rw-r--r--pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/test-framework-th-prime/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/test-framework/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/test-simple/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/texmath/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/text-binary/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.0.5.nix18
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.0.6.nix18
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.1.5.nix18
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.3.1.nix24
-rw-r--r--pkgs/development/libraries/haskell/text/1.1.1.3.nix1
-rw-r--r--pkgs/development/libraries/haskell/text/1.2.0.3.nix (renamed from pkgs/development/libraries/haskell/text/0.11.2.0.nix)13
-rw-r--r--pkgs/development/libraries/haskell/th-lift-instances/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/th-lift/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/th-orphans/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/th-reify-many/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/thread-local-storage/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/threepenny-gui/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/thyme/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/time/1.5.nix (renamed from pkgs/development/libraries/haskell/time/1.4.2.nix)10
-rw-r--r--pkgs/development/libraries/haskell/timezone-olson/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/timezone-series/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/tls-extra/default.nix23
-rw-r--r--pkgs/development/libraries/haskell/tls/1.1.5.nix27
-rw-r--r--pkgs/development/libraries/haskell/tls/1.2.8.nix32
-rw-r--r--pkgs/development/libraries/haskell/tls/default.nix32
-rw-r--r--pkgs/development/libraries/haskell/torrent/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/tostring/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix17
-rw-r--r--pkgs/development/libraries/haskell/transformers-compat/default.nix (renamed from pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix)0
-rw-r--r--pkgs/development/libraries/haskell/transformers/0.2.2.0.nix15
-rw-r--r--pkgs/development/libraries/haskell/transformers/0.4.2.0.nix (renamed from pkgs/development/libraries/haskell/transformers/0.4.1.0.nix)4
-rw-r--r--pkgs/development/libraries/haskell/traverse-with-class/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/trivia/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/tuple/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/twitter-conduit/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/twitter-types-lens/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/twitter-types/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/type-aligned/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/typography-geometry/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/unbound-generics/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/unification-fd/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/unique/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/units/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/unix-memory/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/unix-time/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix24
-rw-r--r--pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix24
-rw-r--r--pkgs/development/libraries/haskell/unordered-containers/default.nix (renamed from pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix)4
-rw-r--r--pkgs/development/libraries/haskell/uri-encode/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/uri/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/urlencoded/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/uuid/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/vado/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/validation/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/vcsgui/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/vcswrapper/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vector-fftw/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/vector/0.10.0.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/vector/0.10.11.0.nix16
-rw-r--r--pkgs/development/libraries/haskell/vector/0.10.12.2.nix23
-rw-r--r--pkgs/development/libraries/haskell/vector/0.10.9.3.nix1
-rw-r--r--pkgs/development/libraries/haskell/vinyl/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/vk-aws-route53/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/vk-posix-pty/default.nix (renamed from pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix)11
-rw-r--r--pkgs/development/libraries/haskell/void/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/vty-ui/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/vty/4.7.5.nix29
-rw-r--r--pkgs/development/libraries/haskell/vty/default.nix (renamed from pkgs/development/libraries/haskell/vty/5.2.1.nix)6
-rw-r--r--pkgs/development/libraries/haskell/wai-app-static/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/wai-conduit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/wai-extra/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/wai-middleware-static/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/wai-util/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/wai-websockets/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/wai/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/warp-tls/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/warp/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/web-routes-boomerang/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/web-routes-happstack/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/web-routes/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/webdriver/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/webkit/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/webkitgtk3/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/websockets-snap/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/websockets/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint-extras/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint-text/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/word-trie/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/wordexp/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/wreq/default.nix27
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch10
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wx.nix7
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wxc.nix7
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wxcore.nix9
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix4
-rw-r--r--pkgs/development/libraries/haskell/x509-store/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/x509-system/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/x509-validation/default.nix12
-rw-r--r--pkgs/development/libraries/haskell/x509/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/xdot/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix16
-rw-r--r--pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix16
-rw-r--r--pkgs/development/libraries/haskell/xhtml/default.nix (renamed from pkgs/development/libraries/haskell/xhtml/3000.2.1.nix)0
-rw-r--r--pkgs/development/libraries/haskell/xlsx/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/xml-conduit/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/xml-lens/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/xmlhtml/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/xmonad-screenshot/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/yaml/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/yesod-auth/default.nix33
-rw-r--r--pkgs/development/libraries/haskell/yesod-bin/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/yesod-core/default.nix41
-rw-r--r--pkgs/development/libraries/haskell/yesod-form/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/yesod-markdown/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/yesod-newsfeed/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/yesod-pagination/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/yesod-persistent/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/yesod-static/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/yesod-test/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/yesod/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/yi-language/default.nix28
-rw-r--r--pkgs/development/libraries/haskell/yi-monokai/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/yi-rope/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/yi-snippet/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/yst/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/zeromq4-haskell/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix (renamed from pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix)4
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.0.0.nix16
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.2.0.nix16
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.3.1.nix16
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.3.3.nix17
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.4.0.nix16
-rw-r--r--pkgs/development/libraries/haskell/zlib/default.nix (renamed from pkgs/development/libraries/haskell/zlib/0.5.4.1.nix)4
863 files changed, 5236 insertions, 5431 deletions
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 53eea4f738d..137171b7750 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Boolean";
-  version = "0.2.1";
-  sha256 = "0vi09icwc254mbx85lf1n81mx4hr2sdf61a4njaqa91cf046sjlr";
+  version = "0.2.3";
+  sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn";
   meta = {
     description = "Generalized booleans and numbers";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
deleted file mode 100644
index a905017472f..00000000000
--- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "Cabal";
-  version = "1.14.0";
-  sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j";
-  buildDepends = [ filepath ];
-  testDepends = [
-    extensibleExceptions filepath HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "A framework for packaging Haskell software";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
index ac417de67a1..83e8f075f07 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.3.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "1.20.0.2";
-  sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93";
+  version = "1.20.0.3";
+  sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
   buildDepends = [ deepseq filepath time ];
   testDepends = [
     extensibleExceptions filepath HUnit QuickCheck regexPosix
diff --git a/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix b/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
new file mode 100644
index 00000000000..659a493bc18
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Cabal/1.22.0.0.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, deepseq, extensibleExceptions, filepath, HUnit
+, QuickCheck, regexPosix, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Cabal";
+  version = "1.22.0.0";
+  sha256 = "13984rli87vzhl5pvpny2cns8dq4k2s5bgmr8n93iw9hrx5w3j48";
+  buildDepends = [ binary deepseq filepath time ];
+  testDepends = [
+    binary extensibleExceptions filepath HUnit QuickCheck regexPosix
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "A framework for packaging Haskell software";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index d2dea815819..c01793881ad 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-cairo";
-  version = "1.2.4";
-  sha256 = "1ggqh3v14mwv9q1pmz3hbx7g1dvibfwl1vzvag92q7432q4pqm2z";
+  version = "1.3.2";
+  sha256 = "19ghd5xav7pn3z5igbkbsa81vhlpvy55xscc42vbxx1v9f6shq7g";
   buildDepends = [
     cairo Chart colour dataDefaultClass lens mtl operational time
   ];
diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
index 002b762fbac..d6b17ec320f 100644
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-diagrams";
-  version = "1.2.4";
-  sha256 = "099frqvfjqqc7h3zr52saqyg37di0klr0y649afzxd7lj3d67mvw";
+  version = "1.3.2";
+  sha256 = "0q5qvzzl5wirlj26a6zpnyq95lpzzkwiqq0mkh25aa3qzzbg4y6g";
   buildDepends = [
     blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
     diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
@@ -20,6 +20,5 @@ cabal.mkDerivation (self: {
     description = "Diagrams backend for Charts";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index 9dbb3c8ae9a..6d55bedb24f 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -1,12 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }:
+{ cabal, cairo, Chart, ChartCairo, colour, dataDefaultClass, gtk
+, mtl, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "Chart-gtk";
-  version = "1.2.4";
-  sha256 = "16dfmkls341cmk13j1z3rw2wxdvxr5rqsv1ff4qjhjak9j7hkqjq";
-  buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
+  version = "1.3.2";
+  sha256 = "175bqh5pl4z0gx50z34afg149g94qw8sk87gbp9mavh5bnpj5a07";
+  buildDepends = [
+    cairo Chart ChartCairo colour dataDefaultClass gtk mtl time
+  ];
   meta = {
     homepage = "https://github.com/timbod7/haskell-chart/wiki";
     description = "Utility functions for using the chart library with GTK";
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index d5696a562da..c41fa5a5a5d 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart";
-  version = "1.2.4";
-  sha256 = "0zizrkxsligvxs5x5r2j0pynf6ncjl4mgyzbh1zfqgnz29frylh7";
+  version = "1.3.2";
+  sha256 = "0y4xkqdmbyyaxf810dgz0zsfmywlx07c26s9wkk155iriz0yz4m9";
   buildDepends = [
     colour dataDefaultClass lens mtl operational time
   ];
diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
index 715793c7e9a..829af010da7 100644
--- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
+++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl QuickCheck random syb ];
+  jailbreak = true;
   meta = {
     description = "For testing partial and infinite values";
     license = self.stdenv.lib.licenses.mit;
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 1de333a04d9..a2923dc19dd 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "ConfigFile";
-  version = "1.1.2";
-  sha256 = "0xidr8dk5sc9g1v9gw7fmmrsyqiawx2rxg4c36pm4jbcj8jdzxiq";
+  version = "1.1.4";
+  sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ MissingH mtl parsec ];
   meta = {
     homepage = "http://software.complete.org/configfile";
     description = "Configuration file reading & writing";
-    license = "LGPL";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 44a5d50edc5..18f095cd8b1 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "CouchDB interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index 30289ed9d08..b361ae045fb 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -2,22 +2,22 @@
 
 { cabal, caseInsensitive, dataDefault, either, errors, exceptions
 , httpClient, httpClientTls, httpTypes, lens, mtl, network
-, optparseApplicative, transformers, transformersBase, utf8String
-, xmlConduit, xmlHamlet
+, networkUri, optparseApplicative, transformers, transformersBase
+, utf8String, xmlConduit, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "1.0.1";
-  sha256 = "0j8z7hi5dykimv6da584zgyn8xlvfhg1k9sbhj5ay7ncxszb134k";
+  version = "1.0.3";
+  sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     caseInsensitive dataDefault either errors exceptions httpClient
-    httpClientTls httpTypes lens mtl network optparseApplicative
-    transformers transformersBase utf8String xmlConduit xmlHamlet
+    httpClientTls httpTypes lens mtl network networkUri
+    optparseApplicative transformers transformersBase utf8String
+    xmlConduit xmlHamlet
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://floss.scru.org/hDAV";
     description = "RFC 4918 WebDAV support";
diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix
index c192ad4302e..741368799d1 100644
--- a/pkgs/development/libraries/haskell/DRBG/default.nix
+++ b/pkgs/development/libraries/haskell/DRBG/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "DRBG";
-  version = "0.5.2";
-  sha256 = "0c8w8h2mxpk2avj6321q9a1smzp970cyn87aj98vn8dln7h9cqsi";
+  version = "0.5.3";
+  sha256 = "197kp2bchkj3zrl3f06glba9lbjf51mp710sx0qj8i4spvf3jfr8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/Decimal/default.nix b/pkgs/development/libraries/haskell/Decimal/default.nix
new file mode 100644
index 00000000000..03ae15a24d1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Decimal/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, deepseq, HUnit, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Decimal";
+  version = "0.4.2";
+  sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
+  buildDepends = [ deepseq ];
+  testDepends = [
+    deepseq HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
+    description = "Decimal numbers with variable precision";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix
index 66ccb6a8d4e..23467560530 100644
--- a/pkgs/development/libraries/haskell/EitherT/default.nix
+++ b/pkgs/development/libraries/haskell/EitherT/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix
index 0db01edcc61..d244700e58a 100644
--- a/pkgs/development/libraries/haskell/Extra/default.nix
+++ b/pkgs/development/libraries/haskell/Extra-lib/default.nix
@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck
-, random, regexCompat, time, Unixutils, zlib
+{ cabal, bzlib, filepath, HUnit, mtl, networkUri, pureMD5
+, QuickCheck, random, regexCompat, time, Unixutils, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "Extra";
-  version = "1.46.1";
-  sha256 = "0dgj72s60mhc36x7hpfdcdvxydq5d5aj006gxma9zz3hqzy5nnz9";
+  version = "1.46.3";
+  sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
   buildDepends = [
-    bzlib filepath HUnit mtl network pureMD5 QuickCheck random
+    bzlib filepath HUnit mtl networkUri pureMD5 QuickCheck random
     regexCompat time Unixutils zlib
   ];
   meta = {
-    homepage = "http://src.seereason.com/haskell-extra";
+    homepage = "https://github.com/ddssff/haskell-extra";
     description = "A grab bag of modules";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix
new file mode 100644
index 00000000000..325ed34c5d6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, deepseq, filepath, text, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "FontyFruity";
+  version = "0.4";
+  sha256 = "0nrlsiwav1mwbmp555vwnc24250yn166yr5fjazjg9g7a0ikkivf";
+  buildDepends = [ binary deepseq filepath text vector ];
+  meta = {
+    description = "A true type file format loader";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix
deleted file mode 100644
index bf23628a710..00000000000
--- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, mesa, OpenGLRaw }:
-
-cabal.mkDerivation (self: {
-  pname = "GLURaw";
-  version = "1.3.0.0";
-  sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0";
-  buildDepends = [ OpenGLRaw ];
-  extraLibraries = [ freeglut mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index d389d7ecf04..d389d7ecf04 100644
--- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
deleted file mode 100644
index 88a10caac09..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.1.1.2";
-  sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
deleted file mode 100644
index a9988a53328..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.1.2.1";
-  sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
deleted file mode 100644
index c92565ca4af..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.1.2.2";
-  sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi";
-  buildDepends = [ OpenGL ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
deleted file mode 100644
index 0bac3e0d5db..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, StateVar, Tensor
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.2.2.1";
-  sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw";
-  buildDepends = [ OpenGL StateVar Tensor ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
deleted file mode 100644
index 9402d56f687..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, OpenGLRaw, StateVar, Tensor
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.3.1.0";
-  sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci";
-  buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
deleted file mode 100644
index c28194d7adb..00000000000
--- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, OpenGLRaw
-}:
-
-cabal.mkDerivation (self: {
-  pname = "GLUT";
-  version = "2.4.0.0";
-  sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h";
-  buildDepends = [ OpenGL OpenGLRaw ];
-  extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL Utility Toolkit";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/default.nix
index b2cce856524..b2cce856524 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/default.nix
diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix
index ee99ccc4fee..0b7910a7e0f 100644
--- a/pkgs/development/libraries/haskell/GLUtil/default.nix
+++ b/pkgs/development/libraries/haskell/GLUtil/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLUtil";
-  version = "0.8.1";
-  sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w";
+  version = "0.8.2";
+  sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3";
   buildDepends = [
     cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers
     vector
diff --git a/pkgs/development/libraries/haskell/GenericPretty/default.nix b/pkgs/development/libraries/haskell/GenericPretty/default.nix
new file mode 100644
index 00000000000..d2b8fedfc5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GenericPretty/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "GenericPretty";
+  version = "1.2.1";
+  sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
+  meta = {
+    homepage = "https://github.com/RazvanRanca/GenericPretty";
+    description = "A generic, derivable, haskell pretty printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
index cadf9e3e9c2..9622ea5d0dc 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HDBC-odbc";
-  version = "2.3.1.1";
-  sha256 = "0zypgwy8yxzp69c2775gkzi8591b0l3wncn7vmq11l16ign95fc7";
+  version = "2.4.0.0";
+  sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ HDBC mtl time utf8String ];
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 510ffd4acb9..05caf6975ac 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HFuse";
-  version = "0.2.4.3";
-  sha256 = "1daka673mx0gsnsa04pxani7n4wp93hflzxs3imzy4sgb30p7l01";
+  version = "0.2.4.4";
+  sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc";
   isLibrary = true;
   isExecutable = true;
   extraLibraries = [ fuse ];
@@ -17,6 +17,6 @@ cabal.mkDerivation (self: {
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix
index 7dcdbaa8cf9..d34e590e9e6 100644
--- a/pkgs/development/libraries/haskell/HPDF/default.nix
+++ b/pkgs/development/libraries/haskell/HPDF/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generation of PDF documents";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index bcc29781210..01c0595e900 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -1,22 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
-, regexPosix, fetchpatch
+, regexPosix
 }:
 
 cabal.mkDerivation (self: {
   pname = "HSH";
-  version = "2.1.0";
-  sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5";
+  version = "2.1.2";
+  sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     filepath hslogger MissingH mtl regexBase regexCompat regexPosix
   ];
-  patches = [ (fetchpatch { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0ddb3vf8ipf37zg4hkqh0frff1a7sv9ils3lw6qd3irpbwna1hdz"; }) ];
   meta = {
     homepage = "http://software.complete.org/hsh";
     description = "Library to mix shell scripting with Haskell programs";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 5908498bd0a..cc27d4cf2ae 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -1,25 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
-, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
-, random, regexCompat, temporary, text, time, unorderedContainers
-, vector, xmlgen
+{ cabal, aeson, aesonPretty, base64Bytestring, cpphs, Diff
+, filepath, haskellLexer, haskellSrc, HUnit, liftedBase
+, monadControl, mtl, QuickCheck, random, regexCompat, temporary
+, text, time, unorderedContainers, vector, xmlgen
 }:
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.12.0.0";
-  sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i";
+  version = "0.12.2.3";
+  sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase
-    monadControl mtl QuickCheck random regexCompat text time vector
-    xmlgen
+    aeson base64Bytestring cpphs Diff haskellLexer haskellSrc HUnit
+    liftedBase monadControl mtl QuickCheck random regexCompat text time
+    vector xmlgen
   ];
   testDepends = [
-    aeson filepath HUnit mtl random regexCompat temporary text
-    unorderedContainers
+    aeson aesonPretty filepath HUnit mtl random regexCompat temporary
+    text unorderedContainers
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
deleted file mode 100644
index a41dd3c25dc..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.0.6";
-  sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b";
-  buildDepends = [ mtl network parsec ];
-  doCheck = false;
-  meta = {
-    homepage = "http://projects.haskell.org/http/";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
deleted file mode 100644
index e530452b08c..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.0.9";
-  sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
-  buildDepends = [ mtl network parsec ];
-  doCheck = false;
-  meta = {
-    homepage = "http://projects.haskell.org/http/";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
deleted file mode 100644
index 76356134589..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.1.1";
-  sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3";
-  buildDepends = [ mtl network parsec ];
-  doCheck = false;
-  meta = {
-    homepage = "http://projects.haskell.org/http/";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
deleted file mode 100644
index 344a86a0da8..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.1.2";
-  sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
-  buildDepends = [ mtl network parsec ];
-  doCheck = false;
-  meta = {
-    homepage = "http://projects.haskell.org/http/";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
deleted file mode 100644
index c677bbf40db..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpdShed, HUnit, mtl, network, parsec, split
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.1";
-  sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    httpdShed HUnit network split testFramework testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
deleted file mode 100644
index c18fd35c8a0..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpdShed, HUnit, mtl, network, parsec, split
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.2";
-  sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    httpdShed HUnit network split testFramework testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
deleted file mode 100644
index 86c4dc8fcc0..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, httpdShed, HUnit, mtl, network, parsec, split
-, testFramework, testFrameworkHunit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.3";
-  sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    httpdShed HUnit network split testFramework testFrameworkHunit
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
deleted file mode 100644
index 54c8733c584..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes
-, HUnit, mtl, network, parsec, pureMD5, split, testFramework
-, testFrameworkHunit, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.5";
-  sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
-    network pureMD5 split testFramework testFrameworkHunit wai warp
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
deleted file mode 100644
index d308d547c78..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes
-, HUnit, mtl, network, parsec, pureMD5, split, testFramework
-, testFrameworkHunit, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.8";
-  sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
-    network pureMD5 split testFramework testFrameworkHunit wai warp
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix b/pkgs/development/libraries/haskell/HTTP/default.nix
index 0a5a16dfadc..0a5a16dfadc 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix
+++ b/pkgs/development/libraries/haskell/HTTP/default.nix
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
deleted file mode 100644
index 7bd199555d7..00000000000
--- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.0.3";
-  sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12";
-  meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
deleted file mode 100644
index e995adab83c..00000000000
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.2.1";
-  sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
deleted file mode 100644
index 6f866137945..00000000000
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.4.3";
-  sha256 = "0sk2s0g28wly64nisgrj4wr914zx940pvj5zvkv9n467vssywzbr";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
deleted file mode 100644
index ae33779597b..00000000000
--- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.5.1";
-  sha256 = "0wa4yqgfyrfxzhdyd04xvzi4qaswbg0rrbywz8sxzkp71v91a35w";
-  buildDepends = [ deepseq ];
-  meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/default.nix
index 0ab6f152aee..0ab6f152aee 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix
+++ b/pkgs/development/libraries/haskell/HUnit/default.nix
diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix
index 3712dda87eb..9f5c8c76097 100644
--- a/pkgs/development/libraries/haskell/HaTeX/default.nix
+++ b/pkgs/development/libraries/haskell/HaTeX/default.nix
@@ -6,14 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "HaTeX";
-  version = "3.13.1.0";
-  sha256 = "1ciifdb7yd79lvwdcxj8dq98dfmm9pg25rx9rc2wjn2jnp8j85r7";
+  version = "3.16.0.0";
+  sha256 = "16b3aaaahsy153dfii2lc1672kkm6i9mch5hmyf9229b17hhh5pa";
   buildDepends = [
     matrix parsec QuickCheck text transformers wlPprintExtras
   ];
-  testDepends = [ QuickCheck tasty tastyQuickcheck ];
+  testDepends = [ QuickCheck tasty tastyQuickcheck text ];
   meta = {
-    homepage = "http://daniel-diaz.github.io/projects/hatex";
+    homepage = "http://wrongurl.net/haskell/HaTeX";
     description = "The Haskell LaTeX library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
index 4199ae4275b..d20d7be551c 100644
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ b/pkgs/development/libraries/haskell/HaXml/default.nix
@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "HaXml";
-  version = "1.24.1";
-  sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az";
+  version = "1.25";
+  sha256 = "02l53v9c8qzkp5zzs31973pp27q4k2h04h9x3852gah78qjvnslk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath polyparse random ];
+  noHaddock = true;
   meta = {
-    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
+    homepage = "http://projects.haskell.org/HaXml/";
     description = "Utilities for manipulating XML documents";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
index cbf5e87bccc..69915ccfeef 100644
--- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
+++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix
@@ -1,16 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HTTP, hxt, hxtHttp, MaybeT, mtl, network, parsec
-, transformers
+{ cabal, hspec, HTTP, hxt, hxtHttp, MaybeT, mtl, network
+, networkUri, parsec, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "HandsomeSoup";
-  version = "0.3.2";
-  sha256 = "0ixqk32sfv6kj41vc6fzflv6f6jwvnkvcdf9pmgkc675218ggh53";
+  version = "0.3.5";
+  sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
-    HTTP hxt hxtHttp MaybeT mtl network parsec transformers
+    HTTP hxt hxtHttp MaybeT mtl network networkUri parsec transformers
   ];
+  testDepends = [ hspec hxt ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/egonSchiele/HandsomeSoup";
     description = "Work with HTML more easily in HXT";
diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
index d5cc7085538..2aad877f688 100644
--- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaskellNet-SSL";
-  version = "0.2.4";
-  sha256 = "0rwj69rz8i84qj6n1zd9fllp4333azfxppd7blzd486bczzkgkbb";
+  version = "0.2.5.2";
+  sha256 = "0jhm43zd6jvhbahk4ki29ydg02qnjj4mw823rckqxk6f91q00qlp";
   buildDepends = [ connection dataDefault HaskellNet network tls ];
   meta = {
     homepage = "https://github.com/dpwright/HaskellNet-SSL";
diff --git a/pkgs/development/libraries/haskell/HaskellNet/default.nix b/pkgs/development/libraries/haskell/HaskellNet/default.nix
index 940bdbd678d..284bdce9737 100644
--- a/pkgs/development/libraries/haskell/HaskellNet/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellNet/default.nix
@@ -1,12 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, base64String, Crypto, mimeMail, mtl, network, text }:
+{ cabal, base64String, cryptohash, mimeMail, mtl, network, text }:
 
 cabal.mkDerivation (self: {
   pname = "HaskellNet";
-  version = "0.3.1";
-  sha256 = "168w6y5rizszq1428amxbkhww65sy3b7czxpjyrzzq3dhjn517nr";
-  buildDepends = [ base64String Crypto mimeMail mtl network text ];
+  version = "0.4";
+  sha256 = "152ayk35czl8fi2mar1g6c5mi3pikvnpcy967prg97a9vy0ld1yp";
+  buildDepends = [
+    base64String cryptohash mimeMail mtl network text
+  ];
   meta = {
     homepage = "https://github.com/jtdaugherty/HaskellNet";
     description = "Client support for POP3, SMTP, and IMAP";
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index af38572464c..c752b20551d 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.11";
-  sha256 = "000c1589yf1lzvw32hh2jacq1da6k2vynh5rymw3rlapxq7skyyr";
+  version = "0.11.1";
+  sha256 = "1v73xjq3hxdzsrisyyshr46i7p9psinjbmc1z49cxgwisg8mn5xy";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
index 774cbd8a19e..65b53d91b52 100644
--- a/pkgs/development/libraries/haskell/IntervalMap/default.nix
+++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "IntervalMap";
-  version = "0.3.0.3";
-  sha256 = "11lxsjq9nw9mmj5ga0x03d8rgcx2s85kzi17d9cm7m28mq4dqdag";
+  version = "0.4.0.1";
+  sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
   buildDepends = [ deepseq ];
   testDepends = [ Cabal deepseq QuickCheck ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
index 4e680b26cae..ca3e10682fa 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels-util";
-  version = "0.1";
-  sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc";
+  version = "0.2";
+  sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
   buildDepends = [ JuicyPixels vector ];
   meta = {
     homepage = "https://github.com/fumieval/JuicyPixels-util";
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index fcd2689c548..e8c1c610e89 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -6,14 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.6.1";
-  sha256 = "1v560y0l1zpznbpw8zgb2j6zlcwi8i207xgzggzzd3p0v2m8955c";
+  version = "3.2";
+  sha256 = "1z4i0464zdijv54b7wzc55zrp8h67ahm6mrdk7a6gi2qm0nihmy5";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];
   meta = {
     homepage = "https://github.com/Twinside/Juicy.Pixels";
-    description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)";
+    description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
index a0e4b787ec9..aaf84a84187 100644
--- a/pkgs/development/libraries/haskell/MFlow/default.nix
+++ b/pkgs/development/libraries/haskell/MFlow/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MFlow";
-  version = "0.4.5.7";
-  sha256 = "0faw082z8yyzf0k1vrgpqa8kvwb2zwmasy1p1vvj3a7lhhnlr20s";
+  version = "0.4.5.9";
+  sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
   buildDepends = [
     blazeHtml blazeMarkup caseInsensitive clientsession conduit
     conduitExtra extensibleExceptions httpTypes monadloc mtl parsec
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index cb9b60d13c7..3115c437b09 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MissingH";
-  version = "1.2.1.0";
-  sha256 = "08zpzfhl31w35x13vapimwd508j4nydi8v3vid668r4fkqnymbss";
+  version = "1.3.0.1";
+  sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
   buildDepends = [
     filepath hslogger HUnit mtl network parsec random regexCompat time
   ];
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index 3221cbe7f55..412f24450c4 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadPrompt";
-  version = "1.0.0.3";
-  sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2";
+  version = "1.0.0.5";
+  sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
   buildDepends = [ mtl ];
   meta = {
     description = "MonadPrompt, implementation & examples";
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
index cc430e22090..41796adb963 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
index 0cbd926b1f1..0362804ed45 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.13";
-  sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk";
+  version = "0.3.0.1";
+  sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
index e5b918a5ad5..38fbbfdbfbf 100644
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ b/pkgs/development/libraries/haskell/NumInstances/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "NumInstances";
-  version = "1.3";
-  sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh";
+  version = "1.4";
+  sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
   meta = {
     homepage = "https://github.com/conal/NumInstances";
     description = "Instances of numeric classes for functions and tuples";
diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
index 785caabadd2..e2fed3f2191 100644
--- a/pkgs/development/libraries/haskell/ObjectName/default.nix
+++ b/pkgs/development/libraries/haskell/ObjectName/default.nix
@@ -4,10 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "ObjectName";
-  version = "1.0.0.0";
-  sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm";
+  version = "1.0.1.0";
+  sha256 = "1aw221i1cisk7jpgchs16f3br0ddllh0n0idhw5v6n6ysv4vv155";
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "https://github.com/haskell-opengl/ObjectName";
     description = "Explicitly handled object names";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
deleted file mode 100644
index 747720eba85..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.2.1.1";
-  sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792";
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
deleted file mode 100644
index af01702b01b..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.2.3.0";
-  sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57";
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
deleted file mode 100644
index fa3ae576bfa..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.2.3.1";
-  sha256 = "1vl5i1l76mjc0p18awdrvdcpszaz1z891505cqmn1xlld7ijb14z";
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
deleted file mode 100644
index 81e754e269f..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
-, Tensor
-}:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.4.0.2";
-  sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6";
-  buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
deleted file mode 100644
index a0ae3c84fad..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
-, Tensor
-}:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.6.0.1";
-  sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi";
-  buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
deleted file mode 100644
index ea1fdcc9711..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, OpenGLRaw }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.8.0.0";
-  sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff";
-  buildDepends = [ GLURaw OpenGLRaw ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix
index f6767ab577c..f6767ab577c 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/default.nix
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix
deleted file mode 100644
index c3d8ce49881..00000000000
--- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGLRaw";
-  version = "1.3.0.0";
-  sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32";
-  extraLibraries = [ mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix
deleted file mode 100644
index a2ffc9b4ad1..00000000000
--- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGLRaw";
-  version = "1.4.0.0";
-  sha256 = "112xaz01950pyjaw3cv9yvw4w3gqbf79idyyh05ain7x29m7bxkh";
-  extraLibraries = [ mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A raw binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index 65466306fd8..65466306fd8 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
deleted file mode 100644
index 465fb510b50..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "1.2.0.0";
-  sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
deleted file mode 100644
index ba16967249d..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "1.2.0.1";
-  sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
deleted file mode 100644
index 373742a9755..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, mtl, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.1.1.1";
-  sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9";
-  buildDepends = [ extensibleExceptions mtl random ];
-  meta = {
-    homepage = "http://www.cse.chalmers.se/~koen";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
deleted file mode 100644
index 3bee4ac9702..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, mtl, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.4.0.1";
-  sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r";
-  buildDepends = [ extensibleExceptions mtl random ];
-  meta = {
-    homepage = "http://code.haskell.org/QuickCheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
deleted file mode 100644
index d936d4b3784..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.4.1.1";
-  sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj";
-  buildDepends = [ extensibleExceptions random ];
-  meta = {
-    homepage = "http://code.haskell.org/QuickCheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
deleted file mode 100644
index 58a04593c49..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.4.2";
-  sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg";
-  buildDepends = [ extensibleExceptions random ];
-  meta = {
-    homepage = "http://code.haskell.org/QuickCheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
deleted file mode 100644
index 438c4cfff8d..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.5.1.1";
-  sha256 = "1ff2mhm27l8cc8nrsbw2z65dc9m7h879jykl5g7yqip5l88j0jcq";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://code.haskell.org/QuickCheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
deleted file mode 100644
index 0ed56838435..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.6";
-  sha256 = "03cp7mshjy2yrg31i13b9kmc2a6lrmrbl1sh9s8lswcj305c00c0";
-  buildDepends = [ random ];
-  meta = {
-    homepage = "http://code.haskell.org/QuickCheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
deleted file mode 100644
index 26115cb8814..00000000000
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, random, testFramework, tfRandom, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "QuickCheck";
-  version = "2.7.5";
-  sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb";
-  buildDepends = [ random tfRandom transformers ];
-  testDepends = [ testFramework ];
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/nick8325/quickcheck";
-    description = "Automatic testing of Haskell programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix
index 3c623e9f0dd..3c623e9f0dd 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/default.nix
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 61c2d0fb225..53655d46765 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -1,20 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG
-, monadcryptorandom, pureMD5, QuickCheck, SHA, tagged
-, testFramework, testFrameworkQuickcheck2
+{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG, pureMD5
+, QuickCheck, SHA, tagged, testFramework, testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "2.0.0";
-  sha256 = "1v2d6sxpqr0lmiqdr3ym5qzp3p1y57yj6939vdlsac6k6ifj6pwq";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary cryptoApi cryptoPubkeyTypes DRBG monadcryptorandom pureMD5
-    QuickCheck SHA tagged testFramework testFrameworkQuickcheck2
-  ];
+  version = "2.1.0";
+  sha256 = "0bhnnz7vp1942ac2vg0y6vsag9bm0pslnm4ix6lmw28hy6d1jk2a";
+  buildDepends = [ binary cryptoApi cryptoPubkeyTypes pureMD5 SHA ];
   testDepends = [
     binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA
     tagged testFramework testFrameworkQuickcheck2
diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix
new file mode 100644
index 00000000000..5380cb59659
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Rasterific/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity
+, free, JuicyPixels, mtl, primitive, QuickCheck, statistics, vector
+, vectorAlgorithms
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Rasterific";
+  version = "0.4";
+  sha256 = "1cw8lalxp9cs3w3kfr4ayp5h0kd71fdnyih99xpljy8zxw28hv3z";
+  buildDepends = [
+    dlist FontyFruity free JuicyPixels mtl primitive vector
+    vectorAlgorithms
+  ];
+  testDepends = [
+    binary criterion deepseq filepath FontyFruity JuicyPixels
+    QuickCheck statistics vector
+  ];
+  doCheck = false;
+  meta = {
+    description = "A pure haskell drawing engine";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix
index 484aacb91f0..c9f10744976 100644
--- a/pkgs/development/libraries/haskell/ReadArgs/default.nix
+++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix
@@ -4,12 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "ReadArgs";
-  version = "1.2.1";
-  sha256 = "099gg6nq70yf2pl5ya8f083lw8x5rncnv54y2p5jlkdwfwmpmbnv";
+  version = "1.2.2";
+  sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ systemFilepath text ];
   testDepends = [ hspec systemFilepath text ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/rampion/ReadArgs";
     description = "Simple command line argument parsing";
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
index 03d21bbba3c..b4bd9b44e3f 100644
--- a/pkgs/development/libraries/haskell/StateVar/default.nix
+++ b/pkgs/development/libraries/haskell/StateVar/default.nix
@@ -4,10 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "StateVar";
-  version = "1.0.0.0";
-  sha256 = "1c1b6a6nn1cdnba08zzp0645wl482h7yaa69zw2l3wwyyyccjic4";
+  version = "1.0.1.0";
+  sha256 = "02n2sxxkr0ydc77dc3amwp5jrw289d2s2z55rhrmhxxg1c7lp5js";
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "https://github.com/haskell-opengl/StateVar";
     description = "State variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
index 55c110b7521..8b5869caae9 100644
--- a/pkgs/development/libraries/haskell/Tensor/default.nix
+++ b/pkgs/development/libraries/haskell/Tensor/default.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "Tensor";
-  version = "1.0.0.1";
-  sha256 = "10arhk5gkn5jxpb53r80bblpk0afdax1fc2mik40hj5g5g960cp9";
+  version = "1.1.0.0";
+  sha256 = "1vn409805p5b47v5mf7rk0gypqag5bn1pzlsmsp9blr3jyj6dgph";
   meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
+    homepage = "https://github.com/haskell-opengl/Tensor";
     description = "Tensor data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix
index 6e37fe2ca49..bbd5f45f9ca 100644
--- a/pkgs/development/libraries/haskell/Thrift/default.nix
+++ b/pkgs/development/libraries/haskell/Thrift/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings for the Apache Thrift RPC system";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix
index baabbbc6546..c776686509b 100644
--- a/pkgs/development/libraries/haskell/Unixutils/default.nix
+++ b/pkgs/development/libraries/haskell/Unixutils/default.nix
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4";
   buildDepends = [ filepath pureMD5 regexTdfa zlib ];
   meta = {
-    homepage = "http://src.seereason.com/haskell-unixutils";
+    homepage = "https://github.com/seereason/haskell-unixutils";
     description = "A crude interface between Haskell and Unix-like operating systems";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/WAVE/default.nix b/pkgs/development/libraries/haskell/WAVE/default.nix
new file mode 100644
index 00000000000..6082f5e76cf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/WAVE/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, parseargs }:
+
+cabal.mkDerivation (self: {
+  pname = "WAVE";
+  version = "0.1.3";
+  sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ parseargs ];
+  meta = {
+    homepage = "http://github.com/BartMassey/WAVE";
+    description = "WAVE audio file IO library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix
index a4d1ea666a2..5ae451f8163 100644
--- a/pkgs/development/libraries/haskell/Yampa/default.nix
+++ b/pkgs/development/libraries/haskell/Yampa/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Yampa";
-  version = "0.9.5";
-  sha256 = "0r6fm2ccls7gbc5s0vbrzrqv6marnzlzc7zr4afkgfk9jsqfmqjh";
+  version = "0.9.6";
+  sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0";
   buildDepends = [ random ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Yampa";
diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
index c7067dd6602..ab2e682fdc8 100644
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "acid-state";
-  version = "0.12.2";
-  sha256 = "0hwi2254bj84djxmah23vy3xw8binh75fsn8ac6y89rwc8i35w1f";
+  version = "0.12.3";
+  sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1";
   buildDepends = [
     cereal extensibleExceptions filepath mtl network safecopy stm
   ];
diff --git a/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix b/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
new file mode 100644
index 00000000000..6b2a9856a90
--- /dev/null
+++ b/pkgs/development/libraries/haskell/acme-lookofdisapproval/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "acme-lookofdisapproval";
+  version = "0.1";
+  sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
+  meta = {
+    homepage = "https://github.com/llelf/acme-lookofdisapproval";
+    description = "Express your disapproval";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index a13113cde4e..02764c108f8 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.16";
-  sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k";
+  version = "0.1.0.17";
+  sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace
diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
index d53d11385f4..72c53b5178a 100644
--- a/pkgs/development/libraries/haskell/ad/default.nix
+++ b/pkgs/development/libraries/haskell/ad/default.nix
@@ -1,17 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
-, nats, reflection, tagged, transformers
+{ cabal, comonad, dataReify, doctest, erf, filepath, free, nats
+, reflection, tagged, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ad";
-  version = "4.2.0.1";
-  sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz";
+  version = "4.2.1.1";
+  sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka";
   buildDepends = [
-    comonad dataReify erf free mtl nats reflection tagged transformers
+    comonad dataReify erf free nats reflection tagged transformers
   ];
-  testDepends = [ doctest filepath mtl ];
+  testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/ad";
     description = "Automatic Differentiation";
diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix
index 7bc2beb3b30..8e1959c401c 100644
--- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-pretty";
-  version = "0.7.1";
-  sha256 = "0gmm1kmdbanfyfdyij1gnazycp1x9703qfa5hgrz39j9046zg3y6";
+  version = "0.7.2";
+  sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
index 2090a20fa8d..d7c86d853fa 100644
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-qq";
-  version = "0.7.2";
-  sha256 = "1h4agwl8kr6qpy4775pxmaizhlzbwjqb23pxn2vvz9wbm2vnixwk";
+  version = "0.7.4";
+  sha256 = "0wnc9pdjvd15gfkdxzf084393vwmxv2xaxdchzgal1qhwa1mak4v";
   buildDepends = [ aeson haskellSrcMeta parsec text vector ];
   testDepends = [ aeson haskellSrcMeta hspec parsec text vector ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix
index db783c012bc..ee0df96618c 100644
--- a/pkgs/development/libraries/haskell/aeson-utils/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-utils/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for working with Aeson";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
deleted file mode 100644
index b5626f63932..00000000000
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
-, mtl, QuickCheck, scientific, syb, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
-, unorderedContainers, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "aeson";
-  version = "0.7.0.6";
-  sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
-  buildDepends = [
-    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
-    text time unorderedContainers vector
-  ];
-  testDepends = [
-    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time unorderedContainers vector
-  ];
-  meta = {
-    homepage = "https://github.com/bos/aeson";
-    description = "Fast JSON parsing and encoding";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
index de9708f2546..0625dcf1913 100644
--- a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix
+++ b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.8.0.0";
-  sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4";
+  version = "0.8.0.2";
+  sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
     text time unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix
index 1e054a1cdb4..2044c8ad872 100644
--- a/pkgs/development/libraries/haskell/algebra/default.nix
+++ b/pkgs/development/libraries/haskell/algebra/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "algebra";
-  version = "4.1";
-  sha256 = "1wcwpngaqnr9w89p5dycmpsaihdwqqrs2vjap6jfwrscq16yyyc6";
+  version = "4.2";
+  sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
   buildDepends = [
     adjunctions distributive mtl nats semigroupoids semigroups tagged
     transformers void
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index ecacc374e43..26fbb43ec04 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ansi-terminal";
-  version = "0.6.1.1";
-  sha256 = "06pdcpp2z7wk9mkr5lzwk64lqhj09c7l1ah4s3vz7zwrdzfaccwi";
+  version = "0.6.2.1";
+  sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln";
   isLibrary = true;
   isExecutable = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix
index 758d1a90d3b..2d282fae022 100644
--- a/pkgs/development/libraries/haskell/ariadne/default.nix
+++ b/pkgs/development/libraries/haskell/ariadne/default.nix
@@ -1,24 +1,32 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, bert, Cabal, haskellNames, haskellPackages, haskellSrcExts
-, mtl, utf8String
+{ cabal, async, bert, Cabal, dataLens, dataLensFd, dataLensTemplate
+, filepath, haskellNames, haskellPackages, haskellSrcExts, hseCpp
+, hslogger, mtl, stm, tagged, tasty, tastyHunit, transformers
+, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "ariadne";
-  version = "0.1.2.1";
-  sha256 = "1gx6jrv3s86h02cjx8pvqyklp445ljiysx29hg39qykyhi1q5a3z";
+  version = "0.1.2.3";
+  sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    bert Cabal haskellNames haskellPackages haskellSrcExts mtl
-    utf8String
+    async bert Cabal dataLens dataLensFd dataLensTemplate filepath
+    haskellNames haskellPackages haskellSrcExts hseCpp hslogger mtl stm
+    tagged transformers utf8String
   ];
+  testDepends = [
+    bert filepath haskellSrcExts tasty tastyHunit utf8String
+  ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/feuerbach/ariadne";
     description = "Go-to-definition for Haskell";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
index 1cc87f5ce5e..cb35f70d1b5 100644
--- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
@@ -1,14 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, asn1Types, mtl, text, time }:
+{ cabal, asn1Types, hourglass, mtl, tasty, tastyQuickcheck, text }:
 
 cabal.mkDerivation (self: {
   pname = "asn1-encoding";
-  version = "0.8.1.3";
-  sha256 = "000rajx9gdxfyx521yg2mvp1z8h61sr96w1lzwawiw7n5ng6v8ni";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ asn1Types mtl text time ];
+  version = "0.9.0";
+  sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p";
+  buildDepends = [ asn1Types hourglass mtl ];
+  testDepends = [
+    asn1Types hourglass mtl tasty tastyQuickcheck text
+  ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/vincenthz/hs-asn1";
     description = "ASN1 data reader and writer in RAW, BER and DER forms";
diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix
index 5786823ce7b..5d6bf33bb26 100644
--- a/pkgs/development/libraries/haskell/asn1-parse/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, asn1Encoding, asn1Types, mtl, text, time }:
+{ cabal, asn1Encoding, asn1Types, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "asn1-parse";
-  version = "0.8.1";
-  sha256 = "021mbm5aayfx9vhxq4x1jj3gpnzq0bqaqcl1zsaa2a6l0qzpnmh9";
-  buildDepends = [ asn1Encoding asn1Types mtl text time ];
+  version = "0.9.0";
+  sha256 = "0m093wwndyxvy72qlnb70bp8w5ahimrlv1dp972l9s9l5jc4pjg3";
+  buildDepends = [ asn1Encoding asn1Types mtl text ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-asn1";
     description = "Simple monadic parser for ASN1 stream types";
diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix
index ad9492bf3fa..d2566add400 100644
--- a/pkgs/development/libraries/haskell/asn1-types/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-types/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, time }:
+{ cabal, hourglass }:
 
 cabal.mkDerivation (self: {
   pname = "asn1-types";
-  version = "0.2.3";
-  sha256 = "1cdzhj6zls6qmy82218cj2a25b7rkxsjbcqnx4zng3wp6s5pghw4";
-  buildDepends = [ time ];
+  version = "0.3.0";
+  sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r";
+  buildDepends = [ hourglass ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-asn1-types";
     description = "ASN.1 types";
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
deleted file mode 100644
index a60830309e7..00000000000
--- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, stm, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "async";
-  version = "2.0.1.3";
-  sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh";
-  buildDepends = [ stm ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  jailbreak = true;
-  meta = {
-    homepage = "https://github.com/simonmar/async";
-    description = "Run IO operations asynchronously and wait for their results";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.6.nix
index a4251e9e80b..6c1aed15eab 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.5.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.6.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "async";
-  version = "2.0.1.5";
-  sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd";
+  version = "2.0.1.6";
+  sha256 = "06fzkqjliccxqiygms7v1xff3wlkg54n9xwzv7m1yxylkzlikjkz";
   buildDepends = [ stm ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
index 466a4429091..5a84686d3a4 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.6.0.6";
-  sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb";
+  version = "0.6.1";
+  sha256 = "1j8slmqsyhvx7xns1qpvbmcjsfqfkphycv32hgcmk17wl1fzbyi7";
   buildDepends = [ primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix
index 9ee9ecd7a28..6e69e361585 100644
--- a/pkgs/development/libraries/haskell/atto-lisp/default.nix
+++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "atto-lisp";
-  version = "0.2.1.2";
-  sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg";
+  version = "0.2.2";
+  sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual deepseq text
   ];
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
deleted file mode 100644
index e322f6de4ce..00000000000
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "attoparsec";
-  version = "0.11.3.4";
-  sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi";
-  buildDepends = [ deepseq scientific text ];
-  testDepends = [
-    QuickCheck testFramework testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "https://github.com/bos/attoparsec";
-    description = "Fast combinator parsing for bytestrings and text";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
index b8e2104f739..a6083866248 100644
--- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.2.nix
@@ -1,17 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, deepseq, QuickCheck, scientific, testFramework
-, testFrameworkQuickcheck2, text
+, testFrameworkQuickcheck2, text, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.12.1.1";
-  sha256 = "0whj2wscw9pdf6avnhnqiapsllh6228j4hifyfvr4v0w663plh7p";
+  version = "0.12.1.2";
+  sha256 = "1vazyr3fdahdg1q503sbj0zv4xj7sm7j32mjm856bm51j2s0rhlc";
   buildDepends = [ deepseq scientific text ];
   testDepends = [
     deepseq QuickCheck scientific testFramework
-    testFrameworkQuickcheck2 text
+    testFrameworkQuickcheck2 text vector
   ];
   meta = {
     homepage = "https://github.com/bos/attoparsec";
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
index ae996df0d5b..a6f46415683 100644
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes
     dataDefault httpClient httpTypes random RSA SHA time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/yesodweb/authenticate";
     description = "Library to authenticate with OAuth for Haskell web applications";
diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
index e047e938dae..3ca15089244 100644
--- a/pkgs/development/libraries/haskell/auto-update/default.nix
+++ b/pkgs/development/libraries/haskell/auto-update/default.nix
@@ -1,12 +1,11 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hspec }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "auto-update";
-  version = "0.1.1.2";
-  sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6";
-  testDepends = [ hspec ];
+  version = "0.1.2";
+  sha256 = "0ccix41jjpqkzvnfr5md1cbhsa9fkv6dy7yw73j8dnvqbqnz1z0l";
   meta = {
     homepage = "https://github.com/yesodweb/wai";
     description = "Efficiently run periodic, on-demand actions";
diff --git a/pkgs/development/libraries/haskell/aws-ec2/default.nix b/pkgs/development/libraries/haskell/aws-ec2/default.nix
new file mode 100644
index 00000000000..8fec25eb9cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aws-ec2/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, aws, base16Bytestring, base64Bytestring
+, blazeBuilder, byteable, conduitExtra, cryptohash, httpConduit
+, httpTypes, mtl, optparseApplicative, resourcet, scientific, text
+, time, unorderedContainers, vector, xmlConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "aws-ec2";
+  version = "0.2.2";
+  sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aws base16Bytestring base64Bytestring blazeBuilder byteable
+    conduitExtra cryptohash httpConduit httpTypes mtl
+    optparseApplicative resourcet scientific text time
+    unorderedContainers vector xmlConduit
+  ];
+  meta = {
+    homepage = "https://github.com/zalora/aws-ec2";
+    description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index 3df47d95618..1069c9da1e9 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -3,16 +3,17 @@
 { cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
 , blazeBuilder, byteable, caseInsensitive, cereal, conduit
 , conduitExtra, cryptohash, dataDefault, errors, filepath
-, httpConduit, httpTypes, liftedBase, monadControl, mtl, network
-, QuickCheck, quickcheckInstances, resourcet, safe, scientific
-, tagged, tasty, tastyQuickcheck, text, time, transformers
-, unorderedContainers, utf8String, vector, xmlConduit
+, httpClient, httpConduit, httpTypes, liftedBase, monadControl, mtl
+, network, QuickCheck, quickcheckInstances, resourcet, safe
+, scientific, tagged, tasty, tastyQuickcheck, text, time
+, transformers, transformersBase, unorderedContainers, utf8String
+, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.10.3";
-  sha256 = "042vx5nhafvgw0crymkw8pyhiawhpxwj03n1k538y2wr181hmz5f";
+  version = "0.11";
+  sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,9 +24,11 @@ cabal.mkDerivation (self: {
     unorderedContainers utf8String vector xmlConduit
   ];
   testDepends = [
-    aeson errors mtl QuickCheck quickcheckInstances tagged tasty
-    tastyQuickcheck text transformers
+    aeson errors httpClient liftedBase monadControl mtl QuickCheck
+    quickcheckInstances resourcet tagged tasty tastyQuickcheck text
+    time transformers transformersBase
   ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://github.com/aristidb/aws";
diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix
index 824576293f4..a44cdbfa6c1 100644
--- a/pkgs/development/libraries/haskell/base-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/base-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "base-prelude";
-  version = "0.1.3";
-  sha256 = "07s5j538zxd0hlazqqbz4nwa82rcrmv25v7jr6nxafmgn83mkqhx";
+  version = "0.1.11";
+  sha256 = "0g6p1d3r6jbqcd8flxfbasb40ga7k90bc0q07drwhlaiadjnx1an";
   meta = {
     homepage = "https://github.com/nikita-volkov/base-prelude";
     description = "The most complete prelude formed from only the \"base\" package";
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index ab462229aa5..5cbd6c9fe14 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "basic-prelude";
-  version = "0.3.8";
-  sha256 = "0lywnsds0q1nr466s3pc2izfr58kp23z7ing9k7dlgbmh9cqxypg";
+  version = "0.3.10";
+  sha256 = "10013ni7kpqlc6s3ryfvmklw3ic5h48rm4wsrb31pcp5xja0qk59";
   buildDepends = [
     hashable liftedBase ReadArgs safe systemFilepath text transformers
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/bencode/default.nix b/pkgs/development/libraries/haskell/bencode/default.nix
new file mode 100644
index 00000000000..2d4630dc867
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bencode/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "bencode";
+  version = "0.5";
+  sha256 = "018cj7h5llvnqyr1jd9nif2ig9hz8d8vmi9iax07all567yhy378";
+  buildDepends = [ binary parsec ];
+  meta = {
+    description = "Parser and printer for bencoded data";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix
index a9521076bd7..953407735e6 100644
--- a/pkgs/development/libraries/haskell/bert/default.nix
+++ b/pkgs/development/libraries/haskell/bert/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bert";
-  version = "1.2.2.2";
-  sha256 = "0bjrqgm0dpsrk1nivxmw2wvx33v7z7swgy3p5fb51vg7y81776cz";
+  version = "1.2.2.3";
+  sha256 = "1waq40hd9wqavzhnvfk1i6wjqkmfb4pl17h4acfzzyz8bj76alkq";
   buildDepends = [
     binary binaryConduit conduit conduitExtra mtl network parsec time
     void
diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
index 8bbfddd781a..78a34c53b37 100644
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ b/pkgs/development/libraries/haskell/bifunctors/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bifunctors";
-  version = "4.1.1.1";
-  sha256 = "0b31q6ypndaj6fa9cnkld5k0x3lncp9i28vfkkh6vv4jnnjd6pqi";
+  version = "4.2";
+  sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6";
   buildDepends = [ semigroupoids semigroups tagged ];
   meta = {
     homepage = "http://github.com/ekmett/bifunctors/";
diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
index 37774c1a16a..c7547a7b12b 100644
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix
@@ -6,14 +6,15 @@
 
 cabal.mkDerivation (self: {
   pname = "binary-conduit";
-  version = "1.2.2";
-  sha256 = "12dgqydc4zj1ffrcfqpd1dg40dc9hpynj1j69611kzpcqbj275pf";
+  version = "1.2.3";
+  sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
   buildDepends = [ binary conduit resourcet vector ];
   testDepends = [
     binary conduit hspec QuickCheck quickcheckAssertions resourcet
   ];
+  jailbreak = true;
   meta = {
-    homepage = "http://github.com/qnikst/binary-conduit";
+    homepage = "http://github.com/qnikst/binary-conduit/";
     description = "data serialization/deserialization conduit library";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/binary-strict/default.nix b/pkgs/development/libraries/haskell/binary-strict/default.nix
new file mode 100644
index 00000000000..e62fd782ad9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/binary-strict/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "binary-strict";
+  version = "0.4.8.1";
+  sha256 = "07mmh4x8qjpw7w35nxcq8wayy4bagjblbwkpvh3xd38rxpdnl6pi";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/binary-low-level";
+    description = "Binary deserialisation using strict ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix
deleted file mode 100644
index 06aca17cde3..00000000000
--- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "binary";
-  version = "0.6.1.0";
-  sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js";
-  meta = {
-    homepage = "https://github.com/kolmodin/binary";
-    description = "Binary serialisation for Haskell values using lazy ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix
index b8803868cd1..60eaf0e0031 100644
--- a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix
+++ b/pkgs/development/libraries/haskell/binary/0.7.2.2.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "binary";
-  version = "0.7.2.1";
-  sha256 = "0s0idmcmribgajxxnxdvppnz62qyxwrj9iy34pi7nvm41gj6q5nz";
+  version = "0.7.2.2";
+  sha256 = "10z1b9axgfg9kb44b8sfxd5mak5qaqyjfwn4i21y37zgf7wadblr";
   testDepends = [
     Cabal filepath HUnit QuickCheck random testFramework
     testFrameworkQuickcheck2
diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix
index 1c2538dba17..e6f42924588 100644
--- a/pkgs/development/libraries/haskell/bindings-libusb/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-libusb/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-libusb";
-  version = "1.4.4.1";
-  sha256 = "1cip5a0n8svjkzawpx3wi9z7nywmn9bl3k2w559b3awy0wixybrx";
+  version = "1.4.5.0";
+  sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
   buildDepends = [ bindingsDSL ];
   pkgconfigDepends = [ libusb ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix
new file mode 100644
index 00000000000..6ae304d6c75
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bindingsDSL, portaudio }:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-portaudio";
+  version = "0.1";
+  sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2";
+  buildDepends = [ bindingsDSL ];
+  pkgconfigDepends = [ portaudio ];
+  meta = {
+    description = "Low-level bindings to portaudio library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bitset/default.nix b/pkgs/development/libraries/haskell/bitset/default.nix
new file mode 100644
index 00000000000..dfb71a978cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bitset/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, deepseq, gmp, QuickCheck, tasty, tastyQuickcheck }:
+
+cabal.mkDerivation (self: {
+  pname = "bitset";
+  version = "1.4.8";
+  sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
+  buildDepends = [ deepseq ];
+  testDepends = [ QuickCheck tasty tastyQuickcheck ];
+  extraLibraries = [ gmp ];
+  doCheck = false;
+  meta = {
+    description = "A space-efficient set data structure";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/blank-canvas/default.nix b/pkgs/development/libraries/haskell/blank-canvas/default.nix
new file mode 100644
index 00000000000..47c343f49b8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blank-canvas/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, base64Bytestring, colour, dataDefaultClass
+, httpTypes, kansasComet, scotty, stm, text, transformers, vector
+, wai, waiExtra, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "blank-canvas";
+  version = "0.5";
+  sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+  buildDepends = [
+    aeson base64Bytestring colour dataDefaultClass httpTypes
+    kansasComet scotty stm text transformers vector wai waiExtra warp
+  ];
+  meta = {
+    homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
+    description = "HTML5 Canvas Graphics Library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index c031633c233..4dd5376cad3 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder";
-  version = "0.3.3.2";
-  sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40";
+  version = "0.3.3.4";
+  sha256 = "12xgmi8bc3h3cfk31rrfaklmwvyxgdwzwmxzw22yxd0dd8g11hg5";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/meiersi/blaze-builder";
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index e29b4c02521..16c967d78a2 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.7.0.2";
-  sha256 = "0yqgm5nrryx0qlz9qhpbfxvkwjdbl9876v4gnn0src81j9dzcx2v";
+  version = "0.7.0.3";
+  sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   testDepends = [
     blazeBuilder blazeMarkup HUnit QuickCheck testFramework
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index d4b52d54436..cdea333abcd 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-markup";
-  version = "0.6.1.0";
-  sha256 = "0ydk34y1j8bssdiqw6m70383dh4khbcac3jd7fpr37cx7ighlp7l";
+  version = "0.6.1.1";
+  sha256 = "1ah6fgfqsmarq8g4gw81yhckz4pclb2ifxv237cqz5zhy9il4j5d";
   buildDepends = [ blazeBuilder text ];
   testDepends = [
     blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index b5d5bc74f80..82d45baf88a 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boomerang";
-  version = "1.4.3";
-  sha256 = "1i72mrl8n2cbrdi05zn37y1339r13vzvmrcc1zbkcak4c7r004zw";
+  version = "1.4.5";
+  sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q";
   buildDepends = [ mtl text ];
   meta = {
     description = "Library for invertible parsing and printing";
diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix
index 31e7b053add..dd1f288a1b9 100644
--- a/pkgs/development/libraries/haskell/bound/default.nix
+++ b/pkgs/development/libraries/haskell/bound/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bound";
-  version = "1.0.3";
-  sha256 = "0nfcxq87i9lzdkrg7g65cprn4rg9rhn9nyk2jpjh4c1rc7gdn0aq";
+  version = "1.0.4";
+  sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky";
   buildDepends = [
     bifunctors binary bytes cereal comonad hashable hashableExtras
     preludeExtras profunctors transformers
diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
deleted file mode 100644
index 205b05f30d8..00000000000
--- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, lens, linear, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, testFrameworkTh
-}:
-
-cabal.mkDerivation (self: {
-  pname = "boundingboxes";
-  version = "0.1.1";
-  sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0";
-  buildDepends = [ lens linear ];
-  testDepends = [
-    lens linear QuickCheck random testFramework
-    testFrameworkQuickcheck2 testFrameworkTh
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/fumieval/boundingboxes";
-    description = "The type for 2D bounding box";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/default.nix
index 686f4ffbbab..ab5cfabad44 100644
--- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
+++ b/pkgs/development/libraries/haskell/boundingboxes/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boundingboxes";
-  version = "0.2";
-  sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp";
+  version = "0.2.2";
+  sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx";
   buildDepends = [ lens ];
   testDepends = [
     lens linear QuickCheck random testFramework
@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
   doCheck = false;
   meta = {
     homepage = "https://github.com/fumieval/boundingboxes";
-    description = "The type for 2D bounding box";
+    description = "A generic boundingbox for an arbitrary vector";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix
index 4a2be6244e7..1e12288624f 100644
--- a/pkgs/development/libraries/haskell/bv/default.nix
+++ b/pkgs/development/libraries/haskell/bv/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bv";
-  version = "0.2.2";
-  sha256 = "0d5hscjakp7dwifa4l8xikyip45y402kf9pbmpfmmnybja23zhg0";
+  version = "0.3.0";
+  sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
   isLibrary = true;
   isExecutable = true;
   meta = {
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
     description = "Bit-vector arithmetic library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix
index 4a8877b6a59..1ad3446bd0c 100644
--- a/pkgs/development/libraries/haskell/bytes/default.nix
+++ b/pkgs/development/libraries/haskell/bytes/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytes";
-  version = "0.14.1";
-  sha256 = "023sdwdirvigrdg03f6jrdndm6pkqsmsrwz9ji57dpqg4f5k9jzk";
+  version = "0.14.1.2";
+  sha256 = "1v1nnp1m5i4bfr0fshbps163v6yn6var53p0vcvav6g4w5wffd7d";
   buildDepends = [
     binary cereal mtl text time transformers transformersCompat void
   ];
diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
index c8a4143e217..da84b55cc0f 100644
--- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-trie";
-  version = "0.2.3";
-  sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga";
+  version = "0.2.4";
+  sha256 = "1fv3xh52hqhzdbq78c3lrgx5vd49cabwp9ww5ki1888zlq29pyck";
   buildDepends = [ binary ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
deleted file mode 100644
index 95ead17f01f..00000000000
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, HUnit, languageC, shelly, testFramework
-, testFrameworkHunit, text, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "c2hs";
-  version = "0.17.2";
-  sha256 = "1xrk0izdy5akjgmg9k4l9ccmmgv1avwh152pfpc1xm2rrwrg4bxk";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath languageC ];
-  testDepends = [
-    filepath HUnit shelly testFramework testFrameworkHunit text yaml
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/haskell/c2hs";
-    description = "C->Haskell FFI tool that gives some cross-language type safety";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/libraries/haskell/c2hsc/default.nix
deleted file mode 100644
index cf56c0bf545..00000000000
--- a/pkgs/development/libraries/haskell/c2hsc/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, filepath, HStringTemplate, languageC, mtl, split
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "c2hsc";
-  version = "0.6.5";
-  sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs filepath HStringTemplate languageC mtl split transformers
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/c2hsc";
-    description = "Convert C API header files to .hsc and .hsc.helper.c files";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
index a74e54f7e43..ba535cd13b2 100644
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-cargs";
-  version = "0.7.1";
-  sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n";
+  version = "0.7.5";
+  sha256 = "0z17s4w9wlmdqbzh0c1jwqfp4d6599hqv0r4dzm9djb0x8vj327k";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index b5427b3b747..256cba3734c 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -4,9 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-lenses";
-  version = "0.3.1";
-  sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7";
+  version = "0.4.2";
+  sha256 = "0vsicvk979qznm3b174r6d5wkkyhpqx8gxjs5jw9na2jhimzjcjf";
   buildDepends = [ Cabal lens unorderedContainers ];
+  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/cabalg/default.nix b/pkgs/development/libraries/haskell/cabalg/default.nix
new file mode 100644
index 00000000000..62dea42b3d5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabalg/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, doctest, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "cabalg";
+  version = "0.2.9";
+  sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath ];
+  testDepends = [ doctest filepath ];
+  meta = {
+    description = "alias for cabal install from given git repo";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ dmalikov ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index b77e3166354..8f64f23585c 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cairo";
-  version = "0.13.0.0";
-  sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92";
+  version = "0.13.0.5";
+  sha256 = "0ak6hzfrcyxajx7qybsmd5g26blqb6zxvv8r2a8bnylvm5sdj70r";
   buildDepends = [ mtl text utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ cairo libc pkgconfig zlib ];
diff --git a/pkgs/development/libraries/haskell/call/default.nix b/pkgs/development/libraries/haskell/call/default.nix
new file mode 100644
index 00000000000..c11a07ae94c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/call/default.nix
@@ -0,0 +1,30 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bindingsPortaudio, boundingboxes, cleanUnions, colors
+, controlBool, deepseq, distributive, elevator, filepath, freetype2
+, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens, linear
+, minioperational, mtl, objective, OpenGL, OpenGLRaw, random
+, reflection, text, transformers, vector, WAVE
+}:
+
+cabal.mkDerivation (self: {
+  pname = "call";
+  version = "0.1.1.2";
+  sha256 = "1g96asydq0lc07xf2c709zdv99r6ljs5a7jm6fvlyjswqnbrwy9s";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    bindingsPortaudio boundingboxes cleanUnions colors controlBool
+    deepseq distributive elevator filepath freetype2 GLFWB hashable
+    JuicyPixels JuicyPixelsUtil lens linear minioperational mtl
+    objective OpenGL OpenGLRaw random reflection text transformers
+    vector WAVE
+  ];
+  meta = {
+    homepage = "https://github.com/fumieval/call";
+    description = "The call game engine";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix
deleted file mode 100644
index 3f75b41bb63..00000000000
--- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, hashable, HUnit, testFramework
-, testFrameworkHunit, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "case-insensitive";
-  version = "1.1.0.3";
-  sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ HUnit testFramework testFrameworkHunit text ];
-  meta = {
-    homepage = "https://github.com/basvandijk/case-insensitive";
-    description = "Case insensitive string comparison";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
index c8c544610e3..96b5bc114a3 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.1.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "1.2.0.0";
-  sha256 = "0ybdmqaqh9hdl3dl5kx8qhs4b67g78fhnkqnd3y2lpgqjvhnbzp4";
+  version = "1.2.0.1";
+  sha256 = "1hnckzi6yq3332fx4b140lwa9p6x69rlpaw6y1pmldj2h9nsxl6m";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
index c8cb347f10a..0ae9782a33b 100644
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ b/pkgs/development/libraries/haskell/cassava/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cassava";
-  version = "0.4.1.0";
-  sha256 = "0whky3mavmprr8cgnzlg2ich99w09bdlks8rg6z9m1x86q66ivw2";
+  version = "0.4.2.0";
+  sha256 = "1v1izdjd4maqrlpm4cf2xpackpjp1i4vg1s7mzq90dwa6r9572x3";
   buildDepends = [
     attoparsec blazeBuilder deepseq text unorderedContainers vector
   ];
diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
index e15d10bd45b..baad2943358 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal-conduit";
-  version = "0.7.2.2";
-  sha256 = "1syqilka5rv2j3yp419f2wdrcfw8js6i2p7qif4yxvlkm2hkvzzk";
+  version = "0.7.2.3";
+  sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
   buildDepends = [ cereal conduit resourcet transformers ];
   testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index af77f37abdb..906222c3bbb 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal";
-  version = "0.4.0.1";
-  sha256 = "12g23cbjxxgh3xzv6hvs093zpycl29h8fmc7kv6jx43ws4cxy2jv";
+  version = "0.4.1.0";
+  sha256 = "0m0iwjf9bds4nwk1rgr19rvjri4kncn37k51l1n9y869r104b8lb";
   meta = {
     description = "A binary serialization library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
deleted file mode 100644
index 068d1b7dadf..00000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.1.7.1";
-  sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339";
-  buildDepends = [ mtl network parsec xhtml ];
-  meta = {
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
deleted file mode 100644
index c10fa2416f7..00000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, network, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.1.7.2";
-  sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39";
-  buildDepends = [ mtl network parsec xhtml ];
-  meta = {
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
deleted file mode 100644
index 7cb7e77dd77..00000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.1.7.3";
-  sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0";
-  buildDepends = [ extensibleExceptions mtl network parsec xhtml ];
-  meta = {
-    homepage = "http://andersk.mit.edu/haskell/cgi/";
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
deleted file mode 100644
index 6071ecc7597..00000000000
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }:
-
-cabal.mkDerivation (self: {
-  pname = "cgi";
-  version = "3001.1.7.4";
-  sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd";
-  buildDepends = [ extensibleExceptions mtl network parsec xhtml ];
-  meta = {
-    homepage = "http://andersk.mit.edu/haskell/cgi/";
-    description = "A library for writing CGI programs";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
index 31d523717c5..2bacef96e08 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }:
+{ cabal, exceptions, mtl, network, networkUri, parsec, xhtml }:
 
 cabal.mkDerivation (self: {
   pname = "cgi";
-  version = "3001.1.8.5";
-  sha256 = "0ffvn9ki5yq2zc65afmy04353v4s66lajc7y563fhj2kz5ib5ks6";
-  buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ];
+  version = "3001.2.0.0";
+  sha256 = "03az978d5ayv5v4g89h4wajjhcribyf37b8ws8kvsqir3i7h7k8d";
+  buildDepends = [ exceptions mtl network networkUri parsec xhtml ];
   meta = {
-    homepage = "http://andersk.mit.edu/haskell/cgi/";
+    homepage = "https://github.com/cheecheeo/haskell-cgi";
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix
index e19cac2b2ec..91f7920fcea 100644
--- a/pkgs/development/libraries/haskell/cgrep/default.nix
+++ b/pkgs/development/libraries/haskell/cgrep/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cgrep";
-  version = "6.4.6";
-  sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s";
+  version = "6.4.9";
+  sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
new file mode 100644
index 00000000000..39571e4a87c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "charsetdetect-ae";
+  version = "1.0.1";
+  sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna";
+  meta = {
+    homepage = "http://github.com/Aelve/charsetdetect-ae";
+    description = "Character set detection using Mozilla's Universal Character Set Detector";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/chaselev-deque/default.nix b/pkgs/development/libraries/haskell/chaselev-deque/default.nix
new file mode 100644
index 00000000000..0b271ce5f68
--- /dev/null
+++ b/pkgs/development/libraries/haskell/chaselev-deque/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, abstractDeque, abstractDequeTests, atomicPrimops
+, bitsAtomic, HUnit, testFramework, testFrameworkHunit
+, transformers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "chaselev-deque";
+  version = "0.5.0.3";
+  sha256 = "1qkrypqsbfnr6kcl6idqmq2z4nf6jmqmgzddzhh031nxd22p18y6";
+  buildDepends = [
+    abstractDeque atomicPrimops bitsAtomic transformers vector
+  ];
+  testDepends = [
+    abstractDeque abstractDequeTests atomicPrimops HUnit testFramework
+    testFrameworkHunit vector
+  ];
+  meta = {
+    homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
+    description = "Chase & Lev work-stealing lock-free double-ended queues (deques)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix
index 9ad35360fe6..7d96433a588 100644
--- a/pkgs/development/libraries/haskell/cheapskate/default.nix
+++ b/pkgs/development/libraries/haskell/cheapskate/default.nix
@@ -1,18 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate
-, xssSanitize
+{ cabal, aeson, blazeHtml, dataDefault, httpTypes, mtl, syb, text
+, uniplate, wai, waiExtra, xssSanitize
 }:
 
 cabal.mkDerivation (self: {
   pname = "cheapskate";
-  version = "0.1.0.1";
-  sha256 = "0slrvbaamnwxx89kqjcr62058j00s2dw4c16q1swf817az2p66h8";
+  version = "0.1.0.2";
+  sha256 = "1bz3zi2w5vm128csg21swcz4cm7h8ybqylpknr4fnyxmg3gxdd7d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml dataDefault mtl syb text uniplate xssSanitize
+    aeson blazeHtml dataDefault httpTypes mtl syb text uniplate wai
+    waiExtra xssSanitize
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jgm/cheapskate";
     description = "Experimental markdown processor";
diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix
index fb7e86fc75f..65f9d20a19a 100644
--- a/pkgs/development/libraries/haskell/checkers/default.nix
+++ b/pkgs/development/libraries/haskell/checkers/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "checkers";
-  version = "0.3.2";
-  sha256 = "0v8i6754syvjh2p5qdqh95j3swkar9077gidsnahwk9h6qfsx6r3";
+  version = "0.4.1";
+  sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr";
   buildDepends = [ QuickCheck random ];
   meta = {
     description = "Check properties on standard classes and data structures";
diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index 7edfe750d37..32c4b878cff 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.2.8";
-  sha256 = "13hg8gxhs7hmni72kp14hmhvfv1kj7fnl83i72bz3aq15vx3z61z";
+  version = "0.2.9";
+  sha256 = "1nkrh8mrrh14zfhjz0lfidw0hw9c70hap9w24rvb14zgfnnasnlq";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index bb95e920ef9..5f7cce6b060 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "A Citation Style Language implementation in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/clash-lib/default.nix b/pkgs/development/libraries/haskell/clash-lib/default.nix
new file mode 100644
index 00000000000..40860d38911
--- /dev/null
+++ b/pkgs/development/libraries/haskell/clash-lib/default.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoparsec, concurrentSupply, contravariant
+, deepseq, errors, fgl, filepath, hashable, lens, ListLike, mtl
+, text, time, transformers, unbound, unorderedContainers
+, uuParsinglib, wlPprintText
+}:
+
+cabal.mkDerivation (self: {
+  pname = "clash-lib";
+  version = "0.4";
+  sha256 = "1c3bxjm356cs7wf49zlazbv44bw06rs81akmsfzkfccrl7gjy7yc";
+  buildDepends = [
+    aeson attoparsec concurrentSupply contravariant deepseq errors fgl
+    filepath hashable lens ListLike mtl text time transformers unbound
+    unorderedContainers uuParsinglib wlPprintText
+  ];
+  meta = {
+    homepage = "http://christiaanb.github.io/clash2";
+    description = "CAES Language for Synchronous Hardware - As a Library";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/clash-prelude/default.nix b/pkgs/development/libraries/haskell/clash-prelude/default.nix
new file mode 100644
index 00000000000..b463b957e87
--- /dev/null
+++ b/pkgs/development/libraries/haskell/clash-prelude/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefault, thLift }:
+
+cabal.mkDerivation (self: {
+  pname = "clash-prelude";
+  version = "0.6.0.1";
+  sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7";
+  buildDepends = [ dataDefault thLift ];
+  meta = {
+    homepage = "http://christiaanb.github.io/clash2/";
+    description = "CAES Language for Synchronous Hardware - Prelude library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index 28e940f3489..3c2d5c6655f 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.9.3";
-  sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr";
+  version = "0.10.2";
+  sha256 = "0bgic61p05hpnsami199wzs2q4cbdm00nyp03vsxz2ddsz8dwc8l";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void
diff --git a/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix b/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
new file mode 100644
index 00000000000..d615a6e63b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/classy-prelude-yesod/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, classyPrelude, classyPreludeConduit, dataDefault
+, httpConduit, httpTypes, persistent, yesod, yesodNewsfeed
+, yesodStatic
+}:
+
+cabal.mkDerivation (self: {
+  pname = "classy-prelude-yesod";
+  version = "0.10.2";
+  sha256 = "1jzf26rj9m8mdhhag66h5zbh91c7ff3jn1q1ghmah12dj9y06137";
+  buildDepends = [
+    aeson classyPrelude classyPreludeConduit dataDefault httpConduit
+    httpTypes persistent yesod yesodNewsfeed yesodStatic
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/classy-prelude";
+    description = "Provide a classy prelude including common Yesod functionality";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index e45a6f256b9..4cd9dc1dba3 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,19 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions
-, hashable, hspec, liftedBase, monoTraversable, QuickCheck
-, semigroups, stm, systemFilepath, text, time, transformers
-, unorderedContainers, vector, vectorInstances
+{ cabal, basicPrelude, bifunctors, chunkedData, enclosedExceptions
+, exceptions, hashable, hspec, liftedBase, monoTraversable, mtl
+, primitive, QuickCheck, semigroups, stm, systemFilepath, text
+, time, transformers, unorderedContainers, vector, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.9.3";
-  sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv";
+  version = "0.10.2";
+  sha256 = "0pq16rgksbv2ml4wg7jdxlb9y80h8la78hnrcci637s6kbdisd7k";
   buildDepends = [
-    basicPrelude chunkedData enclosedExceptions exceptions hashable
-    liftedBase monoTraversable semigroups stm systemFilepath text time
-    transformers unorderedContainers vector vectorInstances
+    basicPrelude bifunctors chunkedData enclosedExceptions exceptions
+    hashable liftedBase monoTraversable mtl primitive semigroups stm
+    systemFilepath text time transformers unorderedContainers vector
+    vectorInstances
   ];
   testDepends = [
     hspec QuickCheck transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix
index 8eafd67cadb..4e1b617c0b6 100644
--- a/pkgs/development/libraries/haskell/clay/default.nix
+++ b/pkgs/development/libraries/haskell/clay/default.nix
@@ -4,10 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "clay";
-  version = "0.9.0.1";
-  sha256 = "1w2617kpj6rblmycqb97gyshwbvzp5w2h4xh494mvdzi3bkahqpn";
+  version = "0.10";
+  sha256 = "0xw7j9v2cfs4874l5n852b38m6v2mpkbr93dxxfkp2kwmqkjbl5v";
   buildDepends = [ mtl text ];
   testDepends = [ HUnit mtl testFramework testFrameworkHunit text ];
+  jailbreak = true;
   meta = {
     homepage = "http://fvisser.nl/clay";
     description = "CSS preprocessor as embedded Haskell";
diff --git a/pkgs/development/libraries/haskell/clean-unions/default.nix b/pkgs/development/libraries/haskell/clean-unions/default.nix
new file mode 100644
index 00000000000..9ec71da8eec
--- /dev/null
+++ b/pkgs/development/libraries/haskell/clean-unions/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "clean-unions";
+  version = "0.1.1";
+  sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
+  meta = {
+    homepage = "https://github.com/fumieval/clean-unions";
+    description = "Open unions without need for Typeable";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index cee91c51be0..6fcecac9eb5 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -1,17 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi
-, cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged
-, transformers
+, cryptoRandom, entropy, hspec, HUnit, QuickCheck, setenv, skein
+, tagged, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.9.0.5";
-  sha256 = "0l11wpxr3cgd8q708ay7957mdzq7nhm7c6z3p9iwl0lp3pkcl810";
+  version = "0.9.1.1";
+  sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
     base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom
-    entropy skein tagged
+    entropy setenv skein tagged
   ];
   testDepends = [ cereal hspec HUnit QuickCheck transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix
index 3c064d1db2d..e97195cb5fc 100644
--- a/pkgs/development/libraries/haskell/clock/default.nix
+++ b/pkgs/development/libraries/haskell/clock/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clock";
-  version = "0.4.0.1";
-  sha256 = "1bn6dalank30l680iifyam0mg9izxbyscgq0vmr1aw5brba5kv6j";
+  version = "0.4.1.3";
+  sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d";
   meta = {
     homepage = "http://corsis.github.com/clock/";
     description = "High-resolution clock functions: monotonic, realtime, cputime";
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 829f7be4fba..c4253944c6d 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.10.9";
-  sha256 = "12phn22iri2v65gbxzl580mikkj05rwx4sjn5c31f871wp0538my";
+  version = "0.10.12";
+  sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix
index 8943eacdd21..aa83ae1a0ec 100644
--- a/pkgs/development/libraries/haskell/cmdtheline/default.nix
+++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix
@@ -1,13 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit
-, transformers
+, transformers, fetchpatch
 }:
 
 cabal.mkDerivation (self: {
   pname = "cmdtheline";
   version = "0.2.3";
   sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
+  doCheck = false;
+  patches = [ (fetchpatch { url = "https://github.com/eli-frey/cmdtheline/pull/29.patch"; sha256 = "089rfvvjc44wnhph2ricpbz4iifhyvm1qzg8wsd596v81gy0zvrr"; }) ];
   buildDepends = [ filepath parsec transformers ];
   testDepends = [
     filepath HUnit parsec testFramework testFrameworkHunit transformers
@@ -18,6 +20,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix
index 77883f5a07a..92cc3f0f9d8 100644
--- a/pkgs/development/libraries/haskell/code-builder/default.nix
+++ b/pkgs/development/libraries/haskell/code-builder/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Simple system for generating code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix
index 2d4db2cdc4d..167637863ef 100644
--- a/pkgs/development/libraries/haskell/colors/default.nix
+++ b/pkgs/development/libraries/haskell/colors/default.nix
@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "colors";
-  version = "0.1.1";
-  sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm";
+  version = "0.2.0.1";
+  sha256 = "0xl7hdp1di8gl0g28vz2lm6pbj7hihdkfnr18843016736hll4qn";
   buildDepends = [ profunctors ];
   meta = {
     homepage = "https://github.com/fumieval/colors";
     description = "A type for colors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/compdata-param/default.nix b/pkgs/development/libraries/haskell/compdata-param/default.nix
new file mode 100644
index 00000000000..2ab1ecd9131
--- /dev/null
+++ b/pkgs/development/libraries/haskell/compdata-param/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, compdata, HUnit, mtl, testFramework, testFrameworkHunit
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "compdata-param";
+  version = "0.8.0.2";
+  sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
+  buildDepends = [ compdata mtl transformers ];
+  testDepends = [
+    compdata HUnit mtl testFramework testFrameworkHunit transformers
+  ];
+  meta = {
+    description = "Parametric Compositional Data Types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix
index 896496dc4a3..24e2569ad0e 100644
--- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix
+++ b/pkgs/development/libraries/haskell/concreteTyperep/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     binary hashable QuickCheck testFramework testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     description = "Binary and Hashable instances for TypeRep";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
index 43230662fe0..69c1d1edddc 100644
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
@@ -1,24 +1,22 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, baseUnicodeSymbols, HUnit, random, stm
-, testFramework, testFrameworkHunit, unboundedDelays
+{ cabal, async, HUnit, random, stm, testFramework
+, testFrameworkHunit, unboundedDelays
 }:
 
 cabal.mkDerivation (self: {
   pname = "concurrent-extra";
-  version = "0.7.0.8";
-  sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q";
-  buildDepends = [ baseUnicodeSymbols stm unboundedDelays ];
+  version = "0.7.0.9";
+  sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw";
+  buildDepends = [ stm unboundedDelays ];
   testDepends = [
-    async baseUnicodeSymbols HUnit random stm testFramework
-    testFrameworkHunit unboundedDelays
+    async HUnit random stm testFramework testFrameworkHunit
+    unboundedDelays
   ];
   meta = {
     homepage = "https://github.com/basvandijk/concurrent-extra";
     description = "Extra concurrency primitives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/concurrent-supply/default.nix b/pkgs/development/libraries/haskell/concurrent-supply/default.nix
new file mode 100644
index 00000000000..7b91f2f018b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/concurrent-supply/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hashable }:
+
+cabal.mkDerivation (self: {
+  pname = "concurrent-supply";
+  version = "0.1.7";
+  sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c";
+  buildDepends = [ hashable ];
+  meta = {
+    homepage = "http://github.com/ekmett/concurrent-supply/";
+    description = "A fast concurrent unique identifier supply with a pure API";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix
index 64b62db5ba8..4846e5cb61f 100644
--- a/pkgs/development/libraries/haskell/cond/default.nix
+++ b/pkgs/development/libraries/haskell/cond/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cond";
-  version = "0.4.1";
-  sha256 = "16xk8clsxv5qi5f745xvs44y8p8dnmlmjkjzwqz9jl8fbmkmki3b";
+  version = "0.4.1.1";
+  sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
   meta = {
     homepage = "https://github.com/kallisti-dev/cond";
     description = "Basic conditional and boolean operators with monadic variants";
diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 17598dda06b..0f237e12cb0 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -1,15 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit
-, conduitExtra, hspec, monadControl, monoTraversable, mwcRandom
-, primitive, resourcet, silently, systemFileio, systemFilepath
-, text, transformers, transformersBase, unixCompat, vector, void
+, conduitExtra, hspec, monadControl, monoTraversable, mtl
+, mwcRandom, primitive, QuickCheck, resourcet, safe, silently
+, systemFileio, systemFilepath, text, transformers
+, transformersBase, unixCompat, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.8.2";
-  sha256 = "1x2g333ygiv4jvwx4lw579kwx1z5m80cqfqgzv0pi5xdxcagy1ha";
+  version = "0.3.0.4";
+  sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet
@@ -17,8 +18,9 @@ cabal.mkDerivation (self: {
     unixCompat vector void
   ];
   testDepends = [
-    base16Bytestring base64Bytestring chunkedData hspec monoTraversable
-    mwcRandom silently systemFilepath text transformers vector
+    base16Bytestring base64Bytestring chunkedData conduit hspec
+    monoTraversable mtl mwcRandom QuickCheck safe silently
+    systemFilepath text transformers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/conduit-combinators";
diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 1cb2b0efe6c..8a551de3516 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.3.2";
-  sha256 = "15flywjw5ha8cgn4yznwlnx31ls4y82gfmvbniby0d51y4x8dmgq";
+  version = "1.1.5";
+  sha256 = "1i38n3pdibjpi9kg37wvv4m6krfbsdd4baik804ss2ml1ry7gm4p";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet stm streamingCommons text transformers
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     async attoparsec blazeBuilder conduit exceptions hspec resourcet
     stm text transformers transformersBase
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Batteries included conduit: adapters for common libraries";
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index f3c27ebae95..d0683175482 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,21 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
-, QuickCheck, resourcet, transformers, transformersBase, void
+{ cabal, exceptions, hspec, liftedBase, mmorph, mtl, QuickCheck
+, resourcet, safe, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.7";
-  sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6";
+  version = "1.2.3.1";
+  sha256 = "04n330f9iad6asmry81aqvb7wyh7b962d6pvcfnpm327z4llnvbq";
   buildDepends = [
-    exceptions liftedBase mmorph monadControl mtl resourcet
-    transformers transformersBase void
+    exceptions liftedBase mmorph mtl resourcet transformers
+    transformersBase void
   ];
   testDepends = [
-    exceptions hspec mtl QuickCheck resourcet transformers void
+    exceptions hspec mtl QuickCheck resourcet safe transformers void
   ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Streaming data processing library";
diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix
deleted file mode 100644
index 57423c1b71f..00000000000
--- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "convertible";
-  version = "1.0.11.1";
-  sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ mtl text time ];
-  meta = {
-    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
-    description = "Typeclasses and instances for converting between types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index fd8f6dac3a8..fd8f6dac3a8 100644
--- a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index 108fb48f939..abbafafa529 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -1,18 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, time
+, tasty, tastyHunit, tastyQuickcheck, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "cookie";
-  version = "0.4.1.3";
-  sha256 = "184ymp1pbi49fm4jl9s04dfyrgdbc9vlmqahqha4yncppr5s1sdw";
+  version = "0.4.1.4";
+  sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d";
   buildDepends = [ blazeBuilder dataDefault deepseq text time ];
   testDepends = [
-    blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text time
+    blazeBuilder HUnit QuickCheck tasty tastyHunit tastyQuickcheck text
+    time
   ];
   doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
   meta = {
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 64d15480ab8..632647e2182 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, byteable, cipherAes, cryptoRandom, random }:
+{ cabal, byteable, cipherAes, cryptoRandom }:
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.5.2";
-  sha256 = "1nf8dd83ywriq2ynv48f2s5lvc9s3srq4j5vbspmf0kc74kmq2pf";
-  buildDepends = [ byteable cipherAes cryptoRandom random ];
+  version = "0.6.1";
+  sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
+  buildDepends = [ byteable cipherAes cryptoRandom ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 7cac43769f8..01ea0557565 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "1.0.0.2";
-  sha256 = "1r30vcrplilj3silnrmn0r5m0df27icdsgd5hx35li9yrs862n95";
+  version = "1.0.2.0";
+  sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index 7c1d6308131..2a83b248674 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.13";
-  sha256 = "00zw9cymjhsdiy2p4prjvmmy7xnk12qggdpvxrp0hjnwlakfvyb2";
+  version = "0.13.2";
+  sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
   buildDepends = [ cereal entropy tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/crypto-api";
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index b63f6a44108..c7c3f2590a7 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.5.4";
-  sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n";
+  version = "0.5.5";
+  sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
   buildDepends = [
     cereal conduit conduitExtra cryptoApi resourcet transformers
   ];
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index f8a51f4fa5b..6c0060e52a8 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey-types";
-  version = "0.4.2.2";
-  sha256 = "18z1fnh2xjq600ya8m175m64nwr6bwscr2q47zjy7k38zlm9c8h5";
+  version = "0.4.2.3";
+  sha256 = "1isfyr1ly9hv8idslpjbyc9hhgb1zqd9gfc1s4kvwy4gcdsvrx52";
   buildDepends = [ asn1Types ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
index bd4b4f9639f..a8979fef315 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey";
-  version = "0.2.4";
-  sha256 = "0mdjr6zma2q7r2z9qibp2bwf73bis6zrv7ss62i4pz42kndb9hh4";
+  version = "0.2.5";
+  sha256 = "18rxm6mgxp8x4ns2725pw6ja2g6n6k64dj9cbwdlsb13pkdh3lxq";
   buildDepends = [
     byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
   ];
diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix
index 878eb3d2c71..c7053cbf1e3 100644
--- a/pkgs/development/libraries/haskell/crypto-random/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-random";
-  version = "0.0.7";
-  sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw";
+  version = "0.0.8";
+  sha256 = "058ilm05ni5ribggx25cfrhsv1z0abvgxzf3wd3d6qqq58p5wbkv";
   buildDepends = [ securemem vector ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-random";
diff --git a/pkgs/development/libraries/haskell/csv-conduit/default.nix b/pkgs/development/libraries/haskell/csv-conduit/default.nix
new file mode 100644
index 00000000000..f0c01481dbd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/csv-conduit/default.nix
@@ -0,0 +1,31 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, attoparsec, attoparsecConduit, blazeBuilder, conduit
+, conduitExtra, dataDefault, HUnit, mmorph, monadControl, mtl
+, primitive, resourcet, testFramework, testFrameworkHunit, text
+, transformers, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "csv-conduit";
+  version = "0.6.3";
+  sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec attoparsecConduit blazeBuilder conduit conduitExtra
+    dataDefault mmorph monadControl mtl primitive resourcet text
+    transformers unorderedContainers vector
+  ];
+  testDepends = [
+    HUnit mtl primitive testFramework testFrameworkHunit text
+    transformers vector
+  ];
+  meta = {
+    homepage = "http://github.com/ozataman/csv-conduit";
+    description = "A flexible, fast, conduit-based CSV parser library for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index c6daa8b5fdd..25eced2e810 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -4,10 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "cuda";
-  version = "0.6.0.1";
-  sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51";
+  version = "0.6.5.1";
+  sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y";
+  isLibrary = true;
+  isExecutable = true;
   buildTools = [ c2hs ];
-  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
+  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.cc ];
   doCheck = false;
   # Perhaps this should be the default in cabal.nix ...
   #
diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix
index d24af97f4f2..dfcf9bec757 100644
--- a/pkgs/development/libraries/haskell/cufft/default.nix
+++ b/pkgs/development/libraries/haskell/cufft/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cufft";
-  version = "0.1.0.3";
-  sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi";
+  version = "0.1.1.0";
+  sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h";
   buildDepends = [ cuda ];
   buildTools = [ c2hs ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/daemons/default.nix b/pkgs/development/libraries/haskell/daemons/default.nix
new file mode 100644
index 00000000000..1ec84449dd3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/daemons/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cereal, dataDefault, filepath, HUnit, network, pipes
+, testFramework, testFrameworkHunit, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "daemons";
+  version = "0.2.1";
+  sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    cereal dataDefault filepath network pipes transformers
+  ];
+  testDepends = [
+    dataDefault HUnit testFramework testFrameworkHunit
+  ];
+  meta = {
+    homepage = "https://github.com/scvalex/daemons";
+    description = "Daemons in Haskell made fun and easy";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/data-flags/default.nix
index c5f62c9c827..ed2c5b682ce 100644
--- a/pkgs/development/libraries/haskell/stm/2.3.nix
+++ b/pkgs/development/libraries/haskell/data-flags/default.nix
@@ -3,13 +3,12 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.3";
-  sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm";
+  pname = "data-flags";
+  version = "0.0.3.1";
+  sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5";
   meta = {
-    description = "Software Transactional Memory";
+    description = "A package for working with bit masks and flags in general";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-lens-fd/default.nix b/pkgs/development/libraries/haskell/data-lens-fd/default.nix
new file mode 100644
index 00000000000..85935a5ebda
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-lens-fd/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, comonad, dataLens, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "data-lens-fd";
+  version = "2.0.5";
+  sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk";
+  buildDepends = [ comonad dataLens mtl transformers ];
+  meta = {
+    homepage = "http://github.com/roconnor/data-lens-fd/";
+    description = "Lenses";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix
index 2eca446c714..017e5e706db 100644
--- a/pkgs/development/libraries/haskell/data-lens-light/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-lens-light";
-  version = "0.1.2";
-  sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7";
+  version = "0.1.2.1";
+  sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w";
   buildDepends = [ mtl ];
   meta = {
     homepage = "https://github.com/feuerbach/data-lens-light";
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
index 923e11bf2e2..d167e8051cd 100644
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -12,6 +12,5 @@ cabal.mkDerivation (self: {
     description = "Utilities for Data.Lens";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
index 5fba0b4bde3..b65a41f048e 100644
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -7,12 +7,12 @@ cabal.mkDerivation (self: {
   version = "2.10.5";
   sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90";
   buildDepends = [ comonad semigroupoids transformers ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/roconnor/data-lens/";
     description = "Used to be Haskell 98 Lenses";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix
index 959eb57e779..3db8f1ef067 100644
--- a/pkgs/development/libraries/haskell/data-ordlist/default.nix
+++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-ordlist";
-  version = "0.4.6.1";
-  sha256 = "1qrvyin5567br99zfip7krdy6snnbm5z5jdi6ghmk0cfmhmyrwy3";
+  version = "0.4.7.0";
+  sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
   meta = {
     description = "Set and bag operations on ordered lists";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index 81aee9c42b4..dc88a613350 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dbus";
-  version = "0.10.8";
-  sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6";
+  version = "0.10.9";
+  sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb";
   buildDepends = [
     cereal libxmlSax network parsec random text transformers vector
     xmlTypes
diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
deleted file mode 100644
index 4d7a0b9b818..00000000000
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq";
-  version = "1.1.0.0";
-  sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a";
-  meta = {
-    description = "Fully evaluate data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
deleted file mode 100644
index 7748ff96a8a..00000000000
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "deepseq";
-  version = "1.1.0.2";
-  sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135";
-  meta = {
-    description = "Deep evaluation of data structures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index dbad9c538a9..5b8c5297316 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.16";
-  sha256 = "0vahwnb2hzdm990b2m139kbg9jkk4whcxjdfjvlpimqk72s27viy";
+  version = "2.5.18";
+  sha256 = "1jqng8v1d4rac8xmrpm7h1pkyr9pfwsbb0ap6pnwzpwz9fns9c3k";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/default.nix b/pkgs/development/libraries/haskell/diagrams/builder/default.nix
new file mode 100644
index 00000000000..40e1cf45796
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/builder/default.nix
@@ -0,0 +1,26 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, blazeSvg, cmdargs, diagramsCairo, diagramsLib
+, diagramsPostscript, diagramsSvg, exceptions, filepath, hashable
+, haskellSrcExts, hint, lens, mtl, split, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-builder";
+  version = "0.6.0.2";
+  sha256 = "18avlhwywhrxlf1cyp9fdiy0i3gy12k4i28cymllmmyx78fv59q5";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeSvg cmdargs diagramsCairo diagramsLib diagramsPostscript
+    diagramsSvg exceptions filepath hashable haskellSrcExts hint lens
+    mtl split transformers
+  ];
+  configureFlags = "-fcairo -fsvg -fps -frasterific";
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams";
+    description = "hint-based build service for the diagrams graphics EDSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
new file mode 100644
index 00000000000..8d175398414
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
@@ -0,0 +1,53 @@
+/*
+  If user need access to more haskell package for building his
+  diagrams, he simply has to pass these package through the
+  extra packages function as follow in `config.nix`:
+  
+  ~~~
+  diagramBuilderWrapper.override {
+    extraPackages = self : [myHaskellPackage];
+  }
+  ­~~~
+
+  WARNING:
+  Note that this solution works well but however, as this is a 
+  non-cabal derivation, user should be carefull to never put this
+  package inside the listing passed as argument to `ghcWithPackages`
+  as it will silently disregard the package. This silent disregard
+  should be regarded as an issue for `ghcWithPackages`. It should
+  rather raise an error instead when a non-cabal dirivation is
+  directly passed to it. The alternative would have been to
+  use a fake cabal file in order to make this a cabal derivation
+  such as what `yiCustom` package did.
+*/
+
+{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper, 
+  extraPackages ? (self: []) }:
+let
+  # Used same technique as for the yiCustom package.
+  w = ghcWithPackages 
+    (self: [ diagramsBuilder ] ++ extraPackages self);
+  wrappedGhc = w.override { ignoreCollisions = true; };
+in
+stdenv.mkDerivation {
+  name = diagramsBuilder.name + "-wrapper";
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    makeWrapper \
+    "${diagramsBuilder}/bin/diagrams-builder-svg" "$out/bin/diagrams-builder-svg" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
+
+    makeWrapper \
+    "${diagramsBuilder}/bin/diagrams-builder-cairo" "$out/bin/diagrams-builder-cairo" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
+
+    makeWrapper \
+    "${diagramsBuilder}/bin/diagrams-builder-ps" "$out/bin/diagrams-builder-ps" \
+    --set NIX_GHC ${wrappedGhc}/bin/ghc \
+    --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${diagramsBuilder.ghc.version}
+  '';
+  preferLocalBuild = true;
+  meta = diagramsBuilder.meta;
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 3a695fa8203..24c26e052d9 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -7,13 +7,14 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.2.0.1";
-  sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c";
+  version = "1.2.0.4";
+  sha256 = "1yg6ja5jha499b6j5fsgdl4f3l2ff1gp6cl7ixzj9y26m7a10bqq";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable JuicyPixels lens mtl optparseApplicative pango split
     statestack time transformers vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Cairo backend for diagrams drawing EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index f1044870f3a..78ed983650f 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "1.1.2.1";
-  sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki";
+  version = "1.1.2.4";
+  sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
@@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
     diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "Collection of user contributions to diagrams EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index 18f362e0c21..518b5594cb6 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -6,12 +6,13 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.2.0.2";
-  sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn";
+  version = "1.2.0.4";
+  sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Core libraries for diagrams EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/gtk.nix b/pkgs/development/libraries/haskell/diagrams/gtk.nix
new file mode 100644
index 00000000000..c169c9e0e48
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/gtk.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, diagramsCairo, diagramsLib, gtk }:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-gtk";
+  version = "1.0.1.3";
+  sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
+  buildDepends = [ cairo diagramsCairo diagramsLib gtk ];
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Backend for rendering diagrams directly to GTK windows";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index b15f05dbf27..d2e25254f67 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -2,20 +2,21 @@
 
 { cabal, active, colour, dataDefaultClass, diagramsCore, dualTree
 , filepath, fingertree, hashable, intervals, JuicyPixels, lens
-, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups
-, tagged, vectorSpace, vectorSpacePoints
+, MemoTrie, monoidExtras, optparseApplicative, semigroups, tagged
+, vectorSpace, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.2.0.2";
-  sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p";
+  version = "1.2.0.7";
+  sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a";
   buildDepends = [
     active colour dataDefaultClass diagramsCore dualTree filepath
     fingertree hashable intervals JuicyPixels lens MemoTrie
-    monoidExtras optparseApplicative safe semigroups tagged vectorSpace
+    monoidExtras optparseApplicative semigroups tagged vectorSpace
     vectorSpacePoints
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 557aae73db5..841487305ef 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -7,12 +7,13 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.1.0.1";
-  sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6";
+  version = "1.1.0.3";
+  sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "Postscript backend for diagrams drawing EDSL";
diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
new file mode 100644
index 00000000000..8e494241f74
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath
+, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative
+, Rasterific, split, statestack, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "diagrams-rasterific";
+  version = "0.1.0.5";
+  sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr";
+  buildDepends = [
+    dataDefaultClass diagramsCore diagramsLib filepath FontyFruity
+    JuicyPixels lens mtl optparseApplicative Rasterific split
+    statestack time
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://projects.haskell.org/diagrams/";
+    description = "Rasterific backend for diagrams";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 8393d7c6f98..1994905c1d4 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -7,13 +7,14 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.1.0.1";
-  sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw";
+  version = "1.1.0.3";
+  sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq";
   buildDepends = [
     base64Bytestring blazeMarkup blazeSvg colour diagramsCore
     diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
     split time vectorSpace
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "SVG backend for diagrams drawing EDSL";
diff --git a/pkgs/development/libraries/haskell/digest-pure/default.nix b/pkgs/development/libraries/haskell/digest-pure/default.nix
new file mode 100644
index 00000000000..a36483bf2f7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/digest-pure/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, digest, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "digest-pure";
+  version = "0.0.3";
+  sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
+  testDepends = [ digest QuickCheck ];
+  meta = {
+    homepage = "http://github.com/danieldk/digest-pure";
+    description = "Pure hash functions for bytestrings";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 1958307e869..819d4690da5 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.11";
-  sha256 = "0jf62ssyc317x070xkjdnfbb2g8mb19a83hig08j95vyqwjgk4vg";
+  version = "1.1.12.1";
+  sha256 = "1jwrlmavwjq3bf8ylazi91mwl47n5pdh3lipv4p7v0gq45dm3hg9";
   buildDepends = [
     aeson digestiveFunctors lens lensAeson safe text vector
   ];
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index aae120d5681..29ed0504806 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.8.5.0";
-  sha256 = "0pjjr3b1zm23wpqnmcbr8ly08bp63sz3c9vbxcani4mwgx05qp87";
+  version = "0.8.6.1";
+  sha256 = "1l8ppn2h1nxzn5wxnglc2fyi7r90177v75yf4n7cyvzrcxdaz4bb";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];
diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
index e5a3e0a44c6..71d1a6448fa 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.6.1.0";
   sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr";
   buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";
     description = "Snap backend for the digestive-functors library";
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index c93a564c3e3..b6e3f40f937 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional-tf";
-  version = "0.3";
-  sha256 = "0z3k9962zz652bk2azv9lcms1j06v60hid3iach043dpg5r083qg";
+  version = "0.3.0.1";
+  sha256 = "0gnaylxhjcyvsibq15bw9k4c846l2329yvvl79cdw2jqggfnzxw6";
   buildDepends = [ numtypeTf time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 3435bf57d5c..9be32b5596a 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.13";
-  sha256 = "1nj8h79iq7pirqlj8iw1p782nm05xgym3469x7hlzaz3ig9nwgrg";
+  version = "0.13.0.1";
+  sha256 = "1cn7gyskp0ax5lm5k05p6qp461hirjyhj0k1qyd64fgdmmp81vi6";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
index 07eca858972..c3be0f888ac 100644
--- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "direct-sqlite";
-  version = "2.3.13";
-  sha256 = "0d16jmls41cwyzg91fpd32dv8vvx1v3ilypv1wd7ya8j08fwfvdn";
+  version = "2.3.14";
+  sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w";
   buildDepends = [ text ];
   testDepends = [ base16Bytestring HUnit text ];
   meta = {
-    homepage = "http://ireneknapp.com/software/";
+    homepage = "https://github.com/IreneKnapp/direct-sqlite";
     description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix
new file mode 100644
index 00000000000..2cc9682dccb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/directory-layout/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, commandQq, doctest, filepath, free, hspec, lens
+, semigroups, temporary, text, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "directory-layout";
+  version = "0.7.4.1";
+  sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
+  buildDepends = [
+    commandQq filepath free hspec lens semigroups text transformers
+    unorderedContainers
+  ];
+  testDepends = [
+    commandQq doctest filepath free hspec lens semigroups temporary
+    text transformers unorderedContainers
+  ];
+  doCheck = false;
+  meta = {
+    description = "Directory layout DSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
new file mode 100644
index 00000000000..d8de329a7de
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, distributedProcess, monadControl, transformers
+, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "distributed-process-monad-control";
+  version = "0.5.1";
+  sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
+  buildDepends = [
+    distributedProcess monadControl transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://haskell-distributed.github.io";
+    description = "Orphan instances for MonadBase and MonadBaseControl";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
new file mode 100644
index 00000000000..165b09d13bf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process-p2p/default.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, distributedProcess, mtl, network, networkTransport
+, networkTransportTcp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "distributed-process-p2p";
+  version = "0.1.3.0";
+  sha256 = "00lvi2x1s8r7lwfvsjnvzc9iwdk4ip8svw85p2h3ra4iqbzj70l2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary distributedProcess mtl network networkTransport
+    networkTransportTcp
+  ];
+  meta = {
+    homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
+    description = "Peer-to-peer node discovery for Cloud Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/distributed-process-platform/default.nix b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix
new file mode 100644
index 00000000000..cb014f53a8a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process-platform/default.nix
@@ -0,0 +1,37 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiTerminal, binary, dataAccessor, deepseq
+, distributedProcess, distributedStatic, fingertree, hashable
+, HUnit, mtl, network, networkTransport, networkTransportTcp
+, QuickCheck, rematch, stm, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "distributed-process-platform";
+  version = "0.1.0";
+  sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary dataAccessor deepseq distributedProcess fingertree hashable
+    mtl stm time transformers unorderedContainers
+  ];
+  testDepends = [
+    ansiTerminal binary dataAccessor deepseq distributedProcess
+    distributedStatic fingertree hashable HUnit mtl network
+    networkTransport networkTransportTcp QuickCheck rematch stm
+    testFramework testFrameworkHunit testFrameworkQuickcheck2 time
+    transformers unorderedContainers
+  ];
+  hyperlinkSource = false;
+  jailbreak = true;
+  doCheck = false;
+  patchPhase = "mv Setup.hs Setup.lhs";
+  meta = {
+    homepage = "http://github.com/haskell-distributed/distributed-process-platform";
+    description = "The Cloud Haskell Application Platform";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
index 21cebedefe4..0232a02c8af 100644
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process/default.nix
@@ -7,12 +7,13 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process";
-  version = "0.5.1";
-  sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk";
+  version = "0.5.2";
+  sha256 = "04llhz9z28365idgj13hhwkp98zwqv6mhhy9i7416wk5d3r70g7l";
   buildDepends = [
     binary dataAccessor deepseq distributedStatic hashable mtl
     networkTransport random rank1dynamic stm syb time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://haskell-distributed.github.com/";
     description = "Cloud Haskell: Erlang-style concurrency in Haskell";
diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix
index 8f7f61da8f6..4dce7cc1ded 100644
--- a/pkgs/development/libraries/haskell/distributed-static/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-static/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-static";
-  version = "0.3.0.0";
-  sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj";
+  version = "0.3.1.0";
+  sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08";
   buildDepends = [ binary rank1dynamic ];
   meta = {
     homepage = "http://haskell-distributed.github.com";
diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix
index 12ff67c7f20..e922d9ff7be 100644
--- a/pkgs/development/libraries/haskell/djinn/default.nix
+++ b/pkgs/development/libraries/haskell/djinn/default.nix
@@ -4,20 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "djinn";
-  version = "2011.7.23";
-  sha256 = "14748pqzrd1r9jg2vc9v232pi38q99l9zdlia6ashm2v871hp1xv";
+  version = "2014.9.7";
+  sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ haskeline mtl ];
-  preConfigure = self.stdenv.lib.optionalString self.stdenv.isDarwin ''
-    sed -i 's/-Wall -optl-Wl/-Wall/' djinn.cabal
-  '';
   meta = {
-    homepage = "http://www.augustsson.net/Darcs/Djinn/";
     description = "Generate Haskell code from a type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
   };
 })
diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 018fac06670..af3f9e2d525 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.11";
-  sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr";
+  version = "0.9.11.1";
+  sha256 = "1gzzzwr7f7281mlbfbk74nxr28l70lwfaws4xjfx2v06xazl99db";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
   doCheck = false;
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
-    homepage = "https://github.com/sol/doctest-haskell#readme";
+    homepage = "https://github.com/sol/doctest#readme";
     description = "Test interactive Haskell examples";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix
index 9b038d047f9..f0d64562d7c 100644
--- a/pkgs/development/libraries/haskell/dsp/default.nix
+++ b/pkgs/development/libraries/haskell/dsp/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ random ];
+  patchPhase = ''
+    sed -i -e 's|random.*<1.1,|random,|' dsp.cabal
+  '';
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/DSP";
     description = "Haskell Digital Signal Processing";
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index f9cf3b13b41..7efdcce8526 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.2.0.4";
-  sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp";
+  version = "0.2.0.5";
+  sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5";
   buildDepends = [ monoidExtras newtype semigroups ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
index 40f52b50904..066c11e5a36 100644
--- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
+++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dynamic-cabal";
-  version = "0.3.2";
-  sha256 = "0f0g4kml17j1j101gnpjjpdmny4m2wgr0dbjq18fw1s3nxc3jagm";
+  version = "0.3.3";
+  sha256 = "0fq6q0j2fx7ygarzgsvb7scssjnrxjrq188d0habfar6bdm0vqdg";
   buildDepends = [
     dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time
     void
diff --git a/pkgs/development/libraries/haskell/dynamic-state/default.nix b/pkgs/development/libraries/haskell/dynamic-state/default.nix
new file mode 100644
index 00000000000..21eb0fdab28
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dynamic-state/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, concreteTyperep, hashable, unorderedContainers }:
+
+cabal.mkDerivation (self: {
+  pname = "dynamic-state";
+  version = "0.1.1.0";
+  sha256 = "18dc6fbnyk3q7n7gvqrgy98qc2grq0algr2jnc1ai3vm9bqh2x8n";
+  buildDepends = [
+    binary concreteTyperep hashable unorderedContainers
+  ];
+  meta = {
+    description = "Optionally serializable dynamic state keyed by type";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
deleted file mode 100644
index d36a2ee11f2..00000000000
--- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libedit }:
-
-cabal.mkDerivation (self: {
-  pname = "editline";
-  version = "0.2.1.0";
-  sha256 = "1qa65iqr5k3ajq1glf5y84lld132i2i3l0zmsw8xqkq7hrgqwqc3";
-  extraLibraries = [ libedit ];
-  meta = {
-    homepage = "http://code.haskell.org/editline";
-    description = "Bindings to the editline library (libedit)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/default.nix
index 4458a067b1f..4458a067b1f 100644
--- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/editline/default.nix
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 6d55afd41d6..70c8573ade5 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -1,16 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, exceptions, free, monadControl, MonadRandom, mtl
-, semigroupoids, semigroups, transformers, transformersBase
+{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom
+, mtl, profunctors, semigroupoids, semigroups, transformers
+, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "4.3.0.1";
-  sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f";
+  version = "4.3.2.1";
+  sha256 = "09c1xal7d6azw0cc8mwi0ry8blysg29cmyfipdhg1b7vzyjavv22";
   buildDepends = [
-    exceptions free monadControl MonadRandom mtl semigroupoids
-    semigroups transformers transformersBase
+    bifunctors exceptions free monadControl MonadRandom mtl profunctors
+    semigroupoids semigroups transformers transformersBase
   ];
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
   meta = {
diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix
new file mode 100644
index 00000000000..e4074ddd1ff
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, ekgCore, httpClient, lens, network, networkUri
+, text, time, unorderedContainers, vector, wreq
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ekg-bosun";
+  version = "1.0.3";
+  sha256 = "0mlfsmw1aa24p6fhml8m2dj2v7hrp91a9d3cfl74rr8z8am61mqc";
+  buildDepends = [
+    aeson ekgCore httpClient lens network networkUri text time
+    unorderedContainers vector wreq
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/ekg-bosun";
+    description = "Send ekg metrics to a Bosun instance";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix
index 06daad66967..2339009a138 100644
--- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix
+++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg-carbon";
-  version = "1.0.1";
-  sha256 = "1slaykn1a6f09dzn78v2aqw8snmidycvaw5cfyr4f0ndd88vi77d";
+  version = "1.0.2";
+  sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i";
   buildDepends = [
     ekgCore network networkCarbon text time unorderedContainers vector
   ];
diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix
index 2bdf088aea3..6e2189dbadb 100644
--- a/pkgs/development/libraries/haskell/ekg-core/default.nix
+++ b/pkgs/development/libraries/haskell/ekg-core/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg-core";
-  version = "0.1.0.1";
-  sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja";
+  version = "0.1.0.2";
+  sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg";
   buildDepends = [ text unorderedContainers ];
   meta = {
     homepage = "https://github.com/tibbe/ekg-core";
diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
index 07c522b9818..05dd7d99877 100644
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ b/pkgs/development/libraries/haskell/ekg/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg";
-  version = "0.4.0.2";
-  sha256 = "0svw43dnlg93nyaxiq310sp5csbf0w68ipbhqkxm052yvc9k6fv9";
+  version = "0.4.0.5";
+  sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0";
   buildDepends = [
     aeson ekgCore filepath network snapCore snapServer text time
     transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix
index ff6e4819283..4d843bb0836 100644
--- a/pkgs/development/libraries/haskell/elerea/default.nix
+++ b/pkgs/development/libraries/haskell/elerea/default.nix
@@ -1,11 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal }:
+{ cabal, transformers, transformersBase }:
 
 cabal.mkDerivation (self: {
   pname = "elerea";
-  version = "2.7.0.2";
-  sha256 = "1n45q1hx548c6yqbj3321lky3xxsffpqvmcq0m9hw36d3cvwbvg0";
+  version = "2.8.0";
+  sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab";
+  buildDepends = [ transformers transformersBase ];
   meta = {
     description = "A minimalistic FRP library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/elevator/default.nix b/pkgs/development/libraries/haskell/elevator/default.nix
new file mode 100644
index 00000000000..a93e52a0ba0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/elevator/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cleanUnions, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "elevator";
+  version = "0.1.3";
+  sha256 = "0z7rj70ilv4y95prfdj3fjlw4icr64d66lqgyr6jp28zxrxw1535";
+  buildDepends = [ cleanUnions transformers ];
+  meta = {
+    homepage = "https://github.com/fumieval/elevator";
+    description = "Immediately lifts to a desired level";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
index 3470aab9b2b..a28c9fc4683 100644
--- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
+++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enclosed-exceptions";
-  version = "1.0.0.2";
-  sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h";
+  version = "1.0.1";
+  sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz";
   buildDepends = [
     async deepseq liftedBase monadControl transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
index 5ec0f1502c3..148d4f4debf 100644
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ b/pkgs/development/libraries/haskell/encoding/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     binary extensibleExceptions HaXml mtl regexCompat
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://code.haskell.org/encoding/";
     description = "A library for various character encodings";
diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
index 70c7a1c7d4f..b37ef7c2bc1 100644
--- a/pkgs/development/libraries/haskell/engine-io-snap/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix
@@ -1,18 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsecEnumerator, engineIo, snapCore
-, unorderedContainers, websockets, websocketsSnap
+{ cabal, attoparsecEnumerator, engineIo, MonadCatchIOTransformers
+, snapCore, unorderedContainers, websockets, websocketsSnap
 }:
 
 cabal.mkDerivation (self: {
   pname = "engine-io-snap";
-  version = "1.0.1";
-  sha256 = "1hw3gmi23fdcgvz817b95bf23wa7qyg10axsnvan5qxr73pwp5iv";
+  version = "1.0.2";
+  sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr";
   buildDepends = [
-    attoparsecEnumerator engineIo snapCore unorderedContainers
-    websockets websocketsSnap
+    attoparsecEnumerator engineIo MonadCatchIOTransformers snapCore
+    unorderedContainers websockets websocketsSnap
   ];
   meta = {
+    homepage = "http://github.com/ocharles/engine.io";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix
index f1f9d06c76a..d275a2f2b0f 100644
--- a/pkgs/development/libraries/haskell/engine-io/default.nix
+++ b/pkgs/development/libraries/haskell/engine-io/default.nix
@@ -1,17 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, async, attoparsec, base64Bytestring, either
-, monadLoops, mwcRandom, stm, text, transformers
+{ cabal, aeson, async, attoparsec, base64Bytestring, either, free
+, monadLoops, mwcRandom, stm, stmDelay, text, transformers
 , unorderedContainers, vector, websockets
 }:
 
 cabal.mkDerivation (self: {
   pname = "engine-io";
-  version = "1.1.2";
-  sha256 = "1ry6rklrij7x1z8mw31vh41lc0axzj8l0lhmjsmhs554nv50062f";
+  version = "1.2.3";
+  sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc";
   buildDepends = [
-    aeson async attoparsec base64Bytestring either monadLoops mwcRandom
-    stm text transformers unorderedContainers vector websockets
+    aeson async attoparsec base64Bytestring either free monadLoops
+    mwcRandom stm stmDelay text transformers unorderedContainers vector
+    websockets
   ];
   meta = {
     homepage = "http://github.com/ocharles/engine.io";
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 881a9cd9a0a..3b40f5959f7 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.3.2";
-  sha256 = "1kk0vmfmfqcsw0pzbii9rvz32fvhvxqpn6p6jw6q2x33z6gm5f9x";
+  version = "0.3.4.1";
+  sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";
diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix
index fa88fbfe2e8..b9562573f8f 100644
--- a/pkgs/development/libraries/haskell/equational-reasoning/default.nix
+++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.2.0.4";
   sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j";
   buildDepends = [ singletons tagged void ];
+  jailbreak = true;
   meta = {
     description = "Proof assistant for Haskell using DataKinds & PolyKinds";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix
deleted file mode 100644
index c21c0e16170..00000000000
--- a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, QuickCheck, STMonadTrans, testFramework
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "equivalence";
-  version = "0.2.3";
-  sha256 = "0dd986y0sn89fparyz6kz9yhzysbqjcp8s99r81ihghg7s9yc743";
-  buildDepends = [ mtl STMonadTrans ];
-  testDepends = [
-    mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://bitbucket.org/paba/equivalence/";
-    description = "Maintaining an equivalence relation implemented as union-find using STT";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix b/pkgs/development/libraries/haskell/equivalence/default.nix
index 38de239b821..38de239b821 100644
--- a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix
+++ b/pkgs/development/libraries/haskell/equivalence/default.nix
diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 637f32c3996..c85ff455180 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.4.4";
-  sha256 = "00s52f8l5pbsab83fq8d03xhispyp9mqsh5vvzwiki6kspkj26a0";
+  version = "2.1.2.1";
+  sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
index d3d21aaf27a..49fb11535a1 100644
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix
@@ -4,11 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "exception-mtl";
-  version = "0.3.0.4";
-  sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc";
+  version = "0.3.0.5";
+  sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj";
   buildDepends = [ exceptionTransformers mtl transformers ];
   meta = {
-    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    homepage = "http://www.cs.drexel.edu/~mainland/";
     description = "Exception monad transformer instances for mtl2 classes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix
index e6c778e981d..2e2f828cb30 100644
--- a/pkgs/development/libraries/haskell/exception-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix
@@ -1,15 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HUnit, stm, transformers }:
+{ cabal, HUnit, stm, testFramework, testFrameworkHunit
+, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "exception-transformers";
-  version = "0.3.0.3";
-  sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz";
+  version = "0.3.0.4";
+  sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra";
   buildDepends = [ stm transformers ];
-  testDepends = [ HUnit transformers ];
+  testDepends = [
+    HUnit testFramework testFrameworkHunit transformers
+  ];
   meta = {
-    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    homepage = "http://www.cs.drexel.edu/~mainland/";
     description = "Type classes and monads for unchecked extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/exhaustive/default.nix b/pkgs/development/libraries/haskell/exhaustive/default.nix
new file mode 100644
index 00000000000..bd77f9f8f11
--- /dev/null
+++ b/pkgs/development/libraries/haskell/exhaustive/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, genericsSop, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "exhaustive";
+  version = "1.1.0";
+  sha256 = "14pdf5iks0j2vpg3w48qs32lnj8ahkd0jljjhx1qap66mss0i3jl";
+  buildDepends = [ genericsSop transformers ];
+  meta = {
+    homepage = "http://github.com/ocharles/exhaustive";
+    description = "Compile time checks that a computation considers producing data through all possible constructors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
index 0c743df4a16..e7f1f16059d 100644
--- a/pkgs/development/libraries/haskell/extensible-effects/default.nix
+++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix
@@ -2,16 +2,17 @@
 
 { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, transformers, transformersBase
+, typeAligned, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "extensible-effects";
-  version = "1.7.1";
-  sha256 = "1i7bmyga63svnky03f5xvz63795pjsqp3x7rn9amj55yj11fmp05";
-  buildDepends = [ transformers transformersBase ];
+  version = "1.9.0.1";
+  sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx";
+  buildDepends = [ transformers transformersBase typeAligned void ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
+    testFrameworkQuickcheck2 void
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
deleted file mode 100644
index e9c1f352a09..00000000000
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "extensible-exceptions";
-  version = "0.1.1.0";
-  sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781";
-  meta = {
-    description = "Extensible exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
deleted file mode 100644
index ee5abc006b6..00000000000
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "extensible-exceptions";
-  version = "0.1.1.3";
-  sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm";
-  meta = {
-    description = "Extensible exceptions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
index 39969527a85..39969527a85 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix
diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix
new file mode 100644
index 00000000000..9e90fe2bb05
--- /dev/null
+++ b/pkgs/development/libraries/haskell/extra/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, QuickCheck, time }:
+
+cabal.mkDerivation (self: {
+  pname = "extra";
+  version = "1.0";
+  sha256 = "0ainwq8f2mp1wc30srl971xy4qnrcyrcyig1kmrxx951hgav1dkb";
+  buildDepends = [ filepath time ];
+  testDepends = [ filepath QuickCheck time ];
+  meta = {
+    homepage = "https://github.com/ndmitchell/extra#readme";
+    description = "Extra functions I use";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index b4e32fa2bb0..b0cd40e48fc 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "2.2.0";
-  sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr";
+  version = "2.2.3";
+  sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3";
   buildDepends = [ autoUpdate blazeBuilder filepath text ];
   testDepends = [ hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix
index 78f6b104c94..466dd478261 100644
--- a/pkgs/development/libraries/haskell/fay-base/default.nix
+++ b/pkgs/development/libraries/haskell/fay-base/default.nix
@@ -4,14 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "fay-base";
-  version = "0.19.2";
-  sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4";
+  version = "0.19.4.1";
+  sha256 = "1pk1jjwyh2n9fg583v4cd0ll5qglphwnfm08q95klcvc61p4wqg6";
   buildDepends = [ fay ];
   meta = {
-    homepage = "https://github.com/faylang/fay-base";
+    homepage = "https://github.com/faylang/fay/";
     description = "The base package for Fay";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    inherit (fay.meta) broken;
   };
 })
diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix
index 68bbe884e87..05b2505d762 100644
--- a/pkgs/development/libraries/haskell/fay-text/default.nix
+++ b/pkgs/development/libraries/haskell/fay-text/default.nix
@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "fay-text";
-  version = "0.3.0.2";
-  sha256 = "12hgamqbrflmnr3ri0ajvzf6al5nn4adcdmv6ag6h5mrsik2sklf";
+  version = "0.3.2";
+  sha256 = "1yjsn188ixpfqdr75xyl57rbv53dybik4g28h6p3jv73q494552m";
   buildDepends = [ fay fayBase text ];
   meta = {
     homepage = "https://github.com/faylang/fay-text";
     description = "Fay Text type represented as JavaScript strings";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    inherit (fay.meta) broken;
   };
 })
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index edbf19bda62..9a268a9b34f 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -1,30 +1,31 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom
-, haskellNames, haskellPackages, haskellSrcExts, languageEcmascript
-, mtl, optparseApplicative, safe, sourcemap, split, spoon, syb
-, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate
-, unorderedContainers, utf8String, vector
+{ cabal, aeson, dataDefault, filepath, ghcPaths, haskellNames
+, haskellPackages, haskellSrcExts, languageEcmascript, mtl
+, optparseApplicative, safe, sourcemap, split, spoon, syb, text
+, time, transformers, uniplate, unorderedContainers, utf8String
+, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.1.2";
-  sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji";
+  version = "0.21.2.1";
+  sha256 = "06ijfkm1x5a15hac9f4cs4f16rva2hkf07xfh0mm9q3wkamqxlfm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec dataDefault filepath ghcPaths groom haskellNames
-    haskellPackages haskellSrcExts languageEcmascript mtl
-    optparseApplicative safe sourcemap split spoon syb tasty tastyHunit
-    tastyTh text time transformers uniplate unorderedContainers
-    utf8String vector
+    aeson dataDefault filepath ghcPaths haskellNames haskellPackages
+    haskellSrcExts languageEcmascript mtl optparseApplicative safe
+    sourcemap split spoon syb text time transformers uniplate
+    unorderedContainers utf8String vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/faylang/fay/wiki";
     description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index 37d24309732..b325af923d7 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "1.0.4";
-  sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2";
+  version = "1.0.8";
+  sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m";
   buildDepends = [
     aeson attoparsec base16Bytestring base64Bytestring cereal conduit
     conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
@@ -22,7 +22,6 @@ cabal.mkDerivation (self: {
     aeson conduit dataDefault hspec httpConduit HUnit liftedBase
     monadControl QuickCheck resourcet text time transformers
   ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/prowdsponsor/fb";
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
deleted file mode 100644
index 61043f82f97..00000000000
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl";
-  version = "5.4.2.2";
-  sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
-    description = "Martin Erwig's Functional Graph Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
deleted file mode 100644
index 1ecc9fb05e7..00000000000
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl";
-  version = "5.4.2.3";
-  sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
-    description = "Martin Erwig's Functional Graph Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
deleted file mode 100644
index 65596c350de..00000000000
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl";
-  version = "5.4.2.4";
-  sha256 = "0rh22786f37mpsvhkv075wjh5sd0c83nlhk669xil9rd7swcr66f";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
-    description = "Martin Erwig's Functional Graph Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix
deleted file mode 100644
index 4fd2a4d0597..00000000000
--- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "fgl";
-  version = "5.5.0.0";
-  sha256 = "1kdqxbpsaka97rx0c7czlc1nfi72mdxs46gnqa8p0wxn1vx437g3";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
-    description = "Martin Erwig's Functional Graph Library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/default.nix
index 65a67528d01..65a67528d01 100644
--- a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix
+++ b/pkgs/development/libraries/haskell/fgl/default.nix
diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix
index 6cff9640cdf..e027047a9ea 100644
--- a/pkgs/development/libraries/haskell/file-location/default.nix
+++ b/pkgs/development/libraries/haskell/file-location/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "file-location";
-  version = "0.4.5.2";
-  sha256 = "0dyzf2lhh0n4hwbh44qfh6bw9snl4hha9sv76c4ndi7v1rvnx197";
+  version = "0.4.5.3";
+  sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9";
   buildDepends = [ liftedBase transformers ];
   testDepends = [ liftedBase transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 116875ecbdc..1fa820a2c5a 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -6,11 +6,12 @@
 
 cabal.mkDerivation (self: {
   pname = "filestore";
-  version = "0.6.0.3";
-  sha256 = "03qmv3cqp1fv7b7pdjdx12cb27bfjbwwjdhkcvkfq89qwk9wh1h0";
+  version = "0.6.0.4";
+  sha256 = "1b3ymdqwcn84m8kkybshx10bfylby49i0yhbassvlgf0n096lp12";
   buildDepends = [ Diff filepath parsec split time utf8String xml ];
   testDepends = [ Diff filepath HUnit mtl time ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     description = "Interface for versioning file stores";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/fixed-vector/default.nix b/pkgs/development/libraries/haskell/fixed-vector/default.nix
new file mode 100644
index 00000000000..81df126dd75
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fixed-vector/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, doctest, filemanip, primitive }:
+
+cabal.mkDerivation (self: {
+  pname = "fixed-vector";
+  version = "0.7.0.0";
+  sha256 = "07wpzcpnnz0jjq5gs4ra8c2hyrxzmp0ryk06y3ryf8i4w65awgvf";
+  buildDepends = [ primitive ];
+  testDepends = [ doctest filemanip primitive ];
+  meta = {
+    description = "Generic vectors with statically known size";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/fixed/default.nix
index 8003b47f64e..5a1aef66051 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/fixed/default.nix
@@ -3,13 +3,13 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "extensible-exceptions";
-  version = "0.1.1.2";
-  sha256 = "0rsdvb7k8mp88s1jjmna17qa6363vbjgvlkpncmn8516dnxhypg3";
+  pname = "fixed";
+  version = "0.2.1";
+  sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0";
   meta = {
-    description = "Extensible exceptions";
+    homepage = "http://github.com/ekmett/fixed";
+    description = "Signed 15.16 precision fixed point arithmetic";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix
index 480d974e2b8..9a890587f84 100644
--- a/pkgs/development/libraries/haskell/focus/default.nix
+++ b/pkgs/development/libraries/haskell/focus/default.nix
@@ -1,12 +1,11 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, lochTh, placeholders }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "focus";
-  version = "0.1.2";
-  sha256 = "0j157nv668621i94iqg923bfg7594bpfn0q9scb62cik2yikc1p0";
-  buildDepends = [ lochTh placeholders ];
+  version = "0.1.3";
+  sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy";
   meta = {
     homepage = "https://github.com/nikita-volkov/focus";
     description = "A general abstraction for manipulating elements of container data structures";
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 7a942e97dc8..bd0cd070d11 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.5";
-  sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048";
+  version = "1.0.7";
+  sha256 = "0mqxibifrlfqnibzy9b2rncy4dyljdz35560ni3rwi8hkyix74a9";
   buildDepends = [ primitive text transformers vector ];
   meta = {
     description = "Composable, streaming, and efficient left folds";
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 09a22c0ac60..91dfc9dca84 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -4,11 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.7";
-  sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy";
+  version = "0.3.0.8";
+  sha256 = "00b831l94r3lx0b330ql3w551w0fwziayhsjydzbfqq335syaaxg";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
+  jailbreak = true;
   meta = {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/formatting/default.nix b/pkgs/development/libraries/haskell/formatting/default.nix
index 1345ac76243..04fd9185081 100644
--- a/pkgs/development/libraries/haskell/formatting/default.nix
+++ b/pkgs/development/libraries/haskell/formatting/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "formatting";
-  version = "5.2";
-  sha256 = "0lmbzm98idy7bzpvaqnk9j6181vakk553smqkf959gn5jdj95z3k";
+  version = "5.4";
+  sha256 = "017fm3pqr2nqpcqmpldr74cvb641hxvybhvnwv8a8vv4ry1vdrk9";
   buildDepends = [ scientific text textFormat time ];
   meta = {
     description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix
index ee47e6bb3f5..a7edf7817ba 100644
--- a/pkgs/development/libraries/haskell/free-game/default.nix
+++ b/pkgs/development/libraries/haskell/free-game/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free-game";
-  version = "1.1.78";
-  sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6";
+  version = "1.1.80";
+  sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava";
   buildDepends = [
     boundingboxes colors controlBool filepath free freetype2 GLFWB
     hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index e516eb3613a..5837cc448c2 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.9";
-  sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx";
+  version = "4.10.0.1";
+  sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq";
   buildDepends = [
     bifunctors comonad distributive mtl preludeExtras profunctors
     semigroupoids semigroups transformers
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 3d308f6a88f..4db72b35234 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
-, systemFileio, systemFilepath, text, time, uniqueid
-, hinotify, hfsevents
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, hinotify, systemFileio, systemFilepath, tasty
+, tastyHunit, temporaryRc, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "fsnotify";
-  version = "0.0.11";
-  sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
-  buildDepends = [ systemFileio systemFilepath text time ] ++
-    (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+  version = "0.1.0.3";
+  sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
+  buildDepends = [
+    async hinotify systemFileio systemFilepath text time
+  ];
   testDepends = [
-    Cabal Glob hspec QuickCheck random systemFileio
-    systemFilepath text time uniqueid
-  ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
+    async systemFileio systemFilepath tasty tastyHunit temporaryRc
+  ];
   doCheck = false;
   meta = {
     description = "Cross platform library for file change notification";
diff --git a/pkgs/development/libraries/haskell/functor-infix/default.nix b/pkgs/development/libraries/haskell/functor-infix/default.nix
new file mode 100644
index 00000000000..d3e6322a7cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/functor-infix/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "functor-infix";
+  version = "0.0.1";
+  sha256 = "1f8m4nxlr2il9j0ilgw91fhp6mmz5xqlhylavncqwvbcq82362dc";
+  meta = {
+    homepage = "https://github.com/fmap/functor-infix";
+    description = "Compositions of functors";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix
index 9c18b511efc..fc3e6c32c72 100644
--- a/pkgs/development/libraries/haskell/generic-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix
@@ -1,19 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text
-, vector
+, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "generic-aeson";
-  version = "0.1.1.1";
-  sha256 = "14jpma2p4dxmzpwd557igbg7xhgdzp9w9fm6dxa06sgfqxvb7ln1";
+  version = "0.2.0.2";
+  sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh";
   buildDepends = [
-    aeson attoparsec genericDeriving mtl tagged text vector
+    aeson attoparsec genericDeriving mtl tagged text
+    unorderedContainers vector
   ];
   meta = {
     description = "Derivation of Aeson instances using GHC generics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 4ec1f451788..06c54391130 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.6.3";
-  sha256 = "04cjyl5aphf36qbbn75midrqj151fc77z2znpal8dk52gaab2f67";
+  version = "1.7.0";
+  sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix
index 2fce6c66be5..d7724a7b1ba 100644
--- a/pkgs/development/libraries/haskell/generics-sop/default.nix
+++ b/pkgs/development/libraries/haskell/generics-sop/default.nix
@@ -4,13 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "generics-sop";
-  version = "0.1.0.2";
-  sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra";
+  version = "0.1.0.4";
+  sha256 = "00rjlqsjb7hba5q0kbfwg4ajk75a4sd7m72wx18fa9rlz92qbx2j";
   buildDepends = [ tagged ];
   meta = {
     description = "Generic Programming using True Sums of Products";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    maintainers = with self.stdenv.lib.maintainers; [
+      aycanirican ocharles
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
index 9ab6d2df709..87e1296330a 100644
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ b/pkgs/development/libraries/haskell/geniplate/default.nix
@@ -4,11 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "geniplate";
-  version = "0.6.0.4";
-  sha256 = "1sw1bs3nzbdmvphy5g65pl40y8wdqkgvszx1i6viqjymjq96xv20";
+  version = "0.6.0.5";
+  sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
   buildDepends = [ mtl ];
   meta = {
-    description = "Use template Haskell to generate Uniplate-like functions";
+    description = "Use Template Haskell to generate Uniplate-like functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 704c820797e..a7032f5a250 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -1,12 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, binary, transformers }:
+{ cabal, binary, deepseq, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-heap-view";
-  version = "0.5.1";
-  sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
+  version = "0.5.3";
+  sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0";
   buildDepends = [ binary transformers ];
+  testDepends = [ deepseq ];
   postInstall = ''
     ensureDir "$out/share/ghci"
     ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
@@ -16,8 +17,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ andres ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
-
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix b/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
deleted file mode 100644
index a9c06e80f8a..00000000000
--- a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, convertible, deepseq, doctest, emacs, filepath
-, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mod";
-  version = "4.1.6";
-  sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal convertible deepseq filepath ghcSybUtils hlint ioChoice syb
-    time transformers
-  ];
-  testDepends = [
-    Cabal convertible deepseq doctest filepath ghcSybUtils hlint hspec
-    ioChoice syb time transformers
-  ];
-  buildTools = [ emacs ];
-  doCheck = false;
-  configureFlags = "--datasubdir=${self.pname}-${self.version}";
-  postInstall = ''
-    cd $out/share/$pname-$version
-    make
-    rm Makefile
-    cd ..
-    mkdir -p "$out/share/emacs"
-    mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
-    cat - > $out/bin/ghc-mod <<EOF
-    #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
-    EOF
-    chmod +x $out/bin/ghc-mod
-  '';
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell Programming";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.bluescreen303
-      self.stdenv.lib.maintainers.ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 3eefe056218..a2adaa2403d 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,26 +1,29 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
-, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
-, ioChoice, makeWrapper, monadControl, monadJournal, mtl, split
-, syb, text, time, transformers, transformersBase
+{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc
+, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts
+, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal
+, mtl, split, syb, temporary, text, time, transformers
+, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "5.0.1.1";
-  sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3";
+  version = "5.2.1.2";
+  sha256 = "11wnrdb6blw169w6kd49ax9h1r9qkka5329lmdhimvki8amv8riv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal convertible deepseq djinnGhc filepath ghcPaths ghcSybUtils
-    haskellSrcExts hlint ioChoice monadControl monadJournal mtl split
-    syb text time transformers transformersBase
+    async Cabal convertible dataDefault deepseq djinnGhc filepath
+    ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl
+    monadJournal mtl split syb temporary text time transformers
+    transformersBase
   ];
   testDepends = [
     Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
     ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
-    monadJournal mtl split syb text time transformers transformersBase
+    monadJournal mtl split syb temporary text time transformers
+    transformersBase
   ];
   buildTools = [ emacs makeWrapper ];
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix
new file mode 100644
index 00000000000..1cbfe4a19f3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-parser/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cpphs, happy }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-parser";
+  version = "0.1.3.0";
+  sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn";
+  buildTools = [ cpphs happy ];
+  patchPhase = ''
+    substituteInPlace build-parser.sh --replace "/bin/bash" "$SHELL"
+  '';
+  meta = {
+    homepage = "https://github.com/gibiansky/IHaskell";
+    description = "Haskell source parser from GHC";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 741523011ec..5a1da0848b2 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-vis";
-  version = "0.7.2.3";
-  sha256 = "1gl059n85yxksnq8y7i1vrsjdg4al6himzpdmw95v61y59bbs6c2";
+  version = "0.7.2.7";
+  sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
   buildDepends = [
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
@@ -22,6 +22,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ andres ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
deleted file mode 100644
index 8c87bcc0dc5..00000000000
--- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ghcjsBase, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "ghcjs-dom";
-  version = "0.1.0.0";
-  sha256 = "0qm43bd4m7w14p6ag643h09pll4fp09j1mzjyqvp0dhal03dc723";
-  buildDepends = [ ghcjsBase mtl text ];
-  meta = {
-    description = "DOM library that supports both GHCJS and WebKitGTK";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghcjs-prim/default.nix b/pkgs/development/libraries/haskell/ghcjs-prim/default.nix
new file mode 100644
index 00000000000..04d73661e60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghcjs-prim/default.nix
@@ -0,0 +1,12 @@
+{ cabal, primitive, fetchgit }:
+
+cabal.mkDerivation (self: {
+  pname = "ghcjs-prim";
+  version = "0.1.0.0";
+  src = fetchgit {
+    url = git://github.com/ghcjs/ghcjs-prim.git;
+    rev = "8e003e1a1df10233bc3f03d7bbd7d37de13d2a84";
+    sha256 = "11k2r87s58wmpxykn61lihn4vm3x67cm1dygvdl26papifinj6pz";
+  };
+  buildDepends = [ primitive ];
+})
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index 63468acf27f..c98f772f87a 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gio";
-  version = "0.13.0.0";
-  sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj";
+  version = "0.13.0.3";
+  sha256 = "15025jj6i1gpvjs46545vzmvs6ka41x15lrllqr9hd0qsyhibsf5";
   buildDepends = [ glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   pkgconfigDepends = [ glib ];
diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index f20976b8dcf..3e2b84a93db 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -1,18 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault
-, failure, hashable, HTTP, httpConduit, httpTypes, network, text
-, time, unorderedContainers, vector
+{ cabal, aeson, attoparsec, base16Bytestring, byteable
+, caseInsensitive, conduit, cryptohash, dataDefault, failure
+, hashable, HTTP, httpConduit, httpTypes, network, text, time
+, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.11.0";
-  sha256 = "13p0iplxr85fvgx5lird76xchmhh7xpddq900qr02kbvn5mqv607";
+  version = "0.13.1";
+  sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l";
   buildDepends = [
-    aeson attoparsec caseInsensitive conduit dataDefault failure
-    hashable HTTP httpConduit httpTypes network text time
-    unorderedContainers vector
+    aeson attoparsec base16Bytestring byteable caseInsensitive conduit
+    cryptohash dataDefault failure hashable HTTP httpConduit httpTypes
+    network text time unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/fpco/github";
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 0e0f147bab9..d256c2f014f 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -2,25 +2,24 @@
 
 { cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed
 , filepath, filestore, ghcPaths, happstackServer, highlightingKate
-, hoauth2, hslogger, HStringTemplate, HTTP, httpClient
-, httpClientTls, json, mtl, network, networkUri, pandoc
-, pandocTypes, parsec, random, recaptcha, safe, SHA, split, syb
-, tagsoup, text, time, uri, url, utf8String, xhtml, xml
-, xssSanitize, zlib
+, hoauth2, hslogger, HStringTemplate, HTTP, httpClientTls
+, httpConduit, json, mtl, network, networkUri, pandoc, pandocTypes
+, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
+, time, uri, url, utf8String, uuid, xhtml, xml, xssSanitize, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.5";
-  sha256 = "0p2x2l729rwals0kx8ymk6j3fqvlyjvrj6mmh8slcg93h4smwb4j";
+  version = "0.10.6.1";
+  sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore
     ghcPaths happstackServer highlightingKate hoauth2 hslogger
-    HStringTemplate HTTP httpClient httpClientTls json mtl network
+    HStringTemplate HTTP httpClientTls httpConduit json mtl network
     networkUri pandoc pandocTypes parsec random recaptcha safe SHA
-    split syb tagsoup text time uri url utf8String xhtml xml
+    split syb tagsoup text time uri url utf8String uuid xhtml xml
     xssSanitize zlib
   ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
index 6d2af558706..bb7206803eb 100644
--- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
+++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gitlib-libgit2";
-  version = "3.1.0";
-  sha256 = "1kjwc36fd14j2ipw53j8hdsy29gxir1qrm54wxgpp5n4q2kcs9pq";
+  version = "3.1.0.1";
+  sha256 = "0rqx1cqj7rciy7kr5dfzh4crvjk0s6amm3d5nzyawkkkdda54dcs";
   buildDepends = [
     conduit conduitCombinators exceptions fastLogger filepath gitlib
     hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl
diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix
index 38e1cbc36e7..130a0efdcd1 100644
--- a/pkgs/development/libraries/haskell/gitlib-test/default.nix
+++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gitlib-test";
-  version = "3.1.0";
-  sha256 = "0hnwx5r9fdkxvx0zmqffpym921dvf1x2lky8w11y3rfhk9i1g7l4";
+  version = "3.1.0.1";
+  sha256 = "1c65v86brvw3sy48vg79j0ijc5n4cpafksqsmbjs50h3v80zkdm3";
   buildDepends = [
     conduit conduitCombinators exceptions gitlib hspec
     hspecExpectations HUnit monadControl tagged text time transformers
diff --git a/pkgs/development/libraries/haskell/gl/default.nix b/pkgs/development/libraries/haskell/gl/default.nix
new file mode 100644
index 00000000000..05c7a68d0c3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gl/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, fixed, half, hxt, mesa, split, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "gl";
+  version = "0.6.1";
+  sha256 = "0wqsbwnp69g6vz5irf65zv1nx4vnlwcm771jxzk70r2wzi2vsg3y";
+  buildDepends = [ filepath fixed half hxt split transformers ];
+  extraLibraries = [ mesa ];
+  noHaddock = true;
+  meta = {
+    description = "Complete OpenGL raw bindings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 4a17862c966..872364fe985 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "glib";
-  version = "0.13.0.1";
-  sha256 = "0xbv7y1lmy35k6h2cgav7mxvpywvwfw47jq7qkcjj8mmr2sizp8i";
+  version = "0.13.0.6";
+  sha256 = "1hn3l0vrz76gmk7bjhs4nw68izf29k0pxm92l0zih7wq5ny4lhrv";
   buildDepends = [ text utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
index 66e6805ab54..172d5f31526 100644
--- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss-accelerate";
-  version = "1.8.0.0";
-  sha256 = "1hcqgsdk5pjqdr2j4i5614a1r56zfxqx5nc3xpnc4yw6hssan280";
+  version = "1.8.15.0";
+  sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0";
   buildDepends = [ accelerate accelerateCuda gloss ];
   meta = {
     description = "Extras to interface Gloss and Accelerate";
diff --git a/pkgs/development/libraries/haskell/gloss-banana/default.nix b/pkgs/development/libraries/haskell/gloss-banana/default.nix
new file mode 100644
index 00000000000..58adb03fc78
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gloss-banana/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, gloss, reactiveBanana }:
+
+cabal.mkDerivation (self: {
+  pname = "gloss-banana";
+  version = "0.1.0.4";
+  sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
+  buildDepends = [ gloss reactiveBanana ];
+  meta = {
+    homepage = "https://github.com/Twey/gloss-banana";
+    description = "An Interface for gloss in terms of a reactive-banana Behavior";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ twey ];
+    broken = true;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
index 2a51b17dcd5..1a21c2632ee 100644
--- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss-raster-accelerate";
-  version = "1.8.0.0";
-  sha256 = "17545lb99iszhmx8f8fan0dm76ps6bc977zs2ramycnybzbb3kyc";
+  version = "1.8.15.0";
+  sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10";
   buildDepends = [ accelerate accelerateCuda gloss glossAccelerate ];
   meta = {
     description = "Parallel rendering of raster images using Accelerate";
diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix
index ff5e202ae73..16316b16590 100644
--- a/pkgs/development/libraries/haskell/gloss-raster/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, gloss, llvm, repa }:
+{ cabal, gloss, glossRendering, llvm, repa }:
 
 cabal.mkDerivation (self: {
   pname = "gloss-raster";
-  version = "1.8.2.1";
-  sha256 = "0ls8rlwrbpisrmq2xigf9926pak028dmld6shrblcmdbykaz55ha";
-  buildDepends = [ gloss repa ];
+  version = "1.9.2.1";
+  sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw";
+  buildDepends = [ gloss glossRendering repa ];
   extraLibraries = [ llvm ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/gloss-rendering/default.nix b/pkgs/development/libraries/haskell/gloss-rendering/default.nix
new file mode 100644
index 00000000000..190993e44fc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gloss-rendering/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bmp, GLUT, OpenGL }:
+
+cabal.mkDerivation (self: {
+  pname = "gloss-rendering";
+  version = "1.9.2.1";
+  sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k";
+  buildDepends = [ bmp GLUT OpenGL ];
+  meta = {
+    description = "Gloss picture data types and rendering functions";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index ce6357baaeb..da6eb98776f 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, bmp, GLUT, OpenGL }:
+{ cabal, bmp, glossRendering, GLUT, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.8.2.1";
-  sha256 = "0wnrss7j7zf4lbmr5rryx7m5qb4pqh7vvz11ksbsfn3d3hf285y2";
-  buildDepends = [ bmp GLUT OpenGL ];
+  version = "1.9.2.1";
+  sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
+  buildDepends = [ bmp glossRendering GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
     description = "Painless 2D vector graphics, animations and simulations";
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 47fc34c55ba..c50e0403bd6 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -1,7 +1,7 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck
-, temporary, text, transformers, wlPprintText
+, systemGraphviz, temporary, text, transformers, wlPprintText
 }:
 
 cabal.mkDerivation (self: {
@@ -14,7 +14,8 @@ cabal.mkDerivation (self: {
     colour dlist fgl filepath polyparse temporary text transformers
     wlPprintText
   ];
-  testDepends = [ fgl filepath QuickCheck text ];
+  testDepends = [ fgl filepath QuickCheck systemGraphviz text ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/greencard/default.nix
index 02757e9074c..530c3be1505 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
+++ b/pkgs/development/libraries/haskell/greencard/default.nix
@@ -3,16 +3,15 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.2.3";
-  sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz";
+  pname = "greencard";
+  version = "3.0.4.2";
+  sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y";
   isLibrary = true;
   isExecutable = true;
   meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
+    homepage = "https://github.com/sof/greencard";
+    description = "GreenCard, a foreign function pre-processor for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/grid/default.nix b/pkgs/development/libraries/haskell/grid/default.nix
new file mode 100644
index 00000000000..8826d3ca2b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/grid/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cereal, QuickCheck, testFramework
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "grid";
+  version = "7.6.7";
+  sha256 = "1sdm47y9hbqn40bfi4fssnbrhksca7gdkgpqvz1gd2lqs729i1nf";
+  buildDepends = [ cereal ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/mhwombat/grid";
+    description = "Tools for working with regular grids (graphs, lattices)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index bb667691677..effbd57f799 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk";
-  version = "0.13.0.0";
-  sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m";
+  version = "0.13.3";
+  sha256 = "016v6r53py659ncx0nvlcvvs3j3kj6rrbrm7lk8sggdhm7jvz6w7";
   buildDepends = [ cairo gio glib mtl pango text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 1fe97ad01aa..9fabf287166 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk2hs-buildtools";
-  version = "0.13.0.1";
-  sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa";
+  version = "0.13.0.3";
+  sha256 = "1ijcmcjp8mralpzl1gvh24bzq8njlzkvck1r07b010rrklv04arp";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath hashtables random ];
diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix
index 99d76c03c52..d39adf4e5e4 100644
--- a/pkgs/development/libraries/haskell/gtk3/default.nix
+++ b/pkgs/development/libraries/haskell/gtk3/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk3";
-  version = "0.13.0.0";
-  sha256 = "0aq58gf6bcwnk085in0xilg7p8zyd2v079aqk1c47gjyrcg7p78f";
+  version = "0.13.3";
+  sha256 = "0246d4dxgmfvq7g8avswjry2rh5lfj1kzcf0vqwchgvlvcfhgzlh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cairo gio glib mtl pango text time transformers ];
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
index 393c1f07682..d3f0f3136f8 100644
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtksourceview2";
-  version = "0.13.0.0";
-  sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn";
+  version = "0.13.1.1";
+  sha256 = "09439drmwfy5bqni1clcn0nng30irn9x43fjak9jljggg1yij9xw";
   buildDepends = [ glib gtk mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
index 65ba25d1d9a..5cbad954c31 100644
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ b/pkgs/development/libraries/haskell/hS3/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random
-, regexCompat, utf8String
+{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, networkUri
+, random, regexCompat, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hS3";
-  version = "0.5.8";
-  sha256 = "1wmrrmlz4qlhr75lixn385pjpvpq21aafgf0fw8jyfqgdyjkg7bm";
+  version = "0.5.9";
+  sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Crypto dataenc HTTP hxt MissingH network random regexCompat
-    utf8String
+    Crypto dataenc HTTP hxt MissingH network networkUri random
+    regexCompat utf8String
   ];
   meta = {
     homepage = "http://gregheartsfield.com/hS3/";
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index 1668574d7c8..e4243def8b4 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.8";
-  sha256 = "0iav085xq4d6k9z0x7jlnw3r3wwnzbr7ygbaqnblj6mcpnps9r3q";
+  version = "1.11";
+  sha256 = "14jjy3i5pjdcw2cx3n5ipg72zahvy9vh87vlcgnz44slw8av6dcq";
   buildDepends = [ Cabal filepath tar utf8String ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";
-    description = "provide access to the Hackage database via Data.Map";
+    description = "access Hackage's package database via Data.Map";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ simons ];
diff --git a/pkgs/development/libraries/haskell/haddock-api/default.nix b/pkgs/development/libraries/haskell/haddock-api/default.nix
new file mode 100644
index 00000000000..d2dc35b1ffd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haddock-api/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, Cabal, deepseq, filepath, ghcPaths, haddockLibrary, xhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haddock-api";
+  version = "2.15.0.1";
+  sha256 = "1s25wykd5ka9chi67s07zy1jyd4pxs72d6lcpj7551izcs2l86sm";
+  buildDepends = [
+    Cabal deepseq filepath ghcPaths haddockLibrary xhtml
+  ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/haddock-library/default.nix b/pkgs/development/libraries/haskell/haddock-library/default.nix
index aece9e35873..a7041b3ba28 100644
--- a/pkgs/development/libraries/haskell/haddock-library/default.nix
+++ b/pkgs/development/libraries/haskell/haddock-library/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haddock-library";
-  version = "1.1.0";
-  sha256 = "0apqm9nxgxbpvcphaim93q4z67c1cd0vdjz0i1cbr67ymffl69nd";
+  version = "1.1.1";
+  sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m";
   buildDepends = [ deepseq ];
   testDepends = [ baseCompat deepseq hspec QuickCheck ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index e38eadad057..7eeacd238ba 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -2,31 +2,33 @@
 
 { cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash
 , dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes
-, HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec
-, QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer
-, systemFilepath, tagsoup, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text, time, utillinux
+, HUnit, lrucache, mtl, network, networkUri, pandoc, pandocCiteproc
+, parsec, QuickCheck, random, regexBase, regexTdfa, snapCore
+, snapServer, systemFilepath, tagsoup, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, text, time
+, utillinux
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.5.4.0";
-  sha256 = "16srkm2fxjw1xg7zaikn49zz4xsz9awddnjm6ibv522k3xf3l24c";
+  version = "4.6.1.1";
+  sha256 = "1y1bc25ivj6sgq9909qgwsm54dn6sdisd1znkk9r5x9c7ajv6gaa";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
-    filepath fsnotify httpConduit httpTypes lrucache mtl network pandoc
-    pandocCiteproc parsec random regexBase regexTdfa snapCore
-    snapServer systemFilepath tagsoup text time
+    filepath fsnotify httpConduit httpTypes lrucache mtl network
+    networkUri pandoc pandocCiteproc parsec random regexBase regexTdfa
+    snapCore snapServer systemFilepath tagsoup text time
   ];
   testDepends = [
     binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
     filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network
-    pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa
-    snapCore snapServer systemFilepath tagsoup testFramework
+    networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase
+    regexTdfa snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time utillinux
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/half/default.nix
index 6007e845e9b..e113f6730d9 100644
--- a/pkgs/development/libraries/haskell/stm/2.4.nix
+++ b/pkgs/development/libraries/haskell/half/default.nix
@@ -3,13 +3,13 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.4";
-  sha256 = "13flyzh2vnqnap78qjawdh3150rmp9bxnlgynsf793lm1b3z15fl";
+  pname = "half";
+  version = "0.2.0.1";
+  sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw";
   meta = {
-    description = "Software Transactional Memory";
+    homepage = "http://github.com/ekmett/half";
+    description = "Half-precision floating-point";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/handa-gdata/default.nix b/pkgs/development/libraries/haskell/handa-gdata/default.nix
new file mode 100644
index 00000000000..b96c68297cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/handa-gdata/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs
+, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json
+, network, pureMD5, random, regexPosix, resourcet, split, time
+, unixCompat, utf8String, xml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "handa-gdata";
+  version = "0.7.0.1";
+  sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    base64Bytestring binary caseInsensitive cmdargs dataDefault
+    filepath GenericPretty HTTP httpConduit json network pureMD5 random
+    regexPosix resourcet split time unixCompat utf8String xml
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://code.google.com/p/hgdata";
+    description = "Library and command-line utility for accessing Google services and APIs";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index e81235cf097..3567b418ba3 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     description = "Support for Hamlet HTML templates in Happstack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
index 610220cc09e..d0d4de909ef 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-lite";
-  version = "7.3.4";
-  sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811";
+  version = "7.3.6";
+  sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8";
   buildDepends = [ happstackServer mtl text ];
   meta = {
     homepage = "http://www.happstack.com/";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 1bc0b36f120..15a1e90414e 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.8";
-  sha256 = "11jy4r4ih6sndyga3fjg298f5ww8806180dm3fgzsm0xfsjw1ac2";
+  version = "7.4.0";
+  sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network networkUri parsec sendfile syb
@@ -18,8 +18,6 @@ cabal.mkDerivation (self: {
     transformersBase utf8String xhtml zlib
   ];
   testDepends = [ HUnit parsec zlib ];
-  jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "http://happstack.com";
     description = "Web related tools and services";
diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
deleted file mode 100644
index 3c8330e82ae..00000000000
--- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck, random, testFramework
-, testFrameworkQuickcheck2, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "hashable";
-  version = "1.1.2.5";
-  sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z";
-  buildDepends = [ text ];
-  testDepends = [
-    QuickCheck random testFramework testFrameworkQuickcheck2 text
-  ];
-  meta = {
-    homepage = "http://github.com/tibbe/hashable";
-    description = "A class for types that can be converted to a hash value";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix b/pkgs/development/libraries/haskell/hashable/default.nix
index bfd9ec03c0e..ba2690e6ce8 100644
--- a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/hashable/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashable";
-  version = "1.2.2.0";
-  sha256 = "08cfm1rzhf3d8dzn0iqadfs35151ff6szhnh4bwrpxcs6sq90fh3";
+  version = "1.2.3.0";
+  sha256 = "02akgpwjzj2w5jnn31xp6yvgs4xmyircm8wcbq9v0icza6yb11qi";
   buildDepends = [ text ];
   testDepends = [
     HUnit QuickCheck random testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index c941e08da35..ddccebeb48d 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -1,11 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hashable, primitive, vector }:
+{ cabal, fetchgit, hashable, primitive, vector }:
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.1.2.1";
-  sha256 = "1166baqalpp9v735821drjvyasr44p4znbcs7njyr09fx87r23f5";
+  version = "1.2.0.1";
+  src = fetchgit {
+    url = "git://github.com/gregorycollins/hashtables.git";
+    sha256 = "1622ba3eb37e72cbedf01ae17162e045ca6506dea8a78750cc85805fe8e86129";
+    rev = "a045fa90f4bc3923f38d1b468ce4d3982cef85e0";
+  };
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";
diff --git a/pkgs/development/libraries/haskell/hask/default.nix b/pkgs/development/libraries/haskell/hask/default.nix
new file mode 100644
index 00000000000..3162a4fb7e4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hask/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, constraints, reflection, tagged, transformers, void }:
+
+cabal.mkDerivation (self: {
+  pname = "hask";
+  version = "0";
+  sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
+  buildDepends = [ constraints reflection tagged transformers void ];
+  meta = {
+    homepage = "http://github.com/ekmett/hask";
+    description = "Categories";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    broken = true;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix
index ad482d33d7b..7ca03476110 100644
--- a/pkgs/development/libraries/haskell/haskell-generate/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-generate";
-  version = "0.2";
-  sha256 = "0bkaarc40lcw3v2y6qdf91rx21v3w82y62kaadhmmh5ikq99pybw";
+  version = "0.2.2";
+  sha256 = "1wdfs28p195szg6jxq0qbyj4jdbqnsp9frgjnp25mzf14y9i1yid";
   buildDepends = [ haskellSrcExts transformers ];
   testDepends = [ doctest filepath ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index fb1a1b6e263..5185c1037a8 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.4";
-  sha256 = "02cbs3bwakm9bwh4yy242msh5hibxfr9dsc6a0nbpihj1fhbv6b4";
+  version = "0.5.0";
+  sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr";
   buildDepends = [
     aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts
     hseCpp mtl tagged transformers traverseWithClass typeEq uniplate
diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix
index 9c6997a9db9..a23c6691a66 100644
--- a/pkgs/development/libraries/haskell/haskell-packages/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix
@@ -1,16 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, Cabal, deepseq, either, filepath, haskellSrcExts
-, hseCpp, mtl, optparseApplicative, tagged
+{ cabal, aeson, Cabal, deepseq, filepath, haskellSrcExts, hseCpp
+, mtl, optparseApplicative, tagged, transformers
+, transformersCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-packages";
-  version = "0.2.4.1";
-  sha256 = "014zcq27rwsgj3n4kdgswbppr5yzf3lnj5gnv45r3i5c3rd1mz6k";
+  version = "0.2.4.3";
+  sha256 = "0s1z5zzl53nmjnrlf1czri634h8fksbgkqvvz8hpwa60wsaf4dxn";
   buildDepends = [
-    aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl
-    optparseApplicative tagged
+    aeson Cabal deepseq filepath haskellSrcExts hseCpp mtl
+    optparseApplicative tagged transformers transformersCompat
   ];
   meta = {
     homepage = "http://documentup.com/haskell-suite/haskell-packages";
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
deleted file mode 100644
index eac734a8422..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline,
- haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
- stm, time, xhtml, zlib, parsec, network,
- cabalInstall, alex, happy, ghc}:
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2009.2.0.2";
-  src = fetchurl {
-    url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "e0469fac9b1d091d8299ae16a4e2e7fcd504285bba066b17153a0f0104a049bd";
-  };
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
-    haskellSrc html parallel regexBase regexCompat regexPosix
-    stm time xhtml zlib parsec network
-    cabalInstall alex happy ghc
-  ];
-  meta = {
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
deleted file mode 100644
index 8c1630752ec..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
- haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
- stm, xhtml, zlib, parsec,
- cabalInstall, alex, happy, ghc}:
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2010.1.0.0";
-  src = fetchurl {
-    url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "0cadj0ql2i5d5njwcbhmjkf4qrkfmxirg5vjv1wlx3ayzbynbrp4";
-  };
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
-    haskellSrc html network parallel regexBase regexCompat regexPosix
-    stm xhtml zlib parsec
-    cabalInstall alex happy ghc
-  ];
-  meta = {
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-    broken = true;              # The source code is no longer available from haskell.org.
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
deleted file mode 100644
index b9a3a841af5..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
- haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
- stm, xhtml, zlib, mtl, parsec, deepseq,
- cabalInstall, alex, happy, ghc}:
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2010.2.0.0";
-  src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz";
-    sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0";
-  };
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
-    haskellSrc html network parallel regexBase regexCompat regexPosix
-    stm xhtml zlib mtl parsec deepseq
-    cabalInstall alex happy ghc
-  ];
-  meta = {
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
deleted file mode 100644
index 4a9752a0611..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
- haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
- stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
- cabalInstall, alex, happy, ghc}:
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2011.2.0.0";
-  src = fetchurl {
-    # url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb";
-  };
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
-    haskellSrc html network parallel parsec regexBase regexCompat regexPosix
-    stm syb deepseq text transformers mtl xhtml zlib
-    cabalInstall alex happy ghc
-  ];
-  noHaddock = true;
-  meta = {
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
deleted file mode 100644
index cae4cc6796c..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
- haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
- stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
- cabalInstall, alex, happy, ghc}:
-
-# This is just a meta-package. Because upstream fails to provide proper versioned
-# release tarballs that can be used for the purpose of verifying this package, we
-# just create it on the fly from a simple Setup.hs file and a .cabal file that we
-# store directly in the nixpkgs repository.
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2011.2.0.1";
-  cabalFile = ./haskell-platform-2011.2.0.1.cabal;
-  setupFile = ./Setup.hs;
-  src = null;
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
-    haskellSrc html network parallel parsec regexBase regexCompat regexPosix
-    stm syb deepseq text transformers mtl xhtml zlib
-    cabalInstall alex happy ghc
-  ];
-  unpackPhase = ''
-    sourceRoot=haskell-platform
-    mkdir $sourceRoot
-    cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
-    cp ${self.setupFile} $sourceRoot/Setup.hs
-    touch $sourceRoot/LICENSE
-  '';
-  noHaddock = true;
-  meta = {
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
deleted file mode 100644
index 61aa32aff45..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
- haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
- stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
- cabalInstall, alex, happy, ghc}:
-
-# This is just a meta-package. Because upstream fails to provide proper versioned
-# release tarballs that can be used for the purpose of verifying this package, we
-# just create it on the fly from a simple Setup.hs file and a .cabal file that we
-# store directly in the nixpkgs repository.
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2011.4.0.0";
-  cabalFile = ./haskell-platform-2011.4.0.0.cabal;
-  setupFile = ./Setup.hs;
-  src = null;
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
-    haskellSrc html network parallel parsec regexBase regexCompat regexPosix
-    stm syb deepseq text transformers mtl xhtml zlib
-    cabalInstall alex happy ghc
-  ];
-  unpackPhase = ''
-    sourceRoot=haskell-platform
-    mkdir $sourceRoot
-    cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
-    cp ${self.setupFile} $sourceRoot/Setup.hs
-    touch $sourceRoot/LICENSE
-  '';
-  noHaddock = true;
-  meta = {
-    homepage = "http://haskell.org/platform";
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
deleted file mode 100644
index 9873342fa8d..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
- haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
- stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random,
- cabalInstall, alex, happy, ghc}:
-
-# This is just a meta-package. Because upstream fails to provide proper versioned
-# release tarballs that can be used for the purpose of verifying this package, we
-# just create it on the fly from a simple Setup.hs file and a .cabal file that we
-# store directly in the nixpkgs repository.
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2012.2.0.0";
-  cabalFile = ./haskell-platform-2012.2.0.0.cabal;
-  setupFile = ./Setup.hs;
-  src = null;
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
-    haskellSrc html network parallel parsec regexBase regexCompat regexPosix
-    stm syb deepseq text transformers mtl xhtml zlib random
-    cabalInstall alex happy ghc
-  ];
-  unpackPhase = ''
-    sourceRoot=haskell-platform
-    mkdir $sourceRoot
-    cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
-    cp ${self.setupFile} $sourceRoot/Setup.hs
-    touch $sourceRoot/LICENSE
-  '';
-  noHaddock = true;
-  meta = {
-    homepage = "http://haskell.org/platform";
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
deleted file mode 100644
index e54f9264159..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl,
- haskellSrc, html, network, parallel, parsec, primitive,
- regexBase, regexCompat, regexPosix,
- split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random,
- cabalInstall, alex, happy, ghc}:
-
-# This is just a meta-package. Because upstream fails to provide proper versioned
-# release tarballs that can be used for the purpose of verifying this package, we
-# just create it on the fly from a simple Setup.hs file and a .cabal file that we
-# store directly in the nixpkgs repository.
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2012.4.0.0";
-  cabalFile = ./haskell-platform-2012.4.0.0.cabal;
-  setupFile = ./Setup.hs;
-  src = null;
-  isLibrary = false;
-  propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl
-    haskellSrc html network parallel parsec primitive
-    regexBase regexCompat regexPosix
-    split stm syb deepseq text transformers mtl vector xhtml zlib random
-    cabalInstall alex happy ghc
-  ];
-  unpackPhase = ''
-    sourceRoot=haskell-platform
-    mkdir $sourceRoot
-    cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
-    cp ${self.setupFile} $sourceRoot/Setup.hs
-    touch $sourceRoot/LICENSE
-  '';
-  noHaddock = true;
-  meta = {
-    homepage = "http://haskell.org/platform";
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix
deleted file mode 100644
index c7ce9b09815..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ cabal, fetchurl
-, async, attoparsec, caseInsensitive, cgi, fgl, GLUT, GLURaw, haskellSrc
-, hashable, html, HTTP, HUnit, mtl, network, OpenGL, OpenGLRaw, parallel
-, parsec, QuickCheck, random, regexBase, regexCompat, regexPosix, split, stm
-, syb, text, transformers, unorderedContainers, vector, xhtml, zlib
-, cabalInstall, alex, happy, primitive, ghc
-}:
-
-# This is just a meta-package. Because upstream fails to provide proper versioned
-# release tarballs that can be used for the purpose of verifying this package, we
-# just create it on the fly from a simple Setup.hs file and a .cabal file that we
-# store directly in the nixpkgs repository.
-
-cabal.mkDerivation (self : {
-  pname = "haskell-platform";
-  version = "2013.2.0.0";
-  cabalFile = ./haskell-platform-2013.2.0.0.cabal;
-  setupFile = ./Setup.hs;
-  src = null;
-  isLibrary = false;
-  propagatedBuildInputs = [
-    async attoparsec caseInsensitive cgi fgl GLUT GLURaw haskellSrc
-    hashable html HTTP HUnit mtl network OpenGL OpenGLRaw parallel
-    parsec QuickCheck random regexBase regexCompat regexPosix split stm
-    syb text transformers unorderedContainers vector xhtml zlib
-    cabalInstall alex happy primitive ghc
-  ];
-  unpackPhase = ''
-    sourceRoot=haskell-platform
-    mkdir $sourceRoot
-    cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
-    cp ${self.setupFile} $sourceRoot/Setup.hs
-    touch $sourceRoot/LICENSE
-  '';
-  noHaddock = true;
-  meta = {
-    homepage = "http://haskell.org/platform";
-    description = "Haskell Platform meta package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [andres simons];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs b/pkgs/development/libraries/haskell/haskell-platform/Setup.hs
deleted file mode 100644
index 47fd3a5c71b..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-import Distribution.Simple
-import Distribution.Simple.Program
-
-main = defaultMainWithHooks simpleUserHooks { hookedPrograms = [cabal] }
-
-cabal :: Program
-cabal = (simpleProgram "cabal-install") {
-  programFindLocation = \x -> findProgramLocation x "cabal",
-  programFindVersion  = findProgramVersion "--numeric-version" id
-}
diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix
deleted file mode 100644
index 2de2809cf53..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/default.nix
+++ /dev/null
@@ -1,314 +0,0 @@
-{ pkgs }:
-
-let
-  haskellPlatformPackages_2013_2_0_0 = pkgs.haskell.packages_ghc763.override {
-    extension = self : super : {
-      async                     = self.async_2_0_1_4;
-      attoparsec                = self.attoparsec_0_10_4_0;
-      caseInsensitive           = self.caseInsensitive_1_0_0_1;
-      cgi                       = self.cgi_3001_1_7_5;
-      fgl                       = self.fgl_5_4_2_4;
-      GLUT                      = self.GLUT_2_4_0_0;
-      GLURaw                    = self.GLURaw_1_3_0_0;
-      haskellSrc                = self.haskellSrc_1_0_1_5;
-      hashable                  = self.hashable_1_1_2_5;
-      html                      = self.html_1_0_1_2;
-      HTTP                      = self.HTTP_4000_2_8;
-      HUnit                     = self.HUnit_1_2_5_2;
-      mtl                       = self.mtl_2_1_2;
-      network                   = self.network_2_4_1_2;
-      OpenGL                    = self.OpenGL_2_8_0_0;
-      OpenGLRaw                 = self.OpenGLRaw_1_3_0_0;
-      parallel                  = self.parallel_3_2_0_3;
-      parsec                    = self.parsec_3_1_3;
-      QuickCheck                = self.QuickCheck_2_6;
-      random                    = self.random_1_0_1_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_95_1;
-      regexPosix                = self.regexPosix_0_95_2;
-      split                     = self.split_0_2_2;
-      stm                       = self.stm_2_4_2;
-      syb                       = self.syb_0_4_0;
-      text                      = self.text_0_11_3_1;
-      transformers              = self.transformers_0_3_0_0;
-      unorderedContainers       = self.unorderedContainers_0_2_3_0;
-      vector                    = self.vector_0_10_0_1;
-      xhtml                     = self.xhtml_3000_2_1;
-      zlib                      = self.zlib_0_5_4_1;
-      cabalInstall              = self.cabalInstall_1_16_0_2;
-      alex                      = self.alex_3_0_5;
-      happy                     = self.happy_1_18_10;
-      primitive                 = self.primitive_0_5_0_1; # semi-official, but specified
-    };
-  };
-
-  haskellPlatformPackages_2012_4_0_0 = pkgs.haskell.packages_ghc742.override {
-    extension = self : super : {
-      async                     = self.async_2_0_1_3;
-      cgi                       = self.cgi_3001_1_7_4;
-      fgl                       = self.fgl_5_4_2_4;
-      GLUT                      = self.GLUT_2_1_2_1;
-      haskellSrc                = self.haskellSrc_1_0_1_5;
-      html                      = self.html_1_0_1_2;
-      HTTP                      = super.HTTP_4000_2_5.override { network = self.network_2_3_1_0; };
-      HUnit                     = self.HUnit_1_2_5_1;
-      mtl                       = self.mtl_2_1_2;
-      network                   = self.network_2_3_1_0;
-      OpenGL                    = self.OpenGL_2_2_3_1;
-      parallel                  = self.parallel_3_2_0_3;
-      parsec                    = self.parsec_3_1_3;
-      QuickCheck                = self.QuickCheck_2_5_1_1;
-      random                    = self.random_1_0_1_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_95_1;
-      regexPosix                = self.regexPosix_0_95_2;
-      split                     = self.split_0_2_1_1;
-      stm                       = self.stm_2_4;
-      syb                       = self.syb_0_3_7;
-      text                      = self.text_0_11_2_3;
-      transformers              = self.transformers_0_3_0_0;
-      vector                    = self.vector_0_10_0_1;
-      xhtml                     = self.xhtml_3000_2_1;
-      zlib                      = self.zlib_0_5_4_0;
-      cabalInstall              = self.cabalInstall_0_14_0;
-      alex                      = self.alex_3_0_2;
-      happy                     = self.happy_1_18_10;
-      primitive                 = self.primitive_0_5_0_1; # semi-official, but specified
-    };
-  };
-
-  haskellPlatformPackages_2012_2_0_0 = pkgs.haskell.packages_ghc742.override {
-    ghcPath = ../../../compilers/ghc/7.4.1.nix;
-    extension = self : super : {
-      cgi                       = self.cgi_3001_1_7_4;
-      fgl                       = self.fgl_5_4_2_4;
-      GLUT                      = self.GLUT_2_1_2_1;
-      haskellSrc                = self.haskellSrc_1_0_1_5;
-      html                      = self.html_1_0_1_2;
-      HTTP                      = self.HTTP_4000_2_3;
-      HUnit                     = self.HUnit_1_2_4_2;
-      mtl                       = self.mtl_2_1_1;
-      network                   = self.network_2_3_0_13;
-      OpenGL                    = self.OpenGL_2_2_3_1;
-      parallel                  = self.parallel_3_2_0_2;
-      parsec                    = self.parsec_3_1_2;
-      QuickCheck                = self.QuickCheck_2_4_2;
-      random                    = self.random_1_0_1_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_95_1;
-      regexPosix                = self.regexPosix_0_95_1;
-      stm                       = self.stm_2_3;
-      syb                       = self.syb_0_3_6_1;
-      text                      = self.text_0_11_2_0;
-      transformers              = self.transformers_0_3_0_0;
-      xhtml                     = self.xhtml_3000_2_1;
-      zlib                      = self.zlib_0_5_3_3;
-      cabalInstall              = self.cabalInstall_0_14_0;
-      alex                      = self.alex_3_0_1;
-      happy                     = self.happy_1_18_9;
-    };
-  };
-
-  haskellPlatformPackages_2011_4_0_0 = pkgs.haskell.packages_ghc704.override {
-    extension = self : super : {
-      cgi                       = self.cgi_3001_1_7_4;
-      fgl                       = self.fgl_5_4_2_4;
-      GLUT                      = self.GLUT_2_1_2_1;
-      haskellSrc                = self.haskellSrc_1_0_1_4;
-      html                      = self.html_1_0_1_2;
-      HUnit                     = self.HUnit_1_2_4_2;
-      network                   = self.network_2_3_0_5;
-      OpenGL                    = self.OpenGL_2_2_3_0;
-      parallel                  = self.parallel_3_1_0_1;
-      parsec                    = self.parsec_3_1_1;
-      QuickCheck                = self.QuickCheck_2_4_1_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_95_1;
-      regexPosix                = self.regexPosix_0_95_1;
-      stm                       = self.stm_2_2_0_1;
-      syb                       = self.syb_0_3_3;
-      xhtml                     = self.xhtml_3000_2_0_4;
-      zlib                      = self.zlib_0_5_3_1;
-      HTTP                      = self.HTTP_4000_1_2;
-      deepseq                   = self.deepseq_1_1_0_2;
-      text                      = self.text_0_11_1_5;
-      transformers              = self.transformers_0_2_2_0;
-      mtl                       = self.mtl_2_0_1_0;
-      cabalInstall              = self.cabalInstall_0_10_2;
-      alex                      = self.alex_2_3_5;
-      happy                     = self.happy_1_18_6;
-    };
-  };
-
-  haskellPlatformPackages_2011_2_0_1 = pkgs.haskell.packages_ghc704.override {
-    ghcPath = ../../../compilers/ghc/7.0.3.nix;
-    extension = self : super : {
-      cgi                       = self.cgi_3001_1_7_4;
-      fgl                       = self.fgl_5_4_2_3;
-      GLUT                      = self.GLUT_2_1_2_1;
-      haskellSrc                = self.haskellSrc_1_0_1_4;
-      html                      = self.html_1_0_1_2;
-      HUnit                     = self.HUnit_1_2_2_3;
-      network                   = self.network_2_3_0_2;
-      OpenGL                    = self.OpenGL_2_2_3_0;
-      parallel                  = self.parallel_3_1_0_1;
-      parsec                    = self.parsec_3_1_1;
-      QuickCheck                = self.QuickCheck_2_4_0_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_93_1;
-      regexPosix                = self.regexPosix_0_94_4;
-      stm                       = self.stm_2_2_0_1;
-      syb                       = self.syb_0_3;
-      xhtml                     = self.xhtml_3000_2_0_1;
-      zlib                      = self.zlib_0_5_3_1;
-      HTTP                      = self.HTTP_4000_1_1;
-      deepseq                   = self.deepseq_1_1_0_2;
-      text                      = self.text_0_11_0_6;
-      transformers              = self.transformers_0_2_2_0;
-      mtl                       = self.mtl_2_0_1_0;
-      cabalInstall              = self.cabalInstall_0_10_2;
-      alex                      = self.alex_2_3_5;
-      happy                     = self.happy_1_18_6;
-    };
-  };
-
-  haskellPlatformPackages_2011_2_0_0 = pkgs.haskell.packages_ghc704.override {
-    ghcPath = ../../../compilers/ghc/7.0.2.nix;
-    extension = self : super : {
-      cgi                       = self.cgi_3001_1_7_4;
-      fgl                       = self.fgl_5_4_2_3;
-      GLUT                      = self.GLUT_2_1_2_1;
-      haskellSrc                = self.haskellSrc_1_0_1_4;
-      html                      = self.html_1_0_1_2;
-      HUnit                     = self.HUnit_1_2_2_3;
-      network                   = self.network_2_3_0_2;
-      OpenGL                    = self.OpenGL_2_2_3_0;
-      parallel                  = self.parallel_3_1_0_1;
-      parsec                    = self.parsec_3_1_1;
-      QuickCheck                = self.QuickCheck_2_4_0_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_93_1;
-      regexPosix                = self.regexPosix_0_94_4;
-      stm                       = self.stm_2_2_0_1;
-      syb                       = self.syb_0_3;
-      xhtml                     = self.xhtml_3000_2_0_1;
-      zlib                      = self.zlib_0_5_3_1;
-      HTTP                      = self.HTTP_4000_1_1;
-      deepseq                   = self.deepseq_1_1_0_2;
-      text                      = self.text_0_11_0_5;
-      transformers              = self.transformers_0_2_2_0;
-      mtl                       = self.mtl_2_0_1_0;
-      cabalInstall              = self.cabalInstall_0_10_2;
-      alex                      = self.alex_2_3_5;
-      happy                     = self.happy_1_18_6;
-    };
-  };
-
-  haskellPlatformPackages_2010_2_0_0 = pkgs.haskell.packages_ghc6123.override {
-    extension = self : super : {
-      cgi                       = self.cgi_3001_1_7_3;
-      fgl                       = self.fgl_5_4_2_3;
-      GLUT                      = self.GLUT_2_1_2_1;
-      haskellSrc                = self.haskellSrc_1_0_1_3;
-      html                      = self.html_1_0_1_2;
-      HUnit                     = self.HUnit_1_2_2_1;
-      mtl                       = self.mtl_1_1_0_2;
-      network                   = self.network_2_2_1_7;
-      OpenGL                    = self.OpenGL_2_2_3_0;
-      parallel                  = self.parallel_2_2_0_1;
-      parsec                    = self.parsec_2_1_0_1;
-      QuickCheck                = self.QuickCheck_2_1_1_1;
-      regexBase                 = self.regexBase_0_93_2;
-      regexCompat               = self.regexCompat_0_93_1;
-      regexPosix                = self.regexPosix_0_94_2;
-      stm                       = self.stm_2_1_2_1;
-      xhtml                     = self.xhtml_3000_2_0_1;
-      zlib                      = self.zlib_0_5_2_0;
-      HTTP                      = self.HTTP_4000_0_9;
-      deepseq                   = self.deepseq_1_1_0_0;
-      text                      = self.text_0_11_0_5;
-      cabalInstall              = self.cabalInstall_0_8_2;
-      alex                      = self.alex_2_3_3;
-      happy                     = self.happy_1_18_5;
-    };
-  };
-
-  haskellPlatformPackages_2010_1_0_0 = pkgs.haskell.packages_ghc6123.override {
-    extension = self : super : {
-      haskellSrc                = self.haskellSrc_1_0_1_3;
-      html                      = self.html_1_0_1_2;
-      fgl                       = self.fgl_5_4_2_2;
-      cabalInstall              = self.cabalInstall_0_8_0;
-      GLUT                      = self.GLUT_2_1_2_1;
-      OpenGL                    = self.OpenGL_2_2_3_0;
-      zlib                      = self.zlib_0_5_2_0;
-      alex                      = self.alex_2_3_2;
-      cgi                       = self.cgi_3001_1_7_2;
-      QuickCheck                = self.QuickCheck_2_1_1_1;
-      HTTP                      = self.HTTP_4000_0_9;
-      deepseq                   = self.deepseq_1_1_0_0;
-      HUnit                     = self.HUnit_1_2_2_1;
-      network                   = self.network_2_2_1_7;
-      parallel                  = self.parallel_2_2_0_1;
-      parsec                    = self.parsec_2_1_0_1;
-      regexBase                 = self.regexBase_0_93_1;
-      regexCompat               = self.regexCompat_0_92;
-      regexPosix                = self.regexPosix_0_94_1;
-      stm                       = self.stm_2_1_1_2;
-      xhtml                     = self.xhtml_3000_2_0_1;
-      happy                     = self.happy_1_18_4;
-      # not actually specified, but important to make the whole thing build
-      mtl                       = self.mtl_1_1_0_2;
-    };
-  };
-
-  haskellPlatformPackages_2009_2_0_2 = pkgs.haskell.packages_ghc6104.override {
-    extension = self : super : {
-      time                      = self.time_1_1_2_4;
-      cgi                       = self.cgi_3001_1_7_1;
-      editline                  = self.editline_0_2_1_0;
-      fgl                       = self.fgl_5_4_2_2;
-      GLUT                      = self.GLUT_2_1_1_2;
-      haskellSrc                = self.haskellSrc_1_0_1_3;
-      html                      = self.html_1_0_1_2;
-      HUnit                     = self.HUnit_1_2_0_3;
-      network                   = self.network_2_2_1_4;
-      OpenGL                    = self.OpenGL_2_2_1_1;
-      parallel                  = self.parallel_1_1_0_1;
-      parsec                    = self.parsec_2_1_0_1;
-      QuickCheck                = self.QuickCheck_1_2_0_0;
-      regexBase                 = self.regexBase_0_72_0_2;
-      regexCompat               = self.regexCompat_0_71_0_1;
-      regexPosix                = self.regexPosix_0_72_0_3;
-      stm                       = self.stm_2_1_1_2;
-      xhtml                     = self.xhtml_3000_2_0_1;
-      zlib                      = self.zlib_0_5_0_0;
-      HTTP                      = self.HTTP_4000_0_6;
-      cabalInstall              = self.cabalInstall_0_6_2;
-      alex                      = self.alex_2_3_1;
-      happy                     = self.happy_1_18_4;
-      # not actually specified, but important to make the whole thing build
-      mtl                       = self.mtl_1_1_0_2;
-    };
-  };
-
-in
-{
-  "2013_2_0_0" = haskellPlatformPackages_2013_2_0_0.callPackage ./2013.2.0.0.nix {};
-
-  "2012_4_0_0" = haskellPlatformPackages_2012_4_0_0.callPackage ./2012.4.0.0.nix {};
-
-  "2012_2_0_0" = haskellPlatformPackages_2012_2_0_0.callPackage ./2012.2.0.0.nix {};
-
-  "2011_4_0_0" = haskellPlatformPackages_2011_4_0_0.callPackage ./2011.4.0.0.nix {};
-
-  "2011_2_0_1" = haskellPlatformPackages_2011_2_0_1.callPackage ./2011.2.0.1.nix {};
-
-  "2011_2_0_0" = haskellPlatformPackages_2011_2_0_0.callPackage ./2011.2.0.0.nix {};
-
-  "2010_2_0_0" = haskellPlatformPackages_2010_2_0_0.callPackage ./2010.2.0.0.nix {};
-
-  "2010_1_0_0" = haskellPlatformPackages_2010_1_0_0.callPackage ./2010.1.0.0.nix {};
-
-  "2009_2_0_2" = haskellPlatformPackages_2009_2_0_2.callPackage ./2009.2.0.2.nix {};
-}
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal
deleted file mode 100644
index fa09cb039da..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal
+++ /dev/null
@@ -1,90 +0,0 @@
-name:                haskell-platform
-version:             2011.2.0.1
-homepage:            http://haskell.org/platform
-license:             BSD3
-license-file:        LICENSE
-author:              libraries@haskell.org
-maintainer:          haskell-platform@projects.haskell.org
-category:            System
-synopsis:            The Haskell Platform
-description:
-    The Haskell Platform (HP) is the blessed set of libraries and tools on
-    which to build further Haskell libraries and applications. It is
-    intended to provide a comprehensive, stable, and quality tested base for
-    Haskell projects to work from.
-    .
-    This version specifies the following additional developer tools be
-    installed, for a system to be in full compliance:
-    . 
-    * cabal-install
-    * alex
-    * happy
-    * haddock
-
-cabal-version:       >= 1.6
-build-type:          Custom
-tested-with:         GHC ==7.0.3
-
-library
-  build-depends:
-    -- ghc 7.x
-    -- Core libraries: provided by every ghc installation
-    -- We don't include "non-API" packages here.
-    -- array                    ==0.3.0.2
-    -- base                     ==4.3.1.0
-    -- bytestring               ==0.9.1.10
-    -- Cabal                    ==1.10.1.0
-    -- containers               ==0.4.0.0
-    -- directory                ==1.1.0.0
-    -- extensible-exceptions    ==0.1.1.2
-    -- filepath                 ==1.2.0.0
-    -- haskell2010              ==1.0.0.0
-    -- haskell98                ==1.1.0.1
-    -- hpc                      ==0.5.0.6
-    -- old-locale               ==1.0.0.2
-    -- old-time                 ==1.0.0.6
-    -- pretty                   ==1.0.1.2
-    -- process                  ==1.0.1.5
-    -- random                   ==1.0.0.3
-    -- template-haskell         ==2.5.0.0
-    -- time                     ==1.2.0.3
-    -- unix                     ==XXX 2.4.2.0
-    -- Win32                    ==XXX 2.2.0.1
-
-    -- Libraries in addition to what GHC provides:
-    -- Note: newer versions of cgi need monad-catchio.
-    cgi                         ==3001.1.7.4,
-    fgl                         ==5.4.2.3,
-    GLUT                        ==2.1.2.1,
-    haskell-src                 ==1.0.1.4,
-    html                        ==1.0.1.2,
-    HUnit                       ==1.2.2.3,
-    network                     ==2.3.0.2,
-    OpenGL                      ==2.2.3.0,
-    parallel                    ==3.1.0.1,
-    parsec                      ==3.1.1,
-    QuickCheck                  ==2.4.0.1,
-    regex-base                  ==0.93.2,
-    regex-compat                ==0.93.1,
-    regex-posix                 ==0.94.4,
-    stm                         ==2.2.0.1,
-    syb                         ==0.3,
-    xhtml                       ==3000.2.0.1,
-    zlib                        ==0.5.3.1,
-    HTTP                        ==4000.1.1,
-    deepseq                     ==1.1.0.2,
-
-    -- 2011.1 proposals:
-    text                        ==0.11.0.6,
-    transformers                ==0.2.2.0,
-    mtl                         ==2.0.1.0
-
-  -- Depending on programs does not work, they are not registered
-  -- We list them to help distro packaging.
-  build-tools:
-    cabal-install ==0.10.2,
-    alex          ==2.3.5,
-    happy         ==1.18.6
-    -- hscolour      ==1.17       
-  --  haddock       ==2.9.2     -- need to use the one shipped with ghc
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal
deleted file mode 100644
index 56414de90c5..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal
+++ /dev/null
@@ -1,90 +0,0 @@
-name:                haskell-platform
-version:             2011.4.0.0
-homepage:            http://haskell.org/platform
-license:             BSD3
-license-file:        LICENSE
-author:              libraries@haskell.org
-maintainer:          haskell-platform@projects.haskell.org
-category:            System
-synopsis:            The Haskell Platform
-description:
-    The Haskell Platform (HP) is the blessed set of libraries and tools on
-    which to build further Haskell libraries and applications. It is
-    intended to provide a comprehensive, stable, and quality tested base for
-    Haskell projects to work from.
-    .
-    This version specifies the following additional developer tools be
-    installed, for a system to be in full compliance:
-    . 
-    * cabal-install
-    * alex
-    * happy
-    * haddock
-
-cabal-version:       >= 1.8
-build-type:          Custom
-tested-with:         GHC ==7.0.4
-
-library
-  build-depends:
-    -- ghc 7.x
-    -- Core libraries: provided by every ghc installation
-    -- We don't include "non-API" packages here.
-    -- array                    ==0.3.0.2
-    -- base                     ==4.3.1.0
-    -- bytestring               ==0.9.1.10
-    -- Cabal                    ==1.10.2.0
-    -- containers               ==0.4.0.0
-    -- directory                ==1.1.0.0
-    -- extensible-exceptions    ==0.1.1.2
-    -- filepath                 ==1.2.0.0
-    -- haskell2010              ==1.0.0.0
-    -- haskell98                ==1.1.0.1
-    -- hpc                      ==0.5.0.6
-    -- old-locale               ==1.0.0.2
-    -- old-time                 ==1.0.0.6
-    -- pretty                   ==1.0.1.2
-    -- process                  ==1.0.1.5
-    -- random                   ==1.0.0.3
-    -- template-haskell         ==2.5.0.0
-    -- time                     ==1.2.0.3
-    -- unix                     ==XXX 2.4.2.0
-    -- Win32                    ==XXX 2.2.0.1
-
-    -- Libraries in addition to what GHC provides:
-    -- Note: newer versions of cgi need monad-catchio.
-    cgi                         ==3001.1.7.4,
-    fgl                         ==5.4.2.4,
-    GLUT                        ==2.1.2.1,
-    haskell-src                 ==1.0.1.4,
-    html                        ==1.0.1.2,
-    HUnit                       ==1.2.4.2,
-    network                     ==2.3.0.5,
-    OpenGL                      ==2.2.3.0,
-    parallel                    ==3.1.0.1,
-    parsec                      ==3.1.1,
-    QuickCheck                  ==2.4.1.1,
-    regex-base                  ==0.93.2,
-    regex-compat                ==0.95.1,
-    regex-posix                 ==0.95.1,
-    stm                         ==2.2.0.1,
-    syb                         ==0.3.3,
-    xhtml                       ==3000.2.0.4,
-    zlib                        ==0.5.3.1,
-    HTTP                        ==4000.1.2,
-    deepseq                     ==1.1.0.2,
-
-    -- 2011.1 proposals:
-    text                        ==0.11.1.5,
-    transformers                ==0.2.2.0,
-    mtl                         ==2.0.1.0
-
-  -- Depending on programs does not work, they are not registered
-  -- We list them to help distro packaging.
-  build-tools:
-    cabal-install ==0.10.2,
-    alex          ==2.3.5,
-    happy         ==1.18.6
-    -- hscolour      ==1.17       
-  --  haddock       ==2.9.2     -- need to use the one shipped with ghc
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
deleted file mode 100644
index 264d636f994..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
+++ /dev/null
@@ -1,89 +0,0 @@
-name:                haskell-platform
-version:             2012.2.0.0
-homepage:            http://haskell.org/platform
-license:             BSD3
-license-file:        LICENSE
-author:              libraries@haskell.org
-maintainer:          haskell-platform@projects.haskell.org
-category:            System
-synopsis:            The Haskell Platform
-description:
-    The Haskell Platform (HP) is the blessed set of libraries and tools on
-    which to build further Haskell libraries and applications. It is
-    intended to provide a comprehensive, stable, and quality tested base for
-    Haskell projects to work from.
-    .
-    This version specifies the following additional developer tools be
-    installed, for a system to be in full compliance:
-    . 
-    * cabal-install
-    * alex
-    * happy
-    * haddock
-
-cabal-version:       >= 1.8
-build-type:          Custom
-tested-with:         GHC ==7.4.1
-
-library
-  build-depends:
-    -- ghc                      ==7.4.1,
-    
-    -- Core libraries: provided by every ghc installation
-    -- We don't include "non-API" packages here.
-    -- array                    ==0.4.0.0,
-    -- base                     ==4.5.0.0,
-    -- bytestring               ==0.9.2.1,
-    -- Cabal                    ==1.14.0,
-    -- containers               ==0.4.2.1,
-    -- deepseq                  ==1.3.0.0,
-    -- directory                ==1.1.0.2,
-    -- extensible-exceptions    ==0.1.1.4,
-    -- filepath                 ==1.3.0.0,
-    -- haskell2010              ==1.1.0.1,
-    -- haskell98                ==2.0.0.1,
-    -- hpc                      ==0.5.1.1,
-    -- old-locale               ==1.0.0.4,
-    -- old-time                 ==1.1.0.0,
-    -- pretty                   ==1.1.1.0,
-    -- process                  ==1.1.0.1,
-    -- template-haskell         ==2.7.0.0,
-    -- time                     ==1.4,
-    -- unix                     ==2.5.1.0,
-    -- Win32                    ==2.2.2.0,
-
-    -- Libraries in addition to what GHC provides:
-    -- Note: newer versions of cgi need monad-catchio.
-    cgi                         ==3001.1.7.4,
-    fgl                         ==5.4.2.4,
-    GLUT                        ==2.1.2.1,
-    haskell-src                 ==1.0.1.5,
-    html                        ==1.0.1.2,
-    HTTP                        ==4000.2.3,
-    HUnit                       ==1.2.4.2,
-    mtl                         ==2.1.1,
-    network                     ==2.3.0.13,
-    OpenGL                      ==2.2.3.1,
-    parallel                    ==3.2.0.2,
-    parsec                      ==3.1.2,
-    QuickCheck                  ==2.4.2,
-    random                      ==1.0.1.1,
-    regex-base                  ==0.93.2,
-    regex-compat                ==0.95.1,
-    regex-posix                 ==0.95.1,
-    stm                         ==2.3,
-    syb                         ==0.3.6.1,
-    text                        ==0.11.2.0,
-    transformers                ==0.3.0.0,
-    xhtml                       ==3000.2.1,
-    zlib                        ==0.5.3.3
-
-  -- Depending on programs does not work, they are not registered
-  -- We list them to help distro packaging.
-  build-tools:
-    cabal-install               ==0.14.0,
-    alex                        ==3.0.1,
-    happy                       ==1.18.9
-    -- hscolour                 ==1.19
-    -- haddock                  ==2.10.0 -- need to use the one shipped with ghc
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal
deleted file mode 100644
index 23d1f7a0a7d..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal
+++ /dev/null
@@ -1,113 +0,0 @@
-name:                haskell-platform
-version:             2012.4.0.0
-homepage:            http://haskell.org/platform
-license:             BSD3
-license-file:        LICENSE
-author:              libraries@haskell.org
-maintainer:          haskell-platform@projects.haskell.org
-category:            System
-synopsis:            The Haskell Platform
-description:
-    The Haskell Platform (HP) is the blessed set of libraries and tools on
-    which to build further Haskell libraries and applications. It is
-    intended to provide a comprehensive, stable, and quality tested base for
-    Haskell projects to work from.
-    .
-    This version specifies the following additional developer tools be
-    installed, for a system to be in full compliance:
-    .
-    * cabal-install
-    * alex
-    * happy
-    * haddock
-
-cabal-version:       >= 1.8
-build-type:          Custom
-tested-with:         GHC ==7.4.2
-
-flag include-ghc-depends
-  description: Include all the GHC provided packages in the dependencies
-  default:     False
-
-library
-  if flag(include-ghc-depends)
-    build-depends:
-      ghc                      ==7.4.2,
-
-      -- Core libraries: provided by every ghc installation
-      -- We don't include "non-API" packages here.
-      --                                        begin core packages
-      array                    ==0.4.0.0,
-      base                     ==4.5.1.0,
-      bytestring               ==0.9.2.1,
-      Cabal                    ==1.14.0,
-      containers               ==0.4.2.1,
-      deepseq                  ==1.3.0.0,
-      directory                ==1.1.0.2,
-      extensible-exceptions    ==0.1.1.4,
-      filepath                 ==1.3.0.0,
-      haskell2010              ==1.1.0.1,
-      haskell98                ==2.0.0.1,
-      hpc                      ==0.5.1.1,
-      old-locale               ==1.0.0.4,
-      old-time                 ==1.1.0.0,
-      pretty                   ==1.1.1.0,
-      process                  ==1.1.0.1,
-      template-haskell         ==2.7.0.0,
-      time                     ==1.4
-  if !os(windows)
-    build-depends:
-      unix                     ==2.5.1.1
-      --                                        end core packages
-  else
-    build-depends:
-      Win32                    ==2.2.2.0
-
-  build-depends:
-    -- Libraries in addition to what GHC provides:
-    -- Note: newer versions of cgi need monad-catchio.
-    --                                          begin platform packages
-    async                       ==2.0.1.3,
-    cgi                         ==3001.1.7.4,
-    fgl                         ==5.4.2.4,
-    GLUT                        ==2.1.2.1,
-    haskell-src                 ==1.0.1.5,
-    html                        ==1.0.1.2,
-    HTTP                        ==4000.2.5,
-    HUnit                       ==1.2.5.1,
-    mtl                         ==2.1.2,
-    network                     ==2.3.1.0,
-    OpenGL                      ==2.2.3.1,
-    parallel                    ==3.2.0.3,
-    parsec                      ==3.1.3,
-    QuickCheck                  ==2.5.1.1,
-    random                      ==1.0.1.1,
-    regex-base                  ==0.93.2,
-    regex-compat                ==0.95.1,
-    regex-posix                 ==0.95.2,
-    split                       ==0.2.1.1,
-    stm                         ==2.4,
-    syb                         ==0.3.7,
-    text                        ==0.11.2.3,
-    transformers                ==0.3.0.0,
-    vector                      ==0.10.0.1,
-    xhtml                       ==3000.2.1,
-    zlib                        ==0.5.4.0,
-
-    -- Libraries that are needed to support the above,
-    -- though are not officially part of the platform
-    primitive                   ==0.5.0.1
-
-  -- Depending on programs does not work, they are not registered
-  -- We list them to help distro packaging.
-  build-tools:
-    cabal-install               ==0.14.0,
-    alex                        ==3.0.2,
-    happy                       ==1.18.10
-    --                                          end platform packages
-    -- hscolour                 ==1.19   -- ???
-    -- haddock                  ==2.11.0 -- need to use the one shipped with ghc
-
--- N.B.: The begin/end comment annotations are used to build the source
--- installer: Packages that are part of the core are checked at build time.
--- Source of packages that are part of the platform are included in the tarball.
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal
deleted file mode 100644
index cf676ab1d6e..00000000000
--- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal
+++ /dev/null
@@ -1,118 +0,0 @@
-name:                haskell-platform
-version:             2013.2.0.0
-homepage:            http://haskell.org/platform
-license:             BSD3
-license-file:        LICENSE
-author:              libraries@haskell.org
-maintainer:          haskell-platform@projects.haskell.org
-category:            System
-synopsis:            The Haskell Platform
-description:
-    The Haskell Platform (HP) is the blessed set of libraries and tools on
-    which to build further Haskell libraries and applications. It is
-    intended to provide a comprehensive, stable, and quality tested base for
-    Haskell projects to work from.
-    .
-    This version specifies the following additional developer tools be
-    installed, for a system to be in full compliance:
-    .
-    * cabal-install
-    * alex
-    * happy
-    * haddock
-
-cabal-version:       >= 1.8
-build-type:          Custom
-tested-with:         GHC ==7.6.3
-
-flag include-ghc-depends
-  description: Include all the GHC provided packages in the dependencies
-  default:     False
-
-library
-  if flag(include-ghc-depends)
-    build-depends:
-      ghc                      ==7.6.3,
-
-      -- Core libraries: provided by every ghc installation
-      -- We don't include "non-API" packages here.
-      --                                        begin core packages
-      array                     ==0.4.0.1,
-      base                      ==4.6.0.1,
-      bytestring                ==0.10.0.2,
-      Cabal                     ==1.16.0,
-      containers                ==0.5.0.0,
-      deepseq                   ==1.3.0.1,
-      directory                 ==1.2.0.1,
-      filepath                  ==1.3.0.1,
-      haskell2010               ==1.1.1.0,
-      haskell98                 ==2.0.0.2,
-      hpc                       ==0.6.0.0,
-      old-locale                ==1.0.0.5,
-      old-time                  ==1.1.0.1,
-      pretty                    ==1.1.1.0,
-      process                   ==1.1.0.2,
-      template-haskell          ==2.8.0.0,
-      time                      ==1.4.0.1
-  if !os(windows)
-    build-depends:
-      unix                      ==2.6.0.1
-      --                                        end core packages
-  else
-    build-depends:
-      Win32                     ==2.3.0.0
-
-  build-depends:
-    -- Libraries in addition to what GHC provides:
-    -- Note: newer versions of cgi need monad-catchio.
-    --                                          begin platform packages
-    async                       ==2.0.1.4,
-    attoparsec                  ==0.10.4.0,
-    case-insensitive            ==1.0.0.1,
-    cgi                         ==3001.1.7.5,
-    fgl                         ==5.4.2.4,
-    GLUT                        ==2.4.0.0,
-    GLURaw                      ==1.3.0.0,
-    haskell-src                 ==1.0.1.5,
-    hashable                    ==1.1.2.5,
-    html                        ==1.0.1.2,
-    HTTP                        ==4000.2.8,
-    HUnit                       ==1.2.5.2,
-    mtl                         ==2.1.2,
-    network                     ==2.4.1.2,
-    OpenGL                      ==2.8.0.0,
-    OpenGLRaw                   ==1.3.0.0,
-    parallel                    ==3.2.0.3,
-    parsec                      ==3.1.3,
-    QuickCheck                  ==2.6,
-    random                      ==1.0.1.1,
-    regex-base                  ==0.93.2,
-    regex-compat                ==0.95.1,
-    regex-posix                 ==0.95.2,
-    split                       ==0.2.2,
-    stm                         ==2.4.2,
-    syb                         ==0.4.0,
-    text                        ==0.11.3.1,
-    transformers                ==0.3.0.0,
-    unordered-containers        ==0.2.3.0,
-    vector                      ==0.10.0.1,
-    xhtml                       ==3000.2.1,
-    zlib                        ==0.5.4.1,
-
-    -- Libraries that are needed to support the above,
-    -- though are not officially part of the platform
-    primitive                   ==0.5.0.1
-
-  -- Depending on programs does not work, they are not registered
-  -- We list them to help distro packaging.
-  build-tools:
-    cabal-install               ==1.16.0.2,
-    alex                        ==3.0.5,
-    happy                       ==1.18.10
-    --                                          end platform packages
-    -- hscolour                 ==1.20.3   -- ???
-    -- haddock                  ==2.13.2 -- need to use the one shipped with ghc
-
--- N.B.: The begin/end comment annotations are used to build the source
--- installer: Packages that are part of the core are checked at build time.
--- Source of packages that are part of the platform are included in the tarball.
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
index b8c0a78001b..93e07dede85 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix
@@ -14,11 +14,11 @@ cabal.mkDerivation (self: {
     tastySmallcheck
   ];
   buildTools = [ happy ];
-  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell-suite/haskell-src-exts";
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
index 1f9d3bf4d19..d837c2f689b 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
@@ -1,19 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cpphs, happy }:
+{ cabal, cpphs, filepath, happy, mtl, smallcheck, syb, tasty
+, tastyGolden, tastySmallcheck
+}:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.13.5";
-  sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw";
+  version = "1.16.0.1";
+  sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
   buildDepends = [ cpphs ];
+  testDepends = [
+    filepath mtl smallcheck syb tasty tastyGolden tastySmallcheck
+  ];
   buildTools = [ happy ];
   doCheck = false;
   meta = {
-    homepage = "http://code.haskell.org/haskell-src-exts";
+    homepage = "https://github.com/haskell-suite/haskell-src-exts";
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index cc6cc60bb18..e43c0430be7 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.6.0.7";
-  sha256 = "0cxqh35cd2j6ljsmgjisgm9pn26rj01x43mkn9jk6qs1fbqspb4d";
+  version = "0.6.0.8";
+  sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk";
   buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
deleted file mode 100644
index e2e5ffa304d..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src";
-  version = "1.0.1.3";
-  sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89";
-  buildTools = [ happy ];
-  meta = {
-    description = "Manipulating Haskell source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
deleted file mode 100644
index 54decb79f2b..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src";
-  version = "1.0.1.4";
-  sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j";
-  buildDepends = [ syb ];
-  buildTools = [ happy ];
-  meta = {
-    description = "Support for manipulating Haskell source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
deleted file mode 100644
index 02032c21120..00000000000
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src";
-  version = "1.0.1.5";
-  sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz";
-  buildDepends = [ syb ];
-  buildTools = [ happy ];
-  preConfigure = "runhaskell Setup.hs clean";
-  meta = {
-    description = "Support for manipulating Haskell source code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix
index 428715ac07b..428715ac07b 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/default.nix
diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix
index ecb92c18493..d732a465580 100644
--- a/pkgs/development/libraries/haskell/haskelldb/default.nix
+++ b/pkgs/development/libraries/haskell/haskelldb/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskelldb";
-  version = "2.2.2";
-  sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm";
+  version = "2.2.4";
+  sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y";
   buildDepends = [ mtl time ];
   meta = {
     homepage = "https://github.com/m4dc4p/haskelldb";
@@ -13,7 +13,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix
index 776d5198bc7..c659d3966f0 100644
--- a/pkgs/development/libraries/haskell/haskintex/default.nix
+++ b/pkgs/development/libraries/haskell/haskintex/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskintex";
-  version = "0.5.0.0";
-  sha256 = "1ixb8lwgk2bkm36c173x8y2a14ylax5bdrqw4blxm4qia7xidc5i";
+  version = "0.5.0.2";
+  sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/haskoin/default.nix b/pkgs/development/libraries/haskell/haskoin/default.nix
index 120111f35f0..7d13d6e797b 100644
--- a/pkgs/development/libraries/haskell/haskoin/default.nix
+++ b/pkgs/development/libraries/haskell/haskoin/default.nix
@@ -18,6 +18,8 @@ cabal.mkDerivation (self: {
     mtl pbkdf QuickCheck split testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text
   ];
+  jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://github.com/haskoin/haskoin";
     description = "Implementation of the Bitcoin protocol";
diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix
index cf0b3504e1b..7f1e29a8c6c 100644
--- a/pkgs/development/libraries/haskell/haskore/default.nix
+++ b/pkgs/development/libraries/haskell/haskore/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskore";
-  version = "0.2.0.4";
-  sha256 = "0hhsiazdz44amilcwfxl0r10yxzhql83pgd21k89fmg1gkc4q46j";
+  version = "0.2.0.5";
+  sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix
index 0b5f4875a75..f2cf3d24f87 100644
--- a/pkgs/development/libraries/haskell/haste-compiler/default.nix
+++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix
@@ -1,27 +1,29 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754
-, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf
-, mtl, network, random, shellmate, systemFileio, tar, temporary
-, time, transformers, utf8String, websockets, zipArchive
+, dataDefault, either, filepath, ghcPaths, HTTP, monadsTf, mtl
+, network, networkUri, random, shellmate, systemFileio, tar
+, transformers, utf8String, websockets
 }:
 
 cabal.mkDerivation (self: {
   pname = "haste-compiler";
-  version = "0.3";
-  sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd";
+  version = "0.4.3";
+  sha256 = "1wkb6a1jwmpjr0jlz5fjq652jz6a6agg0a5pfazyfpdznvd4mm62";
   isLibrary = true;
   isExecutable = true;
+  noHaddock = true;
   buildDepends = [
-    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault
-    executablePath filepath ghcPaths HTTP monadsTf mtl network random
-    shellmate systemFileio tar temporary time transformers utf8String
-    websockets zipArchive
+    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault either
+    filepath ghcPaths HTTP monadsTf mtl network networkUri random
+    shellmate systemFileio tar transformers utf8String websockets
   ];
+  configureFlags = "-fportable";
   meta = {
-    homepage = "http://github.com/valderman/haste-compiler";
+    homepage = "http://haste-lang.org/";
     description = "Haskell To ECMAScript compiler";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix
index aec315995c8..221a7fe647b 100644
--- a/pkgs/development/libraries/haskell/haste-perch/default.nix
+++ b/pkgs/development/libraries/haskell/haste-perch/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haste-perch";
-  version = "0.1.0.3";
-  sha256 = "1ad7kv47kq0sav49qnqdk76blk44sgjvk1zgn5k2bqvfnr26641j";
+  version = "0.1.0.4";
+  sha256 = "12ssfik7v671727yxplz44gwgy9i815l44r4z3x066ndcqglr306";
   buildDepends = [ hasteCompiler transformers ];
   meta = {
     homepage = "https://github.com/agocorona/haste-perch";
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 1aba1975a78..708959b0045 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -1,17 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network
-, time, utf8String
+, networkUri, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "haxr";
-  version = "3000.10.3";
-  sha256 = "082w86vawjiqz589s3gmawssd0b43b1vcw0h6cndadwww8yc35bg";
+  version = "3000.10.3.1";
+  sha256 = "0alvrsk85f1l79hfa9shagjckp4sx835l9734ab2izfv50mxx7gm";
   buildDepends = [
-    base64Bytestring blazeBuilder HaXml HTTP mtl network time
-    utf8String
+    base64Bytestring blazeBuilder HaXml HTTP mtl network networkUri
+    time utf8String
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/HaXR";
     description = "XML-RPC client and server library";
diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
index 01f683b5568..c08f9e79bf0 100644
--- a/pkgs/development/libraries/haskell/hcltest/default.nix
+++ b/pkgs/development/libraries/haskell/hcltest/default.nix
@@ -7,14 +7,15 @@
 
 cabal.mkDerivation (self: {
   pname = "hcltest";
-  version = "0.3.4";
-  sha256 = "0p8skabp6z4i5xr22qxk1sij2ayla2iqylvlzxfxa8yw1fxs8wsq";
+  version = "0.3.6";
+  sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd";
   buildDepends = [
     dlist either filepath free lens mmorph monadControl mtl
     optparseApplicative randomShuffle split stm tagged tasty temporary
     text transformers transformersBase
   ];
   testDepends = [ doctest filepath ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/bennofs/hcltest/";
     description = "A testing library for command line applications";
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index b1422f616c9..9927e65cfc3 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
-, dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl
-, random, text, time, transformers, unorderedContainers, vector
-, xmlhtml
+, dlist, errors, filepath, hashable, mapSyntax
+, MonadCatchIOTransformers, mtl, random, text, time, transformers
+, unorderedContainers, vector, xmlhtml
 }:
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.13.1.2";
-  sha256 = "0c80lf00n3iv55mw4p61bjx14gildvxnvfdaa755ghkg1wcd59s5";
+  version = "0.14.0.1";
+  sha256 = "1nhksdn95v35ymml3kgm70axjl4vkjfvj1wvlcm1a1frlnbk993w";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
-    filepath hashable MonadCatchIOTransformers mtl random text time
-    transformers unorderedContainers vector xmlhtml
+    filepath hashable mapSyntax MonadCatchIOTransformers mtl random
+    text time transformers unorderedContainers vector xmlhtml
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix
new file mode 100644
index 00000000000..a7a1527cd1d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/here/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, haskellSrcMeta, mtl, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "here";
+  version = "1.2.6";
+  sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif";
+  buildDepends = [ haskellSrcMeta mtl parsec ];
+  meta = {
+    homepage = "https://github.com/tmhedberg/here";
+    description = "Here docs & interpolated strings via quasiquotation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ edwtjo ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
index 9e2e6d93f83..63e92de9424 100644
--- a/pkgs/development/libraries/haskell/hexpat/default.nix
+++ b/pkgs/development/libraries/haskell/hexpat/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hexpat";
-  version = "0.20.6";
-  sha256 = "02ms6lchj6k0krqjk47bibfb0cbpbc16ip9f22c4rgp04qkzp60b";
+  version = "0.20.7";
+  sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08";
   buildDepends = [ deepseq List text transformers utf8String ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Hexpat/";
diff --git a/pkgs/development/libraries/haskell/higher-leveldb/default.nix b/pkgs/development/libraries/haskell/higher-leveldb/default.nix
new file mode 100644
index 00000000000..a25a37741d3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/higher-leveldb/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cereal, dataDefault, hspec, leveldbHaskell, liftedBase
+, monadControl, mtl, resourcet, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "higher-leveldb";
+  version = "0.2.1.0";
+  sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p";
+  buildDepends = [
+    cereal dataDefault leveldbHaskell liftedBase monadControl mtl
+    resourcet transformers transformersBase
+  ];
+  testDepends = [
+    cereal hspec leveldbHaskell liftedBase monadControl mtl resourcet
+    transformers transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/jeremyjh/higher-leveldb";
+    description = "A rich monadic API for working with leveldb databases";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index a9540b24950..d5ee69f5f0d 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -1,16 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre, utf8String }:
+{ cabal, blazeHtml, Diff, filepath, mtl, parsec, regexPcre
+, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.8.5";
-  sha256 = "0xynbxffjp44189zzqx30wabbrj83mvjl3mj1i5lag1h945yp1nk";
+  version = "0.5.11";
+  sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     blazeHtml filepath mtl parsec regexPcre utf8String
   ];
+  testDepends = [ blazeHtml Diff filepath ];
   prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal";
   meta = {
     homepage = "http://github.com/jgm/highlighting-kate";
diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix
new file mode 100644
index 00000000000..ea5e13a1b5f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hindent/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefault, haskellSrcExts, hspec, monadLoops, mtl, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hindent";
+  version = "4.0";
+  sha256 = "1l4dhp55ps92zvz2nmhs1j4hfsbs0r5f2b7idjcy8ibng8sgb361";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ];
+  testDepends = [
+    dataDefault haskellSrcExts hspec monadLoops mtl text
+  ];
+  doCheck = false;
+  meta = {
+    description = "Extensible Haskell pretty printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index 5fac7a396ff..2513922781b 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     homepage = "https://github.com/kolmodin/hinotify.git";
     description = "Haskell binding to inotify";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index aacf7c020f8..ce0eec94488 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hint";
-  version = "0.4.2.0";
-  sha256 = "08cq9zyyry7cxc30jmsdgrnvw6v2jbxnxcwcjs3bh77rds947mmd";
+  version = "0.4.2.1";
+  sha256 = "0nc545y1v3s1897f3ims7m37wnn288xyz1zb9sxqs6immdxyly0g";
   buildDepends = [
     exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
     utf8String
diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index bf92945d164..08ff35ca8aa 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -2,19 +2,19 @@
 
 { cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl
 , parsec, patience, QuickCheck, random, systemFileio
-, systemFilepath, testFramework, testFrameworkQuickcheck2, vector
-, zlib, zlibBindings
+, systemFilepath, testFramework, testFrameworkQuickcheck2
+, unixCompat, vector, zlib, zlibBindings
 }:
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.6.1";
-  sha256 = "175i6gag596dy341jlr5sjj55qcaqgymrcr1czcaigsxsn5yx8b9";
+  version = "0.6.2";
+  sha256 = "07lfjbn48v8ykkyj15diy4a9kpgzc93gv0l1rdfcacl3f26a97hs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     attoparsec cryptohash hourglass mtl parsec patience random
-    systemFileio systemFilepath vector zlib zlibBindings
+    systemFileio systemFilepath unixCompat vector zlib zlibBindings
   ];
   testDepends = [
     bytedump hourglass HUnit QuickCheck testFramework
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 541b3ceb0dc..350b384ef00 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -1,21 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
-, regexpr, regexTdfa, safe, split, testFramework
-, testFrameworkHunit, time, transformers, utf8String
+{ cabal, blazeMarkup, cmdargs, csv, Decimal, filepath, HUnit, mtl
+, parsec, prettyShow, regexpr, regexTdfa, safe, split
+, testFramework, testFrameworkHunit, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.23.2";
-  sha256 = "1z9gxbah649r9vzq012mqnk07rfnd6c4ik82klksk0zzd4yxf07d";
+  version = "0.24";
+  sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns";
   buildDepends = [
-    cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa
-    safe split time transformers utf8String
+    blazeMarkup cmdargs csv Decimal filepath HUnit mtl parsec
+    prettyShow regexpr regexTdfa safe split time transformers
+    utf8String
   ];
   testDepends = [
-    cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa
-    safe split testFramework testFrameworkHunit time transformers
+    blazeMarkup cmdargs csv Decimal filepath HUnit mtl parsec
+    prettyShow regexpr regexTdfa safe split testFramework
+    testFrameworkHunit time transformers
   ];
   meta = {
     homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 70ba12e2398..ae5de9c757b 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,26 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
-, conduitExtra, dataDefault, filepath, hamlet, hjsmin, hledger
-, hledgerLib, hspec, httpClient, httpConduit, HUnit, json
-, networkConduit, parsec, regexpr, safe, shakespeare
-, shakespeareText, text, time, transformers, wai, waiExtra
-, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic
-, yesodTest
+, conduitExtra, dataDefault, filepath, hjsmin, hledger, hledgerLib
+, hspec, httpClient, httpConduit, HUnit, json, networkConduit
+, parsec, regexpr, safe, shakespeare, text, time, transformers, wai
+, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore
+, yesodStatic, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.23.2";
-  sha256 = "1n4n2zj6nqwvwmb6cxr16x2fnmzs7v21snjhq2nnvlik613rnnq7";
+  version = "0.24";
+  sha256 = "0dwqrq31yf0kw3rk06f1ny2670w2qw83bvvqwp87g4xky5v69xpi";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     blazeHtml blazeMarkup clientsession cmdargs conduitExtra
-    dataDefault filepath hamlet hjsmin hledger hledgerLib httpClient
+    dataDefault filepath hjsmin hledger hledgerLib httpClient
     httpConduit HUnit json networkConduit parsec regexpr safe
-    shakespeare shakespeareText text time transformers wai waiExtra
-    waiHandlerLaunch warp yaml yesod yesodCore yesodStatic
+    shakespeare text time transformers wai waiExtra waiHandlerLaunch
+    warp yaml yesod yesodCore yesodStatic
   ];
   testDepends = [ hspec yesod yesodTest ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 8ac4d6d2e6b..a53cb3cc14e 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,26 +1,27 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, prettyShow, regexpr, safe, shakespeare, shakespeareText
-, split, tabular, testFramework, testFrameworkHunit, text, time
-, transformers, utf8String, wizards
+, parsec, prettyShow, regexpr, regexTdfa, safe, shakespeare
+, shakespeareText, split, tabular, testFramework
+, testFrameworkHunit, text, time, transformers, utf8String, wizards
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.23.2";
-  sha256 = "1q57mb37qkngdvivaj4dykrkg4sb2pchg2ssdxx8ss4zhbsrk713";
+  version = "0.24";
+  sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdargs filepath haskeline hledgerLib HUnit mtl parsec prettyShow
-    regexpr safe shakespeare shakespeareText split tabular text time
-    utf8String wizards
+    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
+    prettyShow regexpr regexTdfa safe shakespeare shakespeareText split
+    tabular text time utf8String wizards
   ];
   testDepends = [
     cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexpr safe shakespeare shakespeareText split tabular
-    testFramework testFrameworkHunit text time transformers wizards
+    prettyShow regexpr regexTdfa safe shakespeare shakespeareText split
+    tabular testFramework testFrameworkHunit text time transformers
+    wizards
   ];
   meta = {
     homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix b/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
new file mode 100644
index 00000000000..501d84a596f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hmatrix-gsl/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, gsl, hmatrix, random, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "hmatrix-gsl";
+  version = "0.16.0.2";
+  sha256 = "1l865v2vpjl7f5741z58m9gw1ksskgzfm5gzp9pxiqazsgb2h5ym";
+  buildDepends = [ hmatrix random vector ];
+  pkgconfigDepends = [ gsl ];
+  meta = {
+    homepage = "https://github.com/albertoruiz/hmatrix";
+    description = "Numerical computation";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hmatrix-special/default.nix b/pkgs/development/libraries/haskell/hmatrix-special/default.nix
index 4a2153f173e..c6e9f3dbbbf 100644
--- a/pkgs/development/libraries/haskell/hmatrix-special/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix-special/default.nix
@@ -1,18 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hmatrix }:
+{ cabal, gsl, hmatrix, hmatrixGsl }:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix-special";
-  version = "0.2.0";
-  sha256 = "0lp8mvagbzayq3r08wgk498n6d9vgb1skb8wzrzi5a1fc5j8m0wj";
-  buildDepends = [ hmatrix ];
+  version = "0.3.0.1";
+  sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
+  buildDepends = [ hmatrix hmatrixGsl ];
+  extraLibraries = [ gsl ];
   meta = {
-    homepage = "http://perception.inf.um.es/hmatrix";
+    homepage = "https://github.com/albertoruiz/hmatrix";
     description = "Interface to GSL special functions";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 806405208c5..afc5833d5e2 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.16.0.4";
-  sha256 = "0n2h7vp8cyr4lm6yv6msvqr87d0dn7fm61p58wy7f230v692j1p4";
+  version = "0.16.1.0";
+  sha256 = "0jdkh9cq3dzc2fdkqv2zpv70knfkr0i01wv83zw3gjjv081gcn5h";
   buildDepends = [
     binary deepseq random split storableComplex vector
   ];
diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix
index e9b0d4bf260..ec88bb0f174 100644
--- a/pkgs/development/libraries/haskell/hoauth2/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth2/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoauth2";
-  version = "0.4.1";
-  sha256 = "145lgy9bxx1xdljbkvi6s97n2z1k5fd0idp415r71ydw8h3i8ppx";
+  version = "0.4.3";
+  sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix
index 088bbe4d4ea..1fa7c558731 100644
--- a/pkgs/development/libraries/haskell/holy-project/default.nix
+++ b/pkgs/development/libraries/haskell/holy-project/default.nix
@@ -1,34 +1,32 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, ansiTerminal, Cabal, filepath, hastache
-, httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split
-, syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text
-, time
-, fetchpatch}:
+, httpConduit, HUnit, lens, lensAeson, QuickCheck, random
+, smallcheck, split, syb, tasty, tastyHunit, tastyQuickcheck
+, tastySmallcheck, text, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "holy-project";
-  version = "0.1.1.0";
-  sha256 = "1dsyhgjcp54199zfazzzwsggxpj2dsbzfb64v6l3jz7qaapxnj9i";
+  version = "0.1.1.1";
+  sha256 = "0vb4mlz6gb01aadm2b8kgvgnrwwvl6q4ndx6xldi0xi3rm22xkwj";
   isLibrary = true;
   isExecutable = true;
-  patches = [ (fetchpatch { url = "https://github.com/yogsototh/holy-project/pull/3.patch"; sha256 = "1ndyhfrsvn94zxzyq1w4504gz91yfv33375933qmz3wdfkc3rqf0"; }) ];
   buildDepends = [
     aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens
-    QuickCheck random smallcheck split syb tasty tastyHunit
+    lensAeson QuickCheck random smallcheck split syb tasty tastyHunit
     tastyQuickcheck tastySmallcheck text time
   ];
   testDepends = [
     Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck
     tastySmallcheck
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/yogsototh/holy-project";
     description = "Start your Haskell project with cabal, git and tests";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix
index bda89829d68..d498095f8b3 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix
@@ -25,5 +25,6 @@ cabal.mkDerivation (self: {
     description = "Haskell API Search";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.36.nix b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix
new file mode 100644
index 00000000000..5b12f8d28c4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix
@@ -0,0 +1,30 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
+, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
+, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup
+, temporary, text, time, transformers, uniplate, vector
+, vectorAlgorithms, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hoogle";
+  version = "4.2.36";
+  sha256 = "1h65pl0jfki2pcrywak9mh3hfi3wziffhb2q0xp6r4v01536zifv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
+    deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
+    resourcet safe shake tagsoup text time transformers uniplate vector
+    vectorAlgorithms wai warp
+  ];
+  testDepends = [ filepath temporary ];
+  testTarget = "--test-option=--no-net";
+  meta = {
+    homepage = "http://www.haskell.org/hoogle/";
+    description = "Haskell API Search";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
new file mode 100644
index 00000000000..13ea889119c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh
@@ -0,0 +1,6 @@
+#! @shell@
+
+COMMAND=$1
+shift
+HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
+    "$COMMAND" -d @out@/share/hoogle "$@"
diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff
deleted file mode 100644
index df507c5a470..00000000000
--- a/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/CmdLine/All.hs b/src/CmdLine/All.hs
-index 94b1d48..f41f270 100644
---- a/src/CmdLine/All.hs
-+++ b/src/CmdLine/All.hs
-@@ -86,8 +86,10 @@ guessLocal = do
-     ghc <- findExecutable "ghc"
-     home <- getHomeDirectory
-     lib <- getLibDir
-+    path <- lookup "HOOGLE_DOC_PATH" <$> getEnvironment
-     let xs = [takeDirectory (takeDirectory lib) </> "doc" {- Windows, installed with Cabal -}  ] ++
-              [takeDirectory (takeDirectory ghc) </> "doc/html/libraries" | Just ghc <- [ghc] {- Windows, installed by GHC -} ] ++
-+             maybeToList path ++
-              [home </> ".cabal/share/doc" {- Linux -} ]
-     filterM doesDirectoryExist xs
- 
-diff --git a/src/Hoogle/Language/Haskell.hs b/src/Hoogle/Language/Haskell.hs
-index b037f11..f2ac047 100644
---- a/src/Hoogle/Language/Haskell.hs
-+++ b/src/Hoogle/Language/Haskell.hs
-@@ -112,7 +112,7 @@ setPriority pkg mod x = x{itemPriority = pri}
- 
- setModuleURL (Just pkg) _ x | itemLevel x == 1 = x{itemURL=if null $ itemURL x then f $ itemName x else itemURL x}
-     where f xs = if "http://hackage.haskell.org/package/" `isPrefixOf` itemURL pkg
--                 then "http://hackage.haskell.org/packages/archive/" ++ itemName pkg ++ "/latest/doc/html/" ++ file
-+                 then "http://hackage.haskell.org/package/" ++ itemName pkg ++ "/docs/" ++ file
-                  else takeDirectory (itemURL pkg) ++ "/" ++ file
-               where file = reps '.' '-' xs ++ ".html"
- setModuleURL _ _ x = x
diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
index 490898a75b2..822c2bdd82e 100644
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ b/pkgs/development/libraries/haskell/hoogle/local.nix
@@ -9,12 +9,12 @@
 #   haskellPackages =
 #     let callPackage = pkgs.lib.callPackageWith haskellPackages;
 #     in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
-#         extraPrefs = self: {
+#         extension = self: super: {
 #           hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
 #             packages = with pkgs.haskellPackages; [
 #               mmorph
 #               monadControl
-#             ]
+#             ];
 #           };
 #         };
 #       });
@@ -23,43 +23,22 @@
 # This will build mmorph and monadControl, and have the hoogle installation
 # refer to their documentation via symlink so they are not garbage collected.
 
-{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
-, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text
-, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp
-, fetchurl
-
-, parallel, perl, wget, rehoo, haskellPlatform
-, packages ? haskellPlatform.propagatedUserEnvPkgs
+{ stdenv, hoogle, rehoo
+, ghc, packages ? [ ghc.ghc ]
 }:
 
-cabal.mkDerivation (self: rec {
-  pname = "hoogle";
-  version = "4.2.32";
-  sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc";
-  isLibrary = true;
-  isExecutable = true;
-  buildInputs = [self.ghc Cabal] ++ self.extraBuildInputs
-    ++ [ parallel perl wget rehoo ] ++ packages;
-  buildDepends = [
-      aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
-      deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
-      resourcet safe shake tagsoup text time transformers uniplate vector
-      vectorAlgorithms wai warp
-    ];
-  testDepends = [ filepath ];
-  testTarget = "--test-option=--no-net";
+let
+  inherit (stdenv.lib) optional;
+  wrapper = ./hoogle-local-wrapper.sh;
+in
+stdenv.mkDerivation {
+  name = "hoogle-local-0.1";
+  buildInputs = [hoogle rehoo];
 
-  # The tests will fail because of the added documentation.
-  doCheck = false;
-  patches = [ ./hoogle-local.diff
-              (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff";
-                          sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; })
-            ];
+  phases = [ "installPhase" ];
 
   docPackages = packages;
-
-  postInstall = ''
+  installPhase = ''
     if [ -z "$docPackages" ]; then
         echo "ERROR: The packages attribute has not been set"
         exit 1
@@ -71,27 +50,38 @@ cabal.mkDerivation (self: rec {
     cd $out/share/hoogle
 
     function import_dbs() {
-        find $1 -name '*.txt' \
-            | parallel -j$NIX_BUILD_CORES 'cp -p {} .; perl -i -pe "print \"\@url file://{//}/index.html\n\" if /^\@version/;" {/}; $out/bin/hoogle convert {/}'
+        find $1 -name '*.txt' | while read f; do
+          newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
+          if [[ -f $f && ! -f ./$newname ]]; then
+            cp -p $f ./$newname
+            hoogle convert -d "$(dirname $f)" "./$newname"
+          fi
+        done
     }
 
     for i in $docPackages; do
-        import_dbs $i/share/doc
-        ln -sf $i/share/doc/*-ghc-*/* $out/share/hoogle/doc 2> /dev/null \
-            || ln -sf $i/share/doc/* $out/share/hoogle/doc
+        findInputs $i docPackages propagated-native-build-inputs
+        findInputs $i docPackages propagated-build-inputs
     done
 
-    import_dbs ${self.ghc}/share/doc/ghc*/html/libraries
-    ln -sf ${self.ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
+    for i in $docPackages; do
+      if [[ ! $i == $out ]]; then
+        for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
+          if [[ -d $docdir ]]; then
+            import_dbs $docdir
+            ln -sf $docdir $out/share/hoogle/doc
+          fi
+        done
+      fi
+    done
 
-    unset http_proxy
-    unset ftp_proxy
+    import_dbs ${ghc}/share/doc/ghc*/html/libraries
+    ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
 
     chmod 644 *.hoo *.txt
-    $out/bin/hoogle data -d $PWD --redownload -l $(echo *.txt | sed 's/\.txt//g')
-    PATH=$out/bin:$PATH ${rehoo}/bin/rehoo -j4 -c64 .
+    rehoo -j4 -c64 .
 
-    rm -fr downloads *.txt *.dep
+    rm -fr downloads *.dep *.txt
     mv default.hoo x || exit 0
     rm -f *.hoo
     mv x default.hoo || exit 1
@@ -101,23 +91,17 @@ cabal.mkDerivation (self: rec {
         exit 1
     fi
 
-    mv $out/bin/hoogle $out/bin/.hoogle-wrapped
-    cat - > $out/bin/hoogle <<EOF
-    #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    HOOGLE_DOC_PATH=$out/share/hoogle/doc exec $out/bin/.hoogle-wrapped \$COMMAND -d $out/share/hoogle "\$@"
-    EOF
+    mkdir -p $out/bin
+    substitute ${wrapper} $out/bin/hoogle \
+        --subst-var out --subst-var-by shell ${stdenv.shell} \
+        --subst-var-by hoogle ${hoogle}
     chmod +x $out/bin/hoogle
   '';
 
   meta = {
-    homepage = "http://www.haskell.org/hoogle/";
-    description = "Haskell API Search";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    description = "A local Hoogle database";
+    platforms = ghc.meta.platforms;
+    hydraPlatforms = with stdenv.lib.platforms; none;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
   };
-})
+}
diff --git a/pkgs/development/libraries/haskell/hoopl/default.nix b/pkgs/development/libraries/haskell/hoopl/default.nix
new file mode 100644
index 00000000000..a0c494d67cf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoopl/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "hoopl";
+  version = "3.10.0.1";
+  sha256 = "1wahcngdmb3ixny0havrddkmrhs02rzlf1d1l7g8f6pzg051mr11";
+  meta = {
+    homepage = "http://ghc.cs.tufts.edu/hoopl/";
+    description = "A library to support dataflow analysis and optimization";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix
index c077e7cde20..5532b56e6a1 100644
--- a/pkgs/development/libraries/haskell/hopenssl/default.nix
+++ b/pkgs/development/libraries/haskell/hopenssl/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hopenssl";
-  version = "1.6.2";
-  sha256 = "0b9xdm7jgkadx53vwszjnisyblzsqk99s3zqppgp0iqqf9955s4w";
+  version = "1.7";
+  sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly";
   buildDepends = [ mtl ];
   extraLibraries = [ openssl ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hosc/default.nix b/pkgs/development/libraries/haskell/hosc/default.nix
new file mode 100644
index 00000000000..2ad4d6210e2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hosc/default.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, blazeBuilder, dataBinaryIeee754, network
+, QuickCheck, testFramework, testFrameworkQuickcheck2, time
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hosc";
+  version = "0.15";
+  sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
+  buildDepends = [
+    binary blazeBuilder dataBinaryIeee754 network time transformers
+  ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://rd.slavepianos.org/t/hosc";
+    description = "Haskell Open Sound Control";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix
index 5b11121a9ef..92e3806b8cd 100644
--- a/pkgs/development/libraries/haskell/hourglass/default.nix
+++ b/pkgs/development/libraries/haskell/hourglass/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hourglass";
-  version = "0.2.2";
-  sha256 = "015ipy9adi67nfddjsw9c0ihn0banghgawjli0lgrmiyjz01610c";
+  version = "0.2.6";
+  sha256 = "029fmx5r6krj7y7mn4b4m2lpaa3iw6vhyznrib5lhf469i1jp9m3";
   buildDepends = [ deepseq ];
   testDepends = [
     deepseq mtl tasty tastyHunit tastyQuickcheck time
diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix
index db38dbc2399..c4e9ddbe2aa 100644
--- a/pkgs/development/libraries/haskell/hplayground/default.nix
+++ b/pkgs/development/libraries/haskell/hplayground/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hplayground";
-  version = "0.1.0.3";
-  sha256 = "1k46b94n9wkbh7374mjyg5jnwxxrhj8ai53q3r4lysx1rzgw7ak6";
+  version = "0.1.1.0";
+  sha256 = "03ya82lxhv7acakhl01835p3wvwr3z14jiww7wvj4bzlib8qsi8b";
   buildDepends = [
     dataDefault hasteCompiler hastePerch monadsTf transformers
   ];
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ tomberek ];
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
new file mode 100644
index 00000000000..c045cf8e720
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, criterion, csv, dataDefault, filepath, handaGdata
+, hsbencher, httpConduit, mtl, network, statistics, text, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsbencher-fusion";
+  version = "0.3.3";
+  sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    criterion csv dataDefault filepath handaGdata hsbencher httpConduit
+    mtl network statistics text time
+  ];
+  doCheck = false;
+  meta = {
+    description = "Backend for uploading benchmark data to Google Fusion Tables";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix
new file mode 100644
index 00000000000..0786aa18b3c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsbencher/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, dataDefault, filepath, GenericPretty, HUnit
+, ioStreams, mtl, random, testFramework, testFrameworkHunit, text
+, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsbencher";
+  version = "1.20.0.3";
+  sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl";
+  buildDepends = [
+    async dataDefault filepath GenericPretty ioStreams mtl random time
+  ];
+  testDepends = [ HUnit testFramework testFrameworkHunit text time ];
+  doCheck = false;
+  meta = {
+    description = "Launch and gather data from Haskell and non-Haskell benchmarks";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsc3-db/default.nix b/pkgs/development/libraries/haskell/hsc3-db/default.nix
new file mode 100644
index 00000000000..13a32c52863
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsc3-db/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hsc3, safe }:
+
+cabal.mkDerivation (self: {
+  pname = "hsc3-db";
+  version = "0.15";
+  sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
+  buildDepends = [ hsc3 safe ];
+  noHaddock = true;
+  meta = {
+    homepage = "http://rd.slavepianos.org/t/hsc3-db";
+    description = "Haskell SuperCollider Unit Generator Database";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsc3-dot/default.nix b/pkgs/development/libraries/haskell/hsc3-dot/default.nix
new file mode 100644
index 00000000000..7423525e46f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsc3-dot/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, hsc3 }:
+
+cabal.mkDerivation (self: {
+  pname = "hsc3-dot";
+  version = "0.15";
+  sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
+  buildDepends = [ filepath hsc3 ];
+  meta = {
+    homepage = "http://rd.slavepianos.org/t/hsc3-dot";
+    description = "haskell supercollider graph drawing";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsc3-lang/default.nix b/pkgs/development/libraries/haskell/hsc3-lang/default.nix
new file mode 100644
index 00000000000..dd12067d45e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsc3-lang/default.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bifunctors, dataDefault, dataOrdlist, dlist, hashable
+, hmatrixSpecial, hosc, hsc3, MonadRandom, random, randomShuffle
+, split, transformers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsc3-lang";
+  version = "0.15";
+  sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
+  buildDepends = [
+    bifunctors dataDefault dataOrdlist dlist hashable hmatrixSpecial
+    hosc hsc3 MonadRandom random randomShuffle split transformers
+    vector
+  ];
+  meta = {
+    homepage = "http://rd.slavepianos.org/t/hsc3-lang";
+    description = "Haskell SuperCollider Language";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsc3-process/default.nix b/pkgs/development/libraries/haskell/hsc3-process/default.nix
new file mode 100644
index 00000000000..6b81f64b03d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsc3-process/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, dataDefault, filepath, hosc, hsc3, time, timeCompat
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsc3-process";
+  version = "0.10.0";
+  sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    dataDefault filepath hosc hsc3 time timeCompat transformers
+  ];
+  meta = {
+    homepage = "https://github.com/kaoskorobase/hsc3-process";
+    description = "Create and control scsynth processes";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsc3-server/default.nix b/pkgs/development/libraries/haskell/hsc3-server/default.nix
new file mode 100644
index 00000000000..c8e78e4e7ea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsc3-server/default.nix
@@ -0,0 +1,32 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bitset, dataDefault, failure, hashtables, hosc, hsc3
+, hsc3Process, liftedBase, ListZipper, monadControl, QuickCheck
+, random, resourcet, testFramework, testFrameworkQuickcheck2
+, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsc3-server";
+  version = "0.9.2";
+  sha256 = "1lq4y57d555jb0yi10n4j69h4whwsm5h2k6j4r7f9avds5ahh6s2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    bitset dataDefault failure hashtables hosc hsc3 hsc3Process
+    liftedBase ListZipper monadControl random resourcet transformers
+    transformersBase
+  ];
+  testDepends = [
+    failure QuickCheck random testFramework testFrameworkQuickcheck2
+    transformers
+  ];
+  meta = {
+    homepage = "https://github.com/kaoskorobase/hsc3-server";
+    description = "SuperCollider server resource management and synchronization";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsc3/default.nix b/pkgs/development/libraries/haskell/hsc3/default.nix
new file mode 100644
index 00000000000..6e05c01220e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsc3/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, dataDefault, dataOrdlist, filepath, hashable, hosc
+, network, random, safe, split, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hsc3";
+  version = "0.15";
+  sha256 = "1rmxl1wcly74bjkw79zw9ydmiclk5716w75b4nz8xkqraijiafrg";
+  buildDepends = [
+    binary dataDefault dataOrdlist filepath hashable hosc network
+    random safe split transformers
+  ];
+  meta = {
+    homepage = "http://rd.slavepianos.org/t/hsc3";
+    description = "Haskell SuperCollider";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index 96bcecddc30..cc9b8046322 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -6,14 +6,15 @@
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.5.1";
-  sha256 = "17yzfikfl8qvm6vp3d472l6p0kzzw694ng19xn3fmrb43qvki4jj";
+  version = "0.6.4";
+  sha256 = "07v7sm98a0vzfk1xx8mf6l2ybf3rwx4ml2wxp1rlw5w1aapffsfw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     attoparsec cmdargs dyre haskellSrcExts lens mtl split text
   ];
   testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
+  jailbreak = true;
   meta = {
     description = "A command line program for extending the import list of a Haskell source file";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/hspec-checkers/default.nix b/pkgs/development/libraries/haskell/hspec-checkers/default.nix
new file mode 100644
index 00000000000..7e5022e19b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-checkers/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, checkers, hspec }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-checkers";
+  version = "0.1.0";
+  sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d";
+  buildDepends = [ checkers hspec ];
+  testDepends = [ checkers hspec ];
+  meta = {
+    description = "Allows to use checkers properties from hspec";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hspec-contrib/default.nix b/pkgs/development/libraries/haskell/hspec-contrib/default.nix
new file mode 100644
index 00000000000..53f94edc793
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-contrib/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, hspecCore, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-contrib";
+  version = "0.2.0";
+  sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq";
+  buildDepends = [ hspecCore HUnit ];
+  testDepends = [ hspec hspecCore HUnit QuickCheck ];
+  meta = {
+    homepage = "http://hspec.github.io/";
+    description = "Contributed functionality for Hspec";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix
new file mode 100644
index 00000000000..313153c55c0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-core/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiTerminal, async, deepseq, hspecExpectations, hspecMeta
+, HUnit, QuickCheck, quickcheckIo, random, setenv, silently
+, tfRandom, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-core";
+  version = "2.1.2";
+  sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh";
+  buildDepends = [
+    ansiTerminal async deepseq hspecExpectations HUnit QuickCheck
+    quickcheckIo random setenv tfRandom time transformers
+  ];
+  testDepends = [
+    ansiTerminal async deepseq hspecExpectations hspecMeta HUnit
+    QuickCheck quickcheckIo random setenv silently tfRandom time
+    transformers
+  ];
+  meta = {
+    homepage = "http://hspec.github.io/";
+    description = "A Testing Framework for Haskell";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix
new file mode 100644
index 00000000000..8a4a79eae97
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, hspecMeta }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-discover";
+  version = "2.1.2";
+  sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath ];
+  testDepends = [ filepath hspecMeta ];
+  noHaddock = true;
+  meta = {
+    homepage = "http://hspec.github.io/";
+    description = "Automatically discover and run Hspec tests";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hspec-laws/default.nix b/pkgs/development/libraries/haskell/hspec-laws/default.nix
new file mode 100644
index 00000000000..b7b2a57d534
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-laws/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, markdownUnlit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-laws";
+  version = "0.0.0";
+  sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
+  buildDepends = [ hspec QuickCheck ];
+  testDepends = [ hspec markdownUnlit QuickCheck ];
+  meta = {
+    description = "Document and test laws for standard type classes";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 844b0a52805..8a10a300146 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations
-, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time
+, HUnit, QuickCheck, quickcheckIo, random, setenv, time
 , transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.11.3";
-  sha256 = "0cydxq5kgi4cczf6q70853wz3x1ymrf9mkp7rp71yir5vrhg0b8p";
+  version = "2.0.0";
+  sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv tfRandom time transformers
+    QuickCheck quickcheckIo random setenv time transformers
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
index 1341bf198c9..cb817c6df43 100644
--- a/pkgs/development/libraries/haskell/hspec-wai/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix
@@ -1,26 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, aesonQq, caseInsensitive, doctest, hspec2
-, hspecMeta, httpTypes, markdownUnlit, scotty, text, transformers
-, wai, waiExtra
+{ cabal, caseInsensitive, hspec, hspecCore, hspecExpectations
+, httpTypes, QuickCheck, text, transformers, wai, waiExtra
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-wai";
-  version = "0.3.0";
-  sha256 = "0wkzv406jiyi8ais3g0addm66274y1pvy55gypmnhwx5rp2kr6fb";
+  version = "0.6.2";
+  sha256 = "0nia4hz41g4264mn4s5j8dn9dh0xhdf1gym92wvjmy43rhj3qpzb";
   buildDepends = [
-    aeson aesonQq caseInsensitive hspec2 httpTypes text transformers
-    wai waiExtra
+    caseInsensitive hspecCore hspecExpectations httpTypes text
+    transformers wai waiExtra
   ];
   testDepends = [
-    aeson caseInsensitive doctest hspec2 hspecMeta httpTypes
-    markdownUnlit scotty text transformers wai waiExtra
+    caseInsensitive hspec hspecCore hspecExpectations httpTypes
+    QuickCheck text transformers wai waiExtra
   ];
   meta = {
-    description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)";
+    description = "Experimental Hspec support for testing WAI applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 98cc9f1b97e..8f8b66b39d3 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -1,25 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, random, setenv, silently, tfRandom, time, transformers
+{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta
+, HUnit, QuickCheck, stringbuilder, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.11.3";
-  sha256 = "0kq2cds8khwq7nl60pvgk8v6s2fizfkpdplc1p0mj8zyr9gyz7i0";
-  isLibrary = true;
-  isExecutable = true;
+  version = "2.1.2";
+  sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py";
   buildDepends = [
-    ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv tfRandom time transformers
-  ];
-  testDepends = [
-    ansiTerminal async deepseq filepath ghcPaths hspecExpectations
-    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
-    tfRandom time transformers
+    hspecCore hspecDiscover hspecExpectations HUnit QuickCheck
+    transformers
   ];
+  testDepends = [ hspecCore hspecMeta stringbuilder ];
   doCheck = false;
   meta = {
     homepage = "http://hspec.github.io/";
diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix
index 295b01b4e32..c6f64c92182 100644
--- a/pkgs/development/libraries/haskell/hspec2/default.nix
+++ b/pkgs/development/libraries/haskell/hspec2/default.nix
@@ -1,31 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, random, setenv, silently, tfRandom, time, transformers
-}:
+{ cabal, hspec, hspecDiscover }:
 
 cabal.mkDerivation (self: {
   pname = "hspec2";
-  version = "0.4.1";
-  sha256 = "131w90yy7scxdpz7qa37n1wmyr8gvc5jqdsqkpg8s9pqham96w5v";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal async deepseq filepath hspecExpectations HUnit
-    QuickCheck quickcheckIo random setenv tfRandom time transformers
-  ];
-  testDepends = [
-    ansiTerminal async deepseq filepath ghcPaths hspecExpectations
-    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
-    tfRandom time transformers
-  ];
+  version = "0.6.1";
+  sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
+  buildDepends = [ hspec hspecDiscover ];
   meta = {
     homepage = "http://hspec.github.io/";
     description = "Alpha version of Hspec 2.0";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
     broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
index 4d13846175c..f45fa6bb534 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "html-conduit";
-  version = "1.1.0.5";
-  sha256 = "1yxvaiklg90fsiv2sfzrr3hp1wjs0fhcg709b24lqm81aryaq2sn";
+  version = "1.1.1.1";
+  sha256 = "1bsr0fsy7k606m477c4rxdh7j71nyrp86f1lg9wlwnbm31vrhw00";
   buildDepends = [
     conduit conduitExtra resourcet systemFilepath tagstreamConduit text
     transformers xmlConduit xmlTypes
diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/default.nix
index a06b1422bc3..a06b1422bc3 100644
--- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix
+++ b/pkgs/development/libraries/haskell/html/default.nix
diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 7f032c3f675..9ab96c6dfe8 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.7.2";
-  sha256 = "1llrf2bfbh5z01pwg40zdgmz93h45h60mg2pv1k6b8pmzlwr6aaz";
+  version = "0.4.6";
+  sha256 = "0zv1jncacwxxk8dj1jlicjdlfhxigpl23frq2vrp4w76d1lsa0d8";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
diff --git a/pkgs/development/libraries/haskell/http-common/default.nix b/pkgs/development/libraries/haskell/http-common/default.nix
index da60083936c..61c76e55842 100644
--- a/pkgs/development/libraries/haskell/http-common/default.nix
+++ b/pkgs/development/libraries/haskell/http-common/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-common";
-  version = "0.7.1.1";
-  sha256 = "1a0szaqs1halrv4kx57g2hd4vcdhks7pfal0hyq19af2pncaz1h8";
+  version = "0.7.2.0";
+  sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive mtl network text
     transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index fd7eb7dd64a..bb5dc9f7505 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -3,14 +3,14 @@
 { cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra
 , connection, cookie, dataDefaultClass, hspec, httpClient
 , httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl
-, network, networkConduit, resourcet, streamingCommons, text, time
-, transformers, utf8String, wai, waiConduit, warp, warpTls
+, network, resourcet, streamingCommons, text, time, transformers
+, utf8String, wai, waiConduit, warp, warpTls
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.1.4.1";
-  sha256 = "1v65v2dky7vgyh5hfvih208zhbd2czxdrshw9zw0af1naq2m5hk2";
+  version = "2.1.5";
+  sha256 = "0vk2an6h3h7a5klk9xrf3apfm6xdmqm418yrr7pb56b7w5sfq003";
   buildDepends = [
     conduit httpClient httpClientTls httpTypes liftedBase monadControl
     mtl resourcet transformers
@@ -18,8 +18,8 @@ cabal.mkDerivation (self: {
   testDepends = [
     blazeBuilder caseInsensitive conduit conduitExtra connection cookie
     dataDefaultClass hspec httpClient httpTypes HUnit liftedBase
-    network networkConduit streamingCommons text time transformers
-    utf8String wai waiConduit warp warpTls
+    network streamingCommons text time transformers utf8String wai
+    waiConduit warp warpTls
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index c2316799a03..61f4d91d5cc 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -2,15 +2,14 @@
 
 { cabal, async, blazeBuilder, caseInsensitive, conduit
 , conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit
-, httpTypes, liftedBase, monadControl, network, networkConduit
-, resourcet, streamingCommons, text, transformers, wai, waiLogger
-, warp, word8
+, httpTypes, liftedBase, monadControl, network, resourcet
+, streamingCommons, text, transformers, wai, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.4.0.1";
-  sha256 = "0gygmykxsy6rs3xmwb24s5c3brmabdgxb1w0ak82vyvfvsnqxz1h";
+  version = "0.4.1.2";
+  sha256 = "1gggn5l08g7mxbka0h7h8w687y3awbm19395fi6wvis76isyz8wy";
   buildDepends = [
     async blazeBuilder caseInsensitive conduit conduitExtra
     dataDefaultClass httpClient httpTypes liftedBase monadControl
@@ -19,8 +18,7 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [
     blazeBuilder conduit conduitExtra hspec httpConduit httpTypes
-    liftedBase network networkConduit resourcet streamingCommons
-    transformers wai warp
+    liftedBase network resourcet streamingCommons transformers wai warp
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix
index 910851bde34..ec993a8b2a5 100644
--- a/pkgs/development/libraries/haskell/http-streams/default.nix
+++ b/pkgs/development/libraries/haskell/http-streams/default.nix
@@ -3,27 +3,28 @@
 { cabal, aeson, aesonPretty, attoparsec, base64Bytestring
 , blazeBuilder, caseInsensitive, HsOpenSSL, hspec
 , hspecExpectations, httpCommon, HUnit, ioStreams
-, MonadCatchIOTransformers, mtl, network, opensslStreams, snapCore
-, snapServer, systemFileio, systemFilepath, text, transformers
-, unorderedContainers
+, MonadCatchIOTransformers, mtl, network, networkUri
+, opensslStreams, snapCore, snapServer, systemFileio
+, systemFilepath, text, transformers, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-streams";
-  version = "0.7.2.0";
-  sha256 = "0h7fjnpday34skhafv2v0ybhfv0x915prfb4qa0ld4gm50scsinz";
+  version = "0.7.2.4";
+  sha256 = "1hs2d5qiq5vq6qjxxx061w1iigr05chkv28xvlvxfz0wc7nlipzz";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
-    HsOpenSSL httpCommon ioStreams mtl network opensslStreams text
-    transformers unorderedContainers
+    HsOpenSSL httpCommon ioStreams mtl network networkUri
+    opensslStreams text transformers unorderedContainers
   ];
   testDepends = [
     aeson aesonPretty attoparsec base64Bytestring blazeBuilder
     caseInsensitive HsOpenSSL hspec hspecExpectations httpCommon HUnit
-    ioStreams MonadCatchIOTransformers mtl network opensslStreams
-    snapCore snapServer systemFileio systemFilepath text transformers
-    unorderedContainers
+    ioStreams MonadCatchIOTransformers mtl network networkUri
+    opensslStreams snapCore snapServer systemFileio systemFilepath text
+    transformers unorderedContainers
   ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "http://research.operationaldynamics.com/projects/http-streams/";
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index 35fa96dd1a5..f07cb5581f8 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.8.5";
-  sha256 = "0d282sf3xyk5makhnwfm2k9mgw1fkh07kasmy85fiwjkc1447ciw";
+  version = "0.8.6";
+  sha256 = "1q1ni88rs8d79xnk1x2jaf3848ygxlfhpvv4gw46k08lw29ihfxh";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   testDepends = [
     blazeBuilder doctest hspec QuickCheck quickcheckInstances text
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index bf5ad9217d3..4a4334be732 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, network }:
+{ cabal, network, networkUri }:
 
 cabal.mkDerivation (self: {
   pname = "httpd-shed";
-  version = "0.4.0.2";
-  sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3";
+  version = "0.4.0.3";
+  sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ network ];
+  buildDepends = [ network networkUri ];
   jailbreak = true;
   meta = {
     description = "A simple web-server with an interact style API";
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index ffb298023b7..45885432767 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -4,10 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt-charproperties";
-  version = "9.1.1.1";
-  sha256 = "1a8cmswqysd0fpq6bpszav5cqpibnad49mbcswvrwipk28x3j078";
+  version = "9.2.0.0";
+  sha256 = "01v3j0cg9pkp18iy4s8s582qqq98r4l9jzr84x5sa2rva4cg0gpi";
   meta = {
-    homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
+    homepage = "https://github.com/UweSchmidt/hxt";
     description = "Character properties and classes for XML and Unicode";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
index 60b43b0bad4..6ebb0ba0d89 100644
--- a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Utility functions for using HXT picklers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
index 9f600fd195d..71d6765f93f 100644
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
@@ -1,12 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hxtCharproperties, parsec }:
+{ cabal, HUnit, hxtCharproperties, parsec, text }:
 
 cabal.mkDerivation (self: {
   pname = "hxt-regex-xmlschema";
-  version = "9.1.0";
-  sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr";
-  buildDepends = [ hxtCharproperties parsec ];
+  version = "9.2.0";
+  sha256 = "0pcbyvc71173ad0zkgpdpyyljngrk4p1jjjaw5wbwcvm4ijh44g3";
+  buildDepends = [ hxtCharproperties parsec text ];
+  testDepends = [ HUnit parsec text ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
     description = "A regular expression library for W3C XML Schema regular expressions";
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 131a01ed432..db2badaaaf2 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -1,22 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, binary, deepseq, filepath, HUnit, hxtCharproperties
-, hxtRegexXmlschema, hxtUnicode, mtl, network, parsec
+, hxtRegexXmlschema, hxtUnicode, mtl, networkUri, parsec
 }:
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.3.1.6";
-  sha256 = "0k2i72ricxwnadagjbzyhfd7nfivay9gbf5f81sagr6j3wgnhz8f";
+  version = "9.3.1.7";
+  sha256 = "1dgdq2l9k8v36iahmkxxjmmv955f9gv6lq09nsah9zcscsgm0v2i";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
-    hxtUnicode mtl network parsec
+    hxtUnicode mtl networkUri parsec
   ];
-  jailbreak = true;
+  configureFlags = "-fnetwork-uri";
   meta = {
     homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
     description = "A collection of tools for processing XML with Haskell";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix
index 33a5ba4bea6..734c7587aa9 100644
--- a/pkgs/development/libraries/haskell/iCalendar/default.nix
+++ b/pkgs/development/libraries/haskell/iCalendar/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl
-, network, parsec, text, time
+, network, networkUri, parsec, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "iCalendar";
-  version = "0.4.0.1";
-  sha256 = "08m47nxxz70lmmndlgycfb27x8xfwakxi8izbba0f6w23ddaljp3";
+  version = "0.4.0.2";
+  sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry";
   buildDepends = [
     base64Bytestring caseInsensitive dataDefault mime mtl network
-    parsec text time
+    networkUri parsec text time
   ];
   meta = {
     homepage = "http://github.com/tingtun/iCalendar";
diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix
index 1dd734af610..de0ce49c83e 100644
--- a/pkgs/development/libraries/haskell/ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/ieee754/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ieee754";
-  version = "0.7.3";
-  sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0";
+  version = "0.7.4";
+  sha256 = "1pxbkfa21mvc869n18nn7r29hcinxdbsnk68nlldzld8f6m13g1h";
   meta = {
     homepage = "http://github.com/patperry/hs-ieee754";
     description = "Utilities for dealing with IEEE floating point numbers";
diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
index 5529f27eb5e..e21c596fa2f 100644
--- a/pkgs/development/libraries/haskell/imm/default.nix
+++ b/pkgs/development/libraries/haskell/imm/default.nix
@@ -2,26 +2,27 @@
 
 { cabal, async, caseInsensitive, cond, dataDefault, dyre, feed
 , filepath, hslogger, httpConduit, httpTypes, lens, mimeMail
-, monadControl, mtl, network, opml, random, resourcet, text
-, textIcu, time, timerep, tls, transformers, transformersBase
+, monadControl, mtl, network, networkUri, opml, random, resourcet
+, text, textIcu, time, timerep, tls, transformers, transformersBase
 , utf8String, xdgBasedir, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "imm";
-  version = "0.6.0.2";
-  sha256 = "0bawp8zqpkxig33ybv0yxv6bh51rfhsyp0q7l0lh61gy17rx0gsa";
+  version = "0.6.0.3";
+  sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     async caseInsensitive cond dataDefault dyre feed filepath hslogger
-    httpConduit httpTypes lens mimeMail monadControl mtl network opml
-    random resourcet text textIcu time timerep tls transformers
-    transformersBase utf8String xdgBasedir xml
+    httpConduit httpTypes lens mimeMail monadControl mtl network
+    networkUri opml random resourcet text textIcu time timerep tls
+    transformers transformersBase utf8String xdgBasedir xml
   ];
   meta = {
     description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix
index a2fd8cd438e..81331833cc4 100644
--- a/pkgs/development/libraries/haskell/implicit/default.nix
+++ b/pkgs/development/libraries/haskell/implicit/default.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index d5c0137a2c6..ecb9321686c 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -4,15 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "instant-generics";
-  version = "0.4";
-  sha256 = "14z6135jvmry9b52p21cqnwgp2w0g6frh1fm7z5byph06xls9r7l";
+  version = "0.4.1";
+  sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq";
   buildDepends = [ syb ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
     description = "Generic programming library with a sum of products view";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/intern/default.nix b/pkgs/development/libraries/haskell/intern/default.nix
new file mode 100644
index 00000000000..7dddb5b5f88
--- /dev/null
+++ b/pkgs/development/libraries/haskell/intern/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hashable, text, unorderedContainers }:
+
+cabal.mkDerivation (self: {
+  pname = "intern";
+  version = "0.9.1.3";
+  sha256 = "1629m3an18m3nqxq40mg9cn0c6rma1wm3jr7kn6kqpw4xq53zvvp";
+  buildDepends = [ hashable text unorderedContainers ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://github.com/ekmett/intern/";
+    description = "Efficient hash-consing for arbitrary data types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix
index eed6aa835f8..cc62218a928 100644
--- a/pkgs/development/libraries/haskell/interpolate/default.nix
+++ b/pkgs/development/libraries/haskell/interpolate/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck
-, quickcheckInstances, text
+{ cabal, haskellSrcMeta, hspec, QuickCheck, quickcheckInstances
+, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "interpolate";
-  version = "0.0.3";
-  sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw";
+  version = "0.1.0";
+  sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
   buildDepends = [ haskellSrcMeta ];
   testDepends = [
-    doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text
+    haskellSrcMeta hspec QuickCheck quickcheckInstances text
   ];
   meta = {
     description = "String interpolation done right";
diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
index 962f30de8a0..8c552654bac 100644
--- a/pkgs/development/libraries/haskell/intervals/default.nix
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "intervals";
-  version = "0.7";
-  sha256 = "00kwq57x72xi5kca7symb98nzs1j82r6bkgvr83aqpvq0ql9ka9d";
+  version = "0.7.0.1";
+  sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9";
   buildDepends = [ distributive ];
   testDepends = [ doctest filepath ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
index 4b5d9bab9be..3963add1825 100644
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ b/pkgs/development/libraries/haskell/io-streams/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-streams";
-  version = "1.1.4.6";
-  sha256 = "0vn6vlgfapmyd9y87i9i0y480w8w81xd3lnhh66a6lalskd4bjdw";
+  version = "1.2.1.1";
+  sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings
diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix
index d9037a8229b..004b504577a 100644
--- a/pkgs/development/libraries/haskell/ipprint/default.nix
+++ b/pkgs/development/libraries/haskell/ipprint/default.nix
@@ -11,5 +11,8 @@ cabal.mkDerivation (self: {
     description = "Tiny helper for pretty-printing values in ghci console";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+
+    # Works For Me. GHC 7.8.4, 2015-01-08 
+    #broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index e0130f8ae26..b0dd47468d9 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -23,5 +23,7 @@ cabal.mkDerivation (self: {
     description = "Iteratee-based I/O";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix
deleted file mode 100644
index 25b4ebed648..00000000000
--- a/pkgs/development/libraries/haskell/ixdopp/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, preprocessorTools, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "ixdopp";
-  version = "0.1.3";
-  sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ preprocessorTools syb ];
-  meta = {
-    homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
-    description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix
index c77950c68f0..24bbde7098d 100644
--- a/pkgs/development/libraries/haskell/ixset/default.nix
+++ b/pkgs/development/libraries/haskell/ixset/default.nix
@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "ixset";
-  version = "1.0.5";
-  sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns";
+  version = "1.0.6";
+  sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv";
   buildDepends = [ safecopy syb sybWithClass ];
   meta = {
     homepage = "http://happstack.com";
     description = "Efficient relational queries on Haskell sets";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
index f787073f080..28498da53d6 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     hydraPlatforms = self.stdenv.lib.platforms.none;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
     broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
index 9ff082e3239..2ad9bd83d75 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Snap backend for jmacro-rpc";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
index d1e302b1bc9..ec2c3d8a960 100644
--- a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix
index 32d4d3747ef..9f2fee5f7da 100644
--- a/pkgs/development/libraries/haskell/jmacro/default.nix
+++ b/pkgs/development/libraries/haskell/jmacro/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "QuasiQuotation library for programmatic generation of Javascript code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/js-flot/default.nix b/pkgs/development/libraries/haskell/js-flot/default.nix
new file mode 100644
index 00000000000..3bc570d557d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/js-flot/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, HTTP }:
+
+cabal.mkDerivation (self: {
+  pname = "js-flot";
+  version = "0.8.3";
+  sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
+  testDepends = [ HTTP ];
+  meta = {
+    homepage = "https://github.com/ndmitchell/js-flot#readme";
+    description = "Obtain minified flot code";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/js-jquery/default.nix b/pkgs/development/libraries/haskell/js-jquery/default.nix
new file mode 100644
index 00000000000..ad776b577f4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/js-jquery/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, HTTP }:
+
+cabal.mkDerivation (self: {
+  pname = "js-jquery";
+  version = "1.11.1";
+  sha256 = "0k4hrpxsc48nanr2zw6jcirirsarlshycx7d5hzqqv9jfhy1i88d";
+  testDepends = [ HTTP ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/ndmitchell/js-jquery#readme";
+    description = "Obtain minified jQuery code";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix
index 9adcaf17572..9a9364d09d0 100644
--- a/pkgs/development/libraries/haskell/json-assertions/default.nix
+++ b/pkgs/development/libraries/haskell/json-assertions/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "1.0.5";
   sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck";
   buildDepends = [ aeson indexed indexedFree lens lensAeson text ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ocharles/json-assertions.git";
     description = "Test that your (Aeson) JSON encoding matches your expectations";
diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix
index 4bb33b628e3..c7e5c3373c5 100644
--- a/pkgs/development/libraries/haskell/json-rpc/default.nix
+++ b/pkgs/development/libraries/haskell/json-rpc/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "json-rpc";
-  version = "0.2.0.1";
-  sha256 = "0kk2wpgnkdhphf9za2whmn4f6qlly5hzr071bx7xjqwqbpfhwplm";
+  version = "0.2.1.1";
+  sha256 = "0h6dkb1rgd6qxzcxvqvgwilmibkdbqpjvflijwf54fx2z687fjld";
   buildDepends = [
     aeson async conduit conduitExtra deepseq hashable mtl stm
     stmConduit text unorderedContainers
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     stm stmConduit testFramework testFrameworkQuickcheck2 text
     unorderedContainers
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/xenog/json-rpc";
     description = "Fully-featured JSON-RPC 2.0 library";
diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix
index 8ae6763d0a4..cd102d35803 100644
--- a/pkgs/development/libraries/haskell/json-schema/default.nix
+++ b/pkgs/development/libraries/haskell/json-schema/default.nix
@@ -1,26 +1,27 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, genericAeson, genericDeriving, HUnit
-, tagged, tasty, tastyHunit, tastyTh, text, time
-, unorderedContainers, vector
+{ cabal, aeson, aesonUtils, attoparsec, genericAeson
+, genericDeriving, mtl, scientific, tagged, tasty, tastyHunit
+, tastyTh, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "json-schema";
-  version = "0.6.1.1";
-  sha256 = "0hn1v2idra9sx1x5mr511h4qcvnhy7b80fgn58w9856w9cl7d34b";
+  version = "0.7.3.0";
+  sha256 = "0jdhmzg1is8dnyz46r6w616xq0w1lypc9xz1c2mcimr9xb9r70zw";
   buildDepends = [
-    aeson genericAeson genericDeriving tagged text time
+    aeson genericAeson genericDeriving mtl scientific tagged text time
     unorderedContainers vector
   ];
   testDepends = [
-    aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh
-    text
+    aeson aesonUtils attoparsec genericAeson tagged tasty tastyHunit
+    tastyTh text vector
   ];
   jailbreak = true;
   meta = {
     description = "Types and type classes for defining JSON schemas";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
index a709c4a0b2d..3eeb6958f83 100644
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "json";
-  version = "0.7";
-  sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk";
+  version = "0.9";
+  sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j";
   buildDepends = [ mtl parsec syb text ];
   meta = {
     description = "Support for serialising Haskell to and from JSON";
diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix
new file mode 100644
index 00000000000..dfab13e9132
--- /dev/null
+++ b/pkgs/development/libraries/haskell/jwt/default.nix
@@ -0,0 +1,30 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, base64Bytestring, cryptohash, dataDefault
+, httpTypes, HUnit, lens, lensAeson, network, networkUri
+, QuickCheck, scientific, semigroups, tasty, tastyHunit
+, tastyQuickcheck, tastyTh, text, time, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "jwt";
+  version = "0.5.3";
+  sha256 = "1225fa53gghfpgwhr4x269a6kygfj39fh2qdapdi9mrrvlg302i4";
+  buildDepends = [
+    aeson base64Bytestring cryptohash dataDefault httpTypes network
+    networkUri scientific semigroups text time unorderedContainers
+    vector
+  ];
+  testDepends = [
+    aeson base64Bytestring cryptohash dataDefault httpTypes HUnit lens
+    lensAeson network networkUri QuickCheck scientific semigroups tasty
+    tastyHunit tastyQuickcheck tastyTh text time unorderedContainers
+    vector
+  ];
+  meta = {
+    homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
+    description = "JSON Web Token (JWT) decoding and encoding";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix
index c0ffaed799d..d359cebd6e1 100644
--- a/pkgs/development/libraries/haskell/kan-extensions/default.nix
+++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, adjunctions, comonad, contravariant, distributive, free
-, mtl, pointed, semigroupoids, transformers
+, mtl, pointed, semigroupoids, tagged, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "kan-extensions";
-  version = "4.1";
-  sha256 = "1dg9q6rahgvsnsnd76r6a3harrllq3pzz9250cakgqip4n02dji1";
+  version = "4.1.1";
+  sha256 = "0g7z37c2jvhvq08ynnd5z2spp7w56vqhpg5biscj62rw7fzssnar";
   buildDepends = [
     adjunctions comonad contravariant distributive free mtl pointed
-    semigroupoids transformers
+    semigroupoids tagged transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/kan-extensions/";
diff --git a/pkgs/development/libraries/haskell/kansas-comet/default.nix b/pkgs/development/libraries/haskell/kansas-comet/default.nix
new file mode 100644
index 00000000000..1c01d567d75
--- /dev/null
+++ b/pkgs/development/libraries/haskell/kansas-comet/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, dataDefault, scotty, stm, text, time, transformers
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "kansas-comet";
+  version = "0.3.1";
+  sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
+  buildDepends = [
+    aeson dataDefault scotty stm text time transformers
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "https://github.com/ku-fpg/kansas-comet/";
+    description = "A JavaScript push mechanism based on the comet idiom";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix
new file mode 100644
index 00000000000..ef0301ef773
--- /dev/null
+++ b/pkgs/development/libraries/haskell/labeled-tree/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "labeled-tree";
+  version = "1.0.0.0";
+  sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
+  meta = {
+    description = "Labeled tree structure";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
index c7261c4eed8..34cf827c027 100644
--- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Utility libraries for the advanced IRC bot, Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
index b869c59d131..6b09752f7d4 100644
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
   sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb";
   isLibrary = true;
   isExecutable = true;
+  patches = [ ./deps.patch ];
   buildDepends = [
     arrows binary brainfuck dataMemocombinators dependentMap
     dependentSum dependentSumTemplate dice editDistance filepath
@@ -31,6 +32,6 @@ cabal.mkDerivation (self: {
     license = "GPL";
     platforms = self.ghc.meta.platforms;
     hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot/deps.patch b/pkgs/development/libraries/haskell/lambdabot/deps.patch
new file mode 100644
index 00000000000..a9222806719
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lambdabot/deps.patch
@@ -0,0 +1,21 @@
+--- a/lambdabot.cabal.orig	2014-10-16 17:39:16.000000000 -0500
++++ b/lambdabot.cabal	2014-10-16 18:26:58.000000000 -0500
+@@ -166,7 +166,7 @@
+                         edit-distance           >= 0.2,
+                         filepath                >= 1.3,
+                         haskeline               >= 0.7,
+-                        haskell-src-exts        >= 1.14.0,
++                        haskell-src-exts        >= 1.14.0 && < 1.16,
+                         hstatsd                 >= 0.1,
+                         hslogger                >= 1.2.1,
+                         HTTP                    >= 4000,
+@@ -174,7 +174,8 @@
+                         misfortune              >= 0.1,
+                         monad-control           >= 0.3,
+                         mtl                     >= 2,
+-                        network                 >= 2.3.0.13,
++                        network                 >= 2.6,
++                        network-uri             >= 2.6,
+                         oeis                    >= 0.3.1,
+                         time                    >= 1.4,
+                         parsec                  >= 3,
diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
index 435ffef45c3..720d7dd8926 100644
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -4,17 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-inline";
-  version = "0.6.0.0";
-  sha256 = "08a22sr01kch365p5536fv32rxsfmdd6hkhcq1j7vhchjrsy3f6w";
+  version = "0.7.7.0";
+  sha256 = "10wj8dlsjimgln14y7b50pnnn865ln46v3xcqwr7ahjcl3icavg6";
   buildDepends = [ filepath languageCQuote mainlandPretty ];
   testDepends = [ languageCQuote ];
-  doCheck = false;
   meta = {
     homepage = "https://github.com/mchakravarty/language-c-inline/";
     description = "Inline C & Objective-C code in Haskell for language interoperability";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index d08a5c7fab9..03b1d62546b 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.8.0";
-  sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g";
+  version = "0.10.1.3";
+  sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol
diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix
index 2fe11c4f071..9346a10bdf2 100644
--- a/pkgs/development/libraries/haskell/language-c/default.nix
+++ b/pkgs/development/libraries/haskell/language-c/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c";
-  version = "0.4.6";
-  sha256 = "0pzd3g5q3sjfngs29biannza6l9am75kcjy5q0xcjv7xhz0z1m31";
+  version = "0.4.7";
+  sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
   buildDepends = [ filepath syb ];
   buildTools = [ alex happy ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix
index 6811b0db547..dc35a8867ba 100644
--- a/pkgs/development/libraries/haskell/language-java/default.nix
+++ b/pkgs/development/libraries/haskell/language-java/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-java";
-  version = "0.2.6";
-  sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27";
+  version = "0.2.7";
+  sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf";
   buildDepends = [ cpphs parsec syb ];
   testDepends = [
     filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/lattices/default.nix
index cfe7ff65871..d37b6d2e883 100644
--- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/lattices/default.nix
@@ -3,13 +3,12 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.2.0.1";
-  sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q";
+  pname = "lattices";
+  version = "1.2.1.1";
+  sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6";
   meta = {
-    description = "Software Transactional Memory";
+    description = "Fine-grained library for constructing and manipulating lattices";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix
index d19b0bf6dd7..f1fcd255b5f 100644
--- a/pkgs/development/libraries/haskell/lens-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens-aeson";
-  version = "1";
-  sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r";
+  version = "1.0.0.3";
+  sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac";
   buildDepends = [
     aeson attoparsec lens scientific text unorderedContainers vector
   ];
diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix
index a5c9e65f8a4..94a53898325 100644
--- a/pkgs/development/libraries/haskell/lens-family-core/default.nix
+++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens-family-core";
-  version = "1.1.0";
-  sha256 = "0pvc7iv7y5s3496w7ic9qzdw3l76ldnrg0my0jxi1dyn0vm9xwm3";
+  version = "1.2.0";
+  sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz";
   buildDepends = [ transformers ];
   meta = {
     description = "Haskell 98 Lens Families";
diff --git a/pkgs/development/libraries/haskell/lens-family-th/default.nix b/pkgs/development/libraries/haskell/lens-family-th/default.nix
new file mode 100644
index 00000000000..a2ecf7b61ef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-family-th/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "lens-family-th";
+  version = "0.4.0.0";
+  sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5";
+  meta = {
+    homepage = "http://github.com/DanBurton/lens-family-th#readme";
+    description = "Generate lens-family style lenses";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lens-family/default.nix b/pkgs/development/libraries/haskell/lens-family/default.nix
new file mode 100644
index 00000000000..58ce93e1b65
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-family/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, lensFamilyCore, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "lens-family";
+  version = "1.2.0";
+  sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb";
+  buildDepends = [ lensFamilyCore mtl transformers ];
+  meta = {
+    description = "Lens Families";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 190dd3fd14e..f82368422e4 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -6,18 +6,18 @@
 , QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
 , split, tagged, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void, zlib
+, transformersCompat, unorderedContainers, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.4.0.1";
-  sha256 = "0d1z6jix58g7x9r1jvm335hg2psflqc7w6sq54q486wil55c5vrw";
+  version = "4.6.0.1";
+  sha256 = "099hhkca39zxfj9xavd2rafzgm2r4nm8clngcsgcrn1qsy8knvz2";
   buildDepends = [
     bifunctors comonad contravariant distributive exceptions filepath
     free hashable mtl parallel primitive profunctors reflection
     semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers vector void zlib
+    transformersCompat unorderedContainers vector void
   ];
   testDepends = [
     deepseq doctest filepath genericDeriving hlint HUnit mtl nats
diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
index 8d4f854a993..2e3ba003233 100644
--- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix
@@ -1,19 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, dataDefault, filepath, leveldb, resourcet
+{ cabal, async, dataDefault, exceptions, filepath, leveldb, mtl
+, QuickCheck, resourcet, snappy, tasty, tastyQuickcheck, temporary
 , transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "leveldb-haskell";
-  version = "0.3.0";
-  sha256 = "0hdxn6v7fzc0wlpkymlci60m2584h6fn78bxdnv2q18ra03r3ygs";
+  version = "0.6";
+  sha256 = "1r76dvn8scnjfdw1i5cj3s5s1nqf2yib4jdydjnr8p6c8yvpp3z5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    async dataDefault filepath resourcet transformers
+    async dataDefault exceptions filepath resourcet transformers
   ];
-  extraLibraries = [ leveldb ];
+  testDepends = [
+    dataDefault exceptions mtl QuickCheck tasty tastyQuickcheck
+    temporary transformers
+  ];
+  extraLibraries = [ leveldb snappy ];
   meta = {
     homepage = "http://github.com/kim/leveldb-haskell";
     description = "Haskell bindings to LevelDB";
diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
index 0411cb93063..a873616f3c0 100644
--- a/pkgs/development/libraries/haskell/libjenkins/default.nix
+++ b/pkgs/development/libraries/haskell/libjenkins/default.nix
@@ -1,22 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, conduit, doctest, filepath, free, hspec
-, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens
-, monadControl, network, resourcet, text, transformers, xmlConduit
+{ cabal, async, attoparsec, doctest, filepath, free, hspec
+, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens
+, liftedAsync, liftedBase, monadControl, mtl, network, networkUri
+, profunctors, text, transformers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "libjenkins";
-  version = "0.4.3.0";
-  sha256 = "18z1yaf1a1ncvflxzv96b35d44933yrmsmxv5dr87iyfry28qbnv";
+  version = "0.6.0";
+  sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4";
   buildDepends = [
-    async conduit free httpClient httpConduit httpTypes lens
-    monadControl network resourcet text transformers xmlConduit
+    attoparsec free httpClient httpClientTls httpTypes liftedAsync
+    liftedBase monadControl mtl network networkUri profunctors text
+    transformers
   ];
   testDepends = [
-    async conduit doctest filepath free hspec hspecExpectationsLens
-    httpClient httpConduit httpTypes lens monadControl network
-    resourcet text transformers xmlConduit
+    async attoparsec doctest filepath free hspec hspecExpectationsLens
+    httpClient httpClientTls httpTypes lens liftedAsync liftedBase
+    monadControl mtl network networkUri profunctors text transformers
+    xmlConduit
   ];
   jailbreak = true;
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 176f80048c4..abfa8a0496b 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,28 +1,27 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, cereal, contravariant, cryptoApi, hspec
-, hspecExpectationsLens, httpClient, httpClientTls, HUnit, lens
-, network, profunctors, pureMD5, semigroups, text, void, xmlConduit
+{ cabal, aeson, cereal, cryptoApi, hspec, hspecExpectationsLens
+, httpClient, httpClientTls, HUnit, lens, lensAeson, networkUri
+, profunctors, pureMD5, semigroups, text, xmlConduit
 , xmlHtmlConduitLens
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.4.0.0";
-  sha256 = "0dr1nvb7sxlp1fihvnwz9lyfmaynbj39npah2ndvlgnzz670j0z9";
+  version = "0.5.1";
+  sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy";
   buildDepends = [
-    aeson cereal contravariant cryptoApi httpClient httpClientTls
-    network profunctors pureMD5 semigroups text void xmlConduit
+    aeson cereal cryptoApi httpClient httpClientTls networkUri
+    profunctors pureMD5 semigroups text xmlConduit
   ];
   testDepends = [
-    aeson cereal contravariant cryptoApi hspec hspecExpectationsLens
-    httpClient httpClientTls HUnit lens network profunctors pureMD5
-    text void xmlConduit xmlHtmlConduitLens
+    aeson cereal cryptoApi hspec hspecExpectationsLens httpClient
+    httpClientTls HUnit lens lensAeson networkUri profunctors pureMD5
+    text xmlConduit xmlHtmlConduitLens
   ];
   meta = {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index b54068d924c..6dc0aede069 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -1,25 +1,24 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl
-, network, QuickCheck, text, time, utf8String
+{ cabal, attoparsec, dataDefault, filepath, hspec, mtl, network
+, QuickCheck, text, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "libmpd";
-  version = "0.8.0.5";
-  sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh";
+  version = "0.9.0.1";
+  sha256 = "11smm8ai7053hljlxi5l2fkqxrqr1xrh6sxg2r0dlsvmmln7smrd";
   buildDepends = [
     attoparsec dataDefault filepath mtl network text time utf8String
   ];
   testDepends = [
-    dataDefault hspec HUnit mtl network QuickCheck text time utf8String
+    attoparsec dataDefault filepath hspec mtl network QuickCheck text
+    time utf8String
   ];
-  jailbreak = true;
-  doCheck = false;
   meta = {
-    homepage = "http://github.com/joachifm/libmpd-haskell#readme";
+    homepage = "http://github.com/vimus/libmpd-haskell#readme";
     description = "An MPD client library";
-    license = "LGPL";
+    license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix
new file mode 100644
index 00000000000..8ed4e80d49f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libnotify/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, glib, gtk, libnotify }:
+
+cabal.mkDerivation (self: {
+  pname = "libnotify";
+  version = "0.1.1.0";
+  sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0";
+  buildDepends = [ glib gtk ];
+  extraLibraries = [ libnotify ];
+  meta = {
+    description = "Bindings to libnotify library";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
index 1bb1bcacca3..e4dc138eae0 100644
--- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
+++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
@@ -1,6 +1,6 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text
+{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text
 , transformers, uniplate, unixBytestring, unorderedContainers, uuid
 , vector
 }:
@@ -13,7 +13,8 @@ cabal.mkDerivation (self: {
     hashable hsyslog pipes pipesSafe text transformers uniplate
     unixBytestring unorderedContainers uuid vector
   ];
-  extraLibraries = [ systemd-journal ];
+  extraLibraries = [ systemd ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ocharles/libsystemd-journal";
     description = "Haskell bindings to libsystemd-journal";
diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index 97a252d13d5..ecb6b9aa18a 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, async, HUnit, liftedBase, monadControl, mtl, tasty
+{ cabal, async, constraints, HUnit, liftedBase, monadControl, mtl, tasty
 , tastyHunit, tastyTh, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.2.0.2";
-  sha256 = "07sqgd3lxplfwrpys4jhz0068sx99765lpx8n4nj3k117z32slgf";
-  buildDepends = [ async liftedBase monadControl transformersBase ];
+  version = "0.6.0.1";
+  sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf";
+  buildDepends = [ async constraints liftedBase monadControl transformersBase ];
   testDepends = [
     async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh
   ];
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 3e4f95521bb..2aa24f83325 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.3.0";
-  sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n";
+  version = "0.2.3.3";
+  sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3";
   buildDepends = [ monadControl transformersBase ];
   testDepends = [
     HUnit monadControl testFramework testFrameworkHunit transformers
diff --git a/pkgs/development/libraries/haskell/lin-alg/default.nix b/pkgs/development/libraries/haskell/lin-alg/default.nix
new file mode 100644
index 00000000000..39391f989a8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lin-alg/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, NumInstances, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "lin-alg";
+  version = "0.1.0.2";
+  sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc";
+  buildDepends = [ NumInstances vector ];
+  meta = {
+    description = "Low-dimensional matrices and vectors for graphics and physics";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix
new file mode 100644
index 00000000000..a10489a6006
--- /dev/null
+++ b/pkgs/development/libraries/haskell/linear-opengl/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, distributive, lens, linear, OpenGL, OpenGLRaw, tagged }:
+
+cabal.mkDerivation (self: {
+  pname = "linear-opengl";
+  version = "0.2.0.4";
+  sha256 = "11pdif2w730jqknajr2si77a0z4v4k5spm5zdks642i25ya135ba";
+  buildDepends = [
+    distributive lens linear OpenGL OpenGLRaw tagged
+  ];
+  meta = {
+    homepage = "http://www.github.com/bgamari/linear-opengl";
+    description = "Isomorphisms between linear and OpenGL types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index 856b8491690..6301d8d42d6 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.10.1.2";
-  sha256 = "05zbqdcdjq7anng2nymy05wsnk9qpk8mgivqcndbfjpk4l1r9k94";
+  version = "1.15.5";
+  sha256 = "17fxz49zj6vklgfs583zpn7naqgp5mv2zsvmxrv80ym8r52mp5mi";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/linux-inotify/default.nix b/pkgs/development/libraries/haskell/linux-inotify/default.nix
new file mode 100644
index 00000000000..2c5dc577f0f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/linux-inotify/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hashable }:
+
+cabal.mkDerivation (self: {
+  pname = "linux-inotify";
+  version = "0.2.0.1";
+  sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r";
+  buildDepends = [ hashable ];
+  meta = {
+    description = "Thinner binding to the Linux Kernel's inotify interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix
new file mode 100644
index 00000000000..442ffc2028a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/list-t/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, basePrelude, HTF, mmorph, monadControl, mtlPrelude
+, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "list-t";
+  version = "0.4.2";
+  sha256 = "0n6zc7n5znjas9mgh3a9bn44xv55910i6c3b2l83n4pl9fnad03v";
+  buildDepends = [
+    basePrelude mmorph monadControl transformers transformersBase
+  ];
+  testDepends = [ basePrelude HTF mmorph mtlPrelude ];
+  meta = {
+    homepage = "https://github.com/nikita-volkov/list-t";
+    description = "ListT done right";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
deleted file mode 100644
index 37b6d6b60c5..00000000000
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general-pure";
-  version = "3.3.8.2";
-  sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp";
-  buildDepends = [ mtl parsec setenv transformers ];
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    description = "Pure Haskell LLVM functionality (no FFI)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
index c8601d844ca..cd92b67b16a 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general-pure";
-  version = "3.4.2.2";
-  sha256 = "0grbw0lamp0w4jzxg97jccl3jqdgqfgldpb4llvhr1l70591b0s8";
+  version = "3.4.4.0";
+  sha256 = "0x43yfcss3f5v5mlzyv7d13fvajbdgv4cmkx5yx1904xsiddg27v";
   buildDepends = [ mtl parsec setenv transformers ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
deleted file mode 100644
index 4669358ccbf..00000000000
--- a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
-, QuickCheck, setenv, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "llvm-general";
-  version = "3.3.8.2";
-  sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5";
-  buildDepends = [
-    llvmGeneralPure mtl parsec setenv transformers utf8String
-  ];
-  testDepends = [
-    HUnit llvmGeneralPure mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  buildTools = [ llvmConfig ];
-  doCheck = false;
-  meta = {
-    description = "General purpose LLVM bindings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
index 25993bb9fd0..aec66b12723 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "llvm-general";
-  version = "3.4.2.2";
-  sha256 = "1dqdvv8pslblavyi14xy0bgrr1ca8d1jqp60x16zgbzkk3f2jx6a";
+  version = "3.4.4.0";
+  sha256 = "10x7qb2svw0gz0sqf4vn14hpzks3rk29g4i2pzfdi5qk11j8jd9b";
   buildDepends = [
     llvmGeneralPure mtl parsec setenv transformers utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix
new file mode 100644
index 00000000000..54a7feee595
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, fetchzip, hspec, libsystemdJournal, loggingFacade, text
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "logging-facade-journald";
+  version = "0.0.0";
+  src = fetchzip {
+    url = "https://hackage.haskell.org/package/logging-facade-journald-0.0.0/logging-facade-journald-0.0.0.tar.gz";
+    sha256 = "1wvh48y3lz2ipz6cwh7gbwajwrd7ziivhkmgpglzjfy335zin7m6";
+  };
+  buildDepends = [
+    libsystemdJournal loggingFacade text unorderedContainers
+  ];
+  testDepends = [
+    hspec libsystemdJournal loggingFacade text unorderedContainers
+  ];
+  meta = {
+    description = "Journald back-end for logging-facade";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/logging-facade/default.nix b/pkgs/development/libraries/haskell/logging-facade/default.nix
new file mode 100644
index 00000000000..9e4e7601d85
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logging-facade/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, fetchzip, hspec, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "logging-facade";
+  version = "0.0.0";
+  src = fetchzip {
+    url = "https://hackage.haskell.org/package/logging-facade-0.0.0/logging-facade-0.0.0.tar.gz";
+    sha256 = "0w6bkzgf0lamcdnris95i1xq8wg882wf17b517rgr5d1vhxz9y7s";
+  };
+  buildDepends = [ transformers ];
+  testDepends = [ hspec ];
+  meta = {
+    description = "Simple logging abstraction that allows multiple backends";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix
index 83ee93f8463..94eb14cb003 100644
--- a/pkgs/development/libraries/haskell/logging/default.nix
+++ b/pkgs/development/libraries/haskell/logging/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "logging";
-  version = "1.4.1";
-  sha256 = "15mhpafv797f8aifjyjb5nc0fkd7if7bvx5hx9mzxycdzlk28gfp";
+  version = "2.1.0";
+  sha256 = "15ad4g7zkbklawd98m6x838fr5383vkvq92y75f56j1kj17g7rrh";
   buildDepends = [
     binary fastLogger liftedBase monadControl monadLogger pcreLight
     text time transformers vectorSpace
diff --git a/pkgs/development/libraries/haskell/logsink/default.nix b/pkgs/development/libraries/haskell/logsink/default.nix
new file mode 100644
index 00000000000..d272a4d4c2b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logsink/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, hsyslog, loggingFacade, time }:
+
+cabal.mkDerivation (self: {
+  pname = "logsink";
+  version = "0.1.0";
+  sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
+  buildDepends = [ hsyslog loggingFacade time ];
+  testDepends = [ hspec loggingFacade ];
+  meta = {
+    description = "A logging framework for Haskell";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix
index f7f8997480a..c3e90c84c56 100644
--- a/pkgs/development/libraries/haskell/lushtags/default.nix
+++ b/pkgs/development/libraries/haskell/lushtags/default.nix
@@ -9,11 +9,11 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ haskellSrcExts text vector ];
-  jailbreak = true;
   meta = {
     homepage = "https://github.com/bitc/lushtags";
     description = "Create ctags compatible tags files for Haskell programs";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix
new file mode 100644
index 00000000000..9b80409ddd4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lzma-conduit/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bindingsDSL, conduit, HUnit, lzma, QuickCheck, resourcet
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lzma-conduit";
+  version = "1.1.1";
+  sha256 = "1i1khkxpia5hp3f0p7h656yvbgwsxffpl2czxjbkiw6iz31rapwg";
+  buildDepends = [ bindingsDSL conduit resourcet transformers ];
+  testDepends = [
+    conduit HUnit QuickCheck resourcet testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  extraLibraries = [ lzma ];
+  meta = {
+    homepage = "http://github.com/alphaHeavy/lzma-conduit";
+    description = "Conduit interface for lzma/xz compression";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    broken = self.stdenv.isLinux && self.stdenv.isi686;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
index 34604a6fc66..7a1ee231957 100644
--- a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Enumerator interface for lzma/xz compression";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = self.stdenv.isi686;
   };
 })
diff --git a/pkgs/development/libraries/haskell/machines-directory/default.nix b/pkgs/development/libraries/haskell/machines-directory/default.nix
new file mode 100644
index 00000000000..3cd67af354e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/machines-directory/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, machines, machinesIo, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "machines-directory";
+  version = "0.2.0.0";
+  sha256 = "1b1jv23ijhm51nggxrncjhz24k4pl4nvj6s9h3jabr0gsnsb8y2v";
+  buildDepends = [ filepath machines machinesIo transformers ];
+  meta = {
+    homepage = "http://github.com/aloiscochard/machines-io";
+    description = "Directory (system) utilities for the machines library";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/machines-io/default.nix b/pkgs/development/libraries/haskell/machines-io/default.nix
new file mode 100644
index 00000000000..c724b7df62b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/machines-io/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, chunkedData, machines, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "machines-io";
+  version = "0.2.0.0";
+  sha256 = "0qjbfwyhscjmjbfj709kb9xr5p3yz4v21aq2g4dv1abqwgf85x03";
+  buildDepends = [ chunkedData machines transformers ];
+  meta = {
+    homepage = "http://github.com/aloiscochard/machines-io";
+    description = "IO utilities for the machines library";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix
index 1b391739c20..bb01e9f655e 100644
--- a/pkgs/development/libraries/haskell/machines/default.nix
+++ b/pkgs/development/libraries/haskell/machines/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "machines";
-  version = "0.2.5";
-  sha256 = "0745lhmfwq27nna517q7b82q59pda587wgh6840nw65syaj2qfhp";
+  version = "0.4.1";
+  sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb";
   buildDepends = [
     comonad free mtl pointed profunctors semigroups transformers void
   ];
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 8bd0f2dfc21..1383efab868 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.2.7";
   sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q";
   buildDepends = [ srcloc text ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";
     description = "Pretty printing designed for printing source code";
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/managed/default.nix
index 8cfb60ddfef..febb1f8c574 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix
+++ b/pkgs/development/libraries/haskell/managed/default.nix
@@ -3,14 +3,13 @@
 { cabal, transformers }:
 
 cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.1.1";
-  sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j";
+  pname = "managed";
+  version = "1.0.0";
+  sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5";
   buildDepends = [ transformers ];
   meta = {
-    description = "Monad classes, using functional dependencies";
+    description = "A monad for managed values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/map-syntax/default.nix b/pkgs/development/libraries/haskell/map-syntax/default.nix
new file mode 100644
index 00000000000..52c42efd320
--- /dev/null
+++ b/pkgs/development/libraries/haskell/map-syntax/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "map-syntax";
+  version = "0.2";
+  sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r";
+  buildDepends = [ mtl ];
+  testDepends = [
+    deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 transformers
+  ];
+  meta = {
+    description = "Syntax sugar for defining maps";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix
index 746bd1c7484..cd0bcd3cfee 100644
--- a/pkgs/development/libraries/haskell/markdown/default.nix
+++ b/pkgs/development/libraries/haskell/markdown/default.nix
@@ -1,17 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, blazeHtml, conduit, conduitExtra, dataDefault
-, hspec, systemFileio, systemFilepath, text, transformers
-, xssSanitize
+{ cabal, attoparsec, blazeHtml, blazeMarkup, conduit, conduitExtra
+, dataDefault, hspec, systemFileio, systemFilepath, text
+, transformers, xssSanitize
 }:
 
 cabal.mkDerivation (self: {
   pname = "markdown";
-  version = "0.1.9";
-  sha256 = "1bl86alrbl9i690sbqqlxb4hkdd0lv3x5aqc8zi55q9h0rfsi06l";
+  version = "0.1.13";
+  sha256 = "1r04h641d9y8p88h59isrz9g42gq7vdykx3n8bhk499ici800134";
   buildDepends = [
-    attoparsec blazeHtml conduit conduitExtra dataDefault text
-    transformers xssSanitize
+    attoparsec blazeHtml blazeMarkup conduit conduitExtra dataDefault
+    text transformers xssSanitize
   ];
   testDepends = [
     blazeHtml conduit conduitExtra hspec systemFileio systemFilepath
diff --git a/pkgs/development/libraries/haskell/meep/default.nix b/pkgs/development/libraries/haskell/meep/default.nix
new file mode 100644
index 00000000000..f8ad537938c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/meep/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bifunctors, doctest, hspec, hspecExpectationsLens, lens
+, QuickCheck, semigroups
+}:
+
+cabal.mkDerivation (self: {
+  pname = "meep";
+  version = "0.1.1.0";
+  sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq";
+  buildDepends = [ bifunctors lens semigroups ];
+  testDepends = [
+    bifunctors doctest hspec hspecExpectationsLens lens QuickCheck
+    semigroups
+  ];
+  meta = {
+    description = "A silly container";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mersenne-random/default.nix b/pkgs/development/libraries/haskell/mersenne-random/default.nix
new file mode 100644
index 00000000000..ec7a54c9ed2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mersenne-random/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "mersenne-random";
+  version = "1.0.0.1";
+  sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
+  meta = {
+    homepage = "http://code.haskell.org/~dons/code/mersenne-random";
+    description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 532ef28d9b7..f20b20f71b7 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.5.2";
-  sha256 = "0s5fj20n3lc2hn1mqpsvai63pgrl7vhqv26psdzqdwl70w9c04zf";
+  version = "0.4.6";
+  sha256 = "051mqpzypg4r6rd06qb75pl3nq9p68r1sl73r0pwl1imcp158aw6";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];
diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix
index a426927e318..04da7e27e2c 100644
--- a/pkgs/development/libraries/haskell/minioperational/default.nix
+++ b/pkgs/development/libraries/haskell/minioperational/default.nix
@@ -1,16 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, transformers }:
+{ cabal, cleanUnions, elevator, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "minioperational";
-  version = "0.4.3";
-  sha256 = "09z8536q0cc09iack6s8fghgrc5f3syq3sxf2cnai3rcfaqix86p";
-  buildDepends = [ transformers ];
+  version = "0.4.8.1";
+  sha256 = "02nkgbpf1dky7h3n99j9m3101wyfahcdx5wk5vidvf9snl5vy1w9";
+  buildDepends = [ cleanUnions elevator transformers ];
   meta = {
     homepage = "https://github.com/fumieval/minioperational";
     description = "fast and simple operational monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
index 2400721a656..b58449b22ad 100644
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ b/pkgs/development/libraries/haskell/miniutter/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "miniutter";
-  version = "0.4.4.0";
-  sha256 = "1pfgbvnxh3c9b489i121p5bg785bp9ivfwizjfwc9w3r6spgppvk";
+  version = "0.4.4.1";
+  sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1";
   buildDepends = [ binary minimorph text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
index b13eeeb5d83..bf8fb46f793 100644
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mmorph";
-  version = "1.0.3";
-  sha256 = "0b8pzb63zxw3cjw8yj73swvqhmi9c4lgw1mis1xbraya7flxc6qm";
+  version = "1.0.4";
+  sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
   buildDepends = [ transformers ];
   meta = {
     description = "Monad morphisms";
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 918e694f54c..f75688ef4ce 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, transformers, transformersBase }:
+{ cabal, stm, transformers, transformersBase }:
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.3.0";
-  sha256 = "0vjff64iwnd9vplqfjyylbd900qmsr92h62hnh715wk06yacji7g";
-  buildDepends = [ transformers transformersBase ];
+  version = "1.0.0.2";
+  sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr";
+  buildDepends = [ stm transformers transformersBase ];
   meta = {
     homepage = "https://github.com/basvandijk/monad-control";
     description = "Lift control operations, like exception catching, through monad transformers";
diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix
index 3afce21810c..c95adce3fcc 100644
--- a/pkgs/development/libraries/haskell/monad-journal/default.nix
+++ b/pkgs/development/libraries/haskell/monad-journal/default.nix
@@ -5,15 +5,15 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-journal";
-  version = "0.2.3.0";
-  sha256 = "1k0da0fwk05k8530rlys3n2s1z8glnfdivx93isy6cjr8amndc6b";
+  version = "0.7";
+  sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2";
   buildDepends = [
     either monadControl mtl transformers transformersBase
   ];
   meta = {
-    homepage = "https://github.com/phaazon/monad-journal";
+    homepage = "http://github.com/phaazon/monad-journal";
     description = "Pure logger typeclass and monad transformer";
-    license = self.stdenv.lib.licenses.publicDomain;
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index d8e724259a0..7988819b81c 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.7.2";
-  sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda";
+  version = "0.3.11.1";
+  sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7";
   buildDepends = [
     blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
     monadControl monadLoops mtl resourcet stm stmChans text
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
index d43379da7f9..c9d6cf71ae5 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4.6";
-  sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy";
+  version = "0.3.4.7";
+  sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix
index db53712d4ef..bff520fab83 100644
--- a/pkgs/development/libraries/haskell/monad-parallel/default.nix
+++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, parallel, transformers }:
+{ cabal, parallel, transformers, transformersCompat }:
 
 cabal.mkDerivation (self: {
   pname = "monad-parallel";
-  version = "0.7.1.2";
-  sha256 = "0ybifm54dwaz5jqccw7hwlykjw4bcnl924808bi01j5i7ggyz5wj";
-  buildDepends = [ parallel transformers ];
+  version = "0.7.1.3";
+  sha256 = "150ich9fzpmwdvvhsd7ri97nm8zsqn86gr3bh0aqb0wgrg4hbmkx";
+  buildDepends = [ parallel transformers transformersCompat ];
   meta = {
     homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
     description = "Parallel execution of monadic computations";
diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix
index dc6c90bcd97..e8c598d3a30 100644
--- a/pkgs/development/libraries/haskell/monad-supply/default.nix
+++ b/pkgs/development/libraries/haskell/monad-supply/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-supply";
-  version = "0.4";
-  sha256 = "0qvv9j55hw1lrfqnz1aric4mvg62c2vqaf5wirn69gvh74slqyj8";
+  version = "0.6";
+  sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir";
   buildDepends = [ mtl ];
   meta = {
     description = "Stateful supply monad";
diff --git a/pkgs/development/libraries/haskell/monadIO/default.nix b/pkgs/development/libraries/haskell/monadIO/default.nix
new file mode 100644
index 00000000000..ec3efa33ae8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monadIO/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "monadIO";
+  version = "0.10.1.4";
+  sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
+  buildDepends = [ mtl stm ];
+  meta = {
+    description = "Overloading of concurrency variables";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix
index 13a8dfa3677..9ff5d5079ce 100644
--- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix
+++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix
@@ -4,14 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "monadloc-pp";
-  version = "0.3";
-  sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn";
+  version = "0.3.1";
+  sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts monadloc syb ];
   jailbreak = true;
   meta = {
-    homepage = "http://github.com/pepeiborra/monadloc";
+    homepage = "http://github.com/pepeiborra/monadloc-pp";
     description = "A preprocessor for generating monadic call traces";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index dfc34cc2a6a..91d160fc345 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.6.1";
-  sha256 = "066yfffjkd0r6hg3y3zrs13jmyfgpl8ba9yvsbyawimvff7mfk5f";
+  version = "0.6.3";
+  sha256 = "026qii2i6l8lsvhvb9l8gkzybrvf87skg6mjam2bxc3i1bjx1lkr";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index 3c0a742a1f3..f7ae10ce08d 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.3.3.4";
-  sha256 = "0jbly9zxnsm15a5d3xg7i6w1mpqi4irdc76996xm5slg8bh0cji6";
+  version = "0.3.3.5";
+  sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280";
   buildDepends = [ groups semigroupoids semigroups ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/mtl-prelude/default.nix b/pkgs/development/libraries/haskell/mtl-prelude/default.nix
new file mode 100644
index 00000000000..3bf2395cb3a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtl-prelude/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mtl-prelude";
+  version = "1.0.1";
+  sha256 = "09zdsgh4y4b5chl847n1dz4vys2sdyxmf0v39ad449s5rv5l92hj";
+  buildDepends = [ mtl transformers ];
+  meta = {
+    homepage = "https://github.com/nikita-volkov/mtl-prelude";
+    description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
deleted file mode 100644
index 3cc240114df..00000000000
--- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "1.1.0.2";
-  sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36";
-  meta = {
-    description = "Monad transformer library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
deleted file mode 100644
index e528736d95a..00000000000
--- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "2.0.1.0";
-  sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk";
-  buildDepends = [ transformers ];
-  meta = {
-    description = "Monad classes, using functional dependencies";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
index d72f8bc79d6..372c8706cc9 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mtl";
-  version = "2.1.2";
-  sha256 = "1vwb98ci3jnjpndym012amia41h3cjdwpy9330ws881l6dj5fxwc";
+  version = "2.1.3.1";
+  sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/mtl";
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 4c6ffcdaff6..f9912a6d013 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.26.0.0";
-  sha256 = "0fjzjr66yan62911kfndnr7xmy3waidh4cqazabk6yr1cznpsx8m";
+  version = "0.28.0.0";
+  sha256 = "1qy2xlxqhxlj9f5g7wf90vwch3qs1yz733f87irdmak0v4vxdkd5";
   buildDepends = [ bifunctors utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix
index 242005392c2..82cad64df04 100644
--- a/pkgs/development/libraries/haskell/multipart/default.nix
+++ b/pkgs/development/libraries/haskell/multipart/default.nix
@@ -4,13 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "multipart";
-  version = "0.1.1";
-  sha256 = "12sxi21baq1wsa3z6qrczyk47finw85yiql26l90wxk99smm90pj";
+  version = "0.1.2";
+  sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
   buildDepends = [ parsec ];
   meta = {
     homepage = "http://www.github.com/silkapp/multipart";
-    description = "A partial fork of the cgi package exposing the multipart module";
+    description = "HTTP multipart split out of the cgi package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mvc-updates/default.nix b/pkgs/development/libraries/haskell/mvc-updates/default.nix
new file mode 100644
index 00000000000..ef6d465fd81
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mvc-updates/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, foldl, mvc }:
+
+cabal.mkDerivation (self: {
+  pname = "mvc-updates";
+  version = "1.2.0";
+  sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
+  buildDepends = [ async foldl mvc ];
+  meta = {
+    description = "Concurrent and combinable updates";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mvc/default.nix b/pkgs/development/libraries/haskell/mvc/default.nix
new file mode 100644
index 00000000000..0068beb9bc3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mvc/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, contravariant, managed, mmorph, pipes
+, pipesConcurrency, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "mvc";
+  version = "1.0.3";
+  sha256 = "1b1342qxyn2jxb3a5c9bp6ai7iwhbjxgfpbh2kjm7v75444lx78g";
+  buildDepends = [
+    async contravariant managed mmorph pipes pipesConcurrency
+    transformers
+  ];
+  meta = {
+    description = "Model-view-controller";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index d64c74c68a8..5e015ecbe96 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mwc-random";
-  version = "0.13.2.0";
-  sha256 = "07nbbn9ainzsqg2hlw6l9vsfqylfcqs1apgvpnhdgids2gvmrkaa";
+  version = "0.13.2.2";
+  sha256 = "1rsrvadaih66xn8zr8kfvrr65g7wpj6i9jnzkmlik9lqrvz4axcp";
   buildDepends = [ primitive time vector ];
   testDepends = [
     HUnit QuickCheck statistics testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix
index a9801f6415f..5422443d2fe 100644
--- a/pkgs/development/libraries/haskell/mysql/default.nix
+++ b/pkgs/development/libraries/haskell/mysql/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mysql";
-  version = "0.1.1.6";
-  sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj";
+  version = "0.1.1.7";
+  sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0";
   buildTools = [ mysqlConfig ];
   extraLibraries = [ zlib ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
index e870d171383..3c4130eddc4 100644
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ b/pkgs/development/libraries/haskell/nats/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "nats";
-  version = "0.2";
-  sha256 = "05skqs5ahbrnwlsxjihkvmsw0n49k9mqdhrv9nqh4dmd1j622r73";
+  version = "1";
+  sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0";
   buildDepends = [ hashable ];
   meta = {
     homepage = "http://github.com/ekmett/nats/";
diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
index 7e9ac0ddd95..3a5cd89b926 100644
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ncurses";
-  version = "0.2.10";
-  sha256 = "0qdw5dwi1w42nygvzyq8la7i917f0fz9qjw6ivgl2h1rjxc5j9cb";
+  version = "0.2.11";
+  sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk";
   buildDepends = [ text transformers ];
   buildTools = [ c2hs ];
   extraLibraries = [ ncurses ];
diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix
index 7321c3e88e8..f60af56b62f 100644
--- a/pkgs/development/libraries/haskell/netwire/default.nix
+++ b/pkgs/development/libraries/haskell/netwire/default.nix
@@ -1,20 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, deepseq, parallel, random, semigroups, time, transformers
+{ cabal, deepseq, parallel, profunctors, random, semigroups, time
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "netwire";
-  version = "5.0.0";
-  sha256 = "1wxrckc8i86xiiyk8msa6qrhfjx4h34ry1nxh9rdcd5cy03kalks";
+  version = "5.0.1";
+  sha256 = "1izl4iarcc6z2j0d6gkcygpp63asajikn1p44p8ixwzx96xx578r";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    deepseq parallel random semigroups time transformers
+    deepseq parallel profunctors random semigroups time transformers
   ];
   meta = {
+    homepage = "http://hub.darcs.net/ertes/netwire";
     description = "Functional reactive programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix
index c12737a2edf..82d6c47844d 100644
--- a/pkgs/development/libraries/haskell/network-carbon/default.nix
+++ b/pkgs/development/libraries/haskell/network-carbon/default.nix
@@ -4,9 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "network-carbon";
-  version = "1.0.1";
-  sha256 = "1q3b7vw80yw6fkmpwgazy8ikhbwjmmqmm4fry8c9f8ckkpzahj2b";
+  version = "1.0.2";
+  sha256 = "0r9riydwvmn8v9iih475agl4idb3z6v3djmn3pjlda28g3p0zw9h";
   buildDepends = [ network text time vector ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ocharles/network-carbon";
     description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 45d912da07a..5b023f91b66 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.1.0";
-  sha256 = "1q9wx7bvr4a65rkyfn2vd3h9bfpsvm9zcqqjhjsrgb91l6x5bdqi";
+  version = "1.1.0.2";
+  sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax";
   buildDepends = [
     conduit conduitExtra connection cprngAes dataDefault monadControl
     network streamingCommons systemFileio systemFilepath tls
diff --git a/pkgs/development/libraries/haskell/network-data/default.nix b/pkgs/development/libraries/haskell/network-data/default.nix
new file mode 100644
index 00000000000..d6c94c97a32
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-data/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cereal, prettyclass }:
+
+cabal.mkDerivation (self: {
+  pname = "network-data";
+  version = "0.5.2";
+  sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s";
+  buildDepends = [ cereal prettyclass ];
+  meta = {
+    description = "Library for network data structures and their serialization";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix
index 8e0cf757834..92e6e9e34c7 100644
--- a/pkgs/development/libraries/haskell/network-fancy/default.nix
+++ b/pkgs/development/libraries/haskell/network-fancy/default.nix
@@ -1,14 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal }:
 
 cabal.mkDerivation (self: {
   pname = "network-fancy";
-  version = "0.1.5.2";
-  sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c";
+  version = "0.2.2";
+  sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j";
   meta = {
     homepage = "http://github.com/taruti/network-fancy";
     description = "Networking support with a cleaner API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  preConfigure = ''substituteInPlace Setup.hs --replace '-> rt' '-> return ()' '';
 })
diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix
index 41077efed0b..ba7b0a01f5f 100644
--- a/pkgs/development/libraries/haskell/network-simple/default.nix
+++ b/pkgs/development/libraries/haskell/network-simple/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-simple";
-  version = "0.4.0.1";
-  sha256 = "113vaxgsfny9iv6hnbywk97qr1y6qkap49p803anakamss4bdmyj";
+  version = "0.4.0.2";
+  sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf";
   buildDepends = [ exceptions network transformers ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
index b4a70eb6843..cd467f5d2ab 100644
--- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
@@ -6,19 +6,16 @@
 
 cabal.mkDerivation (self: {
   pname = "network-transport-tcp";
-  version = "0.4.0";
-  sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v";
+  version = "0.4.1";
+  sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf";
   buildDepends = [ dataAccessor network networkTransport ];
   testDepends = [ network networkTransport networkTransportTests ];
   doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal
-  '';
   meta = {
     homepage = "http://haskell-distributed.github.com";
     description = "TCP instantiation of Network.Transport";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
index 2dc5036899b..5ee1edec2e9 100644
--- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
@@ -4,15 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "network-transport-tests";
-  version = "0.1.0.1";
-  sha256 = "15vdkjq10mm378iyci1lpj6b77m7sil5mk3yhzf6vcbfj54pwca6";
+  version = "0.2.1.0";
+  sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64";
   buildDepends = [ ansiTerminal mtl networkTransport random ];
+  jailbreak = true;
   meta = {
-    homepage = "http://github.com/haskell-distributed/distributed-process";
+    homepage = "http://haskell-distributed.github.com";
     description = "Unit tests for Network.Transport implementations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix
index c59a3fbb235..410e6076f29 100644
--- a/pkgs/development/libraries/haskell/network-transport/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-transport";
-  version = "0.4.0.0";
-  sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz";
+  version = "0.4.1.0";
+  sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93";
   buildDepends = [ binary hashable transformers ];
   meta = {
     homepage = "http://haskell-distributed.github.com";
diff --git a/pkgs/development/libraries/haskell/network-uri/default.nix b/pkgs/development/libraries/haskell/network-uri/default.nix
index e6259b09c24..6cfd4dca161 100644
--- a/pkgs/development/libraries/haskell/network-uri/default.nix
+++ b/pkgs/development/libraries/haskell/network-uri/default.nix
@@ -6,13 +6,14 @@
 
 cabal.mkDerivation (self: {
   pname = "network-uri";
-  version = "2.6.0.0";
-  sha256 = "0dnprscb5nxidg56i7j6q783nwsrn3dabfsij3vjlvjn4f0sg11l";
+  version = "2.6.0.1";
+  sha256 = "09ymamb128jgqghpda4nixncr73all8qc6q53976aricm6a27p37";
   buildDepends = [ parsec ];
   testDepends = [
     HUnit network testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/network-uri";
     description = "URI manipulation";
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
deleted file mode 100644
index 481ad16a2a3..00000000000
--- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.2.1.4";
-  sha256 = "16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25";
-  buildDepends = [ parsec ];
-  meta = {
-    description = "Networking-related facilities";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
deleted file mode 100644
index 3cf17949380..00000000000
--- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.2";
-  sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix
deleted file mode 100644
index f10d8c0dbcc..00000000000
--- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, parsec }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.0.5";
-  sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0";
-  buildDepends = [ parsec ];
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix
deleted file mode 100644
index 02185e86041..00000000000
--- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.3.1.0";
-  sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l";
-  buildDepends = [ parsec ];
-  testDepends = [ HUnit testFramework testFrameworkHunit ];
-  meta = {
-    homepage = "http://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
deleted file mode 100644
index 2ec39f7d457..00000000000
--- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, HUnit, parsec, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "network";
-  version = "2.4.1.2";
-  sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh";
-  buildDepends = [ parsec ];
-  testDepends = [
-    HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  meta = {
-    homepage = "https://github.com/haskell/network";
-    description = "Low-level networking interface";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/network/2.6.0.1.nix b/pkgs/development/libraries/haskell/network/2.6.0.2.nix
index d5d302fbd8e..37540ad323e 100644
--- a/pkgs/development/libraries/haskell/network/2.6.0.1.nix
+++ b/pkgs/development/libraries/haskell/network/2.6.0.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.6.0.1";
-  sha256 = "0qfffsdbvrf9gs8wr9ps7iv5h6drz4vb2ja9rprmc7ypswsacxsq";
+  version = "2.6.0.2";
+  sha256 = "12b7saam5ga6l4cplgkad49xa4vkynz2ri9jxidx1cxiqjcl0vc4";
   testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {
     homepage = "https://github.com/haskell/network";
diff --git a/pkgs/development/libraries/haskell/non-empty/default.nix b/pkgs/development/libraries/haskell/non-empty/default.nix
new file mode 100644
index 00000000000..7fba365097b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/non-empty/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, QuickCheck, utilityHt }:
+
+cabal.mkDerivation (self: {
+  pname = "non-empty";
+  version = "0.2";
+  sha256 = "1wapx5q8spvlq8g7nagj2lwhrqzg90dw4n0qvd1ap47n0rh3iymm";
+  buildDepends = [ QuickCheck utilityHt ];
+  meta = {
+    homepage = "http://code.haskell.org/~thielema/non-empty/";
+    description = "List-like structures with static restrictions on the number of elements";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index 35840ba1716..003629d7852 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     deepseq nonNegative parsec QuickCheck random storableRecord
     utilityHt
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
     description = "An experimental alternative hierarchy of numeric type classes";
diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix
new file mode 100644
index 00000000000..4051efb42f7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/objective/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cleanUnions, elevator, minioperational, profunctors
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "objective";
+  version = "0.6.1";
+  sha256 = "1rnlh16r9kcrxffih6z8rprds9nxhlqksqba9wdgdkkwhrhq0ah6";
+  buildDepends = [
+    cleanUnions elevator minioperational profunctors transformers
+  ];
+  meta = {
+    homepage = "https://github.com/fumieval/objective";
+    description = "Extensible objects";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index b58df3be314..b1b9bd5820f 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -1,20 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }:
+{ cabal, HTTP, HUnit, network, networkUri, testFramework
+, testFrameworkHunit
+}:
 
 cabal.mkDerivation (self: {
   pname = "oeis";
-  version = "0.3.5";
-  sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6";
-  buildDepends = [ HTTP network ];
+  version = "0.3.6";
+  sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0";
+  buildDepends = [ HTTP network networkUri ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
-  patchPhase = ''
-    sed -i -e 's|network *==.*|network|' oeis.cabal
-  '';
   meta = {
     description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ofx/default.nix b/pkgs/development/libraries/haskell/ofx/default.nix
new file mode 100644
index 00000000000..d7fd805f5e8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ofx/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, parsec, time }:
+
+cabal.mkDerivation (self: {
+  pname = "ofx";
+  version = "0.4.0.2";
+  sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg";
+  buildDepends = [ parsec time ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://www.github.com/massysett/ofx";
+    description = "Parser for OFX data";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/oo-prototypes/default.nix b/pkgs/development/libraries/haskell/oo-prototypes/default.nix
new file mode 100644
index 00000000000..b9f011d3aa1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/oo-prototypes/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "oo-prototypes";
+  version = "0.1.0.0";
+  sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
+  meta = {
+    homepage = "https://github.com/yi-editor/oo-prototypes";
+    description = "Support for OO-like prototypes";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix
new file mode 100644
index 00000000000..918bef94fba
--- /dev/null
+++ b/pkgs/development/libraries/haskell/opaleye/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, contravariant, postgresqlSimple, productProfunctors
+, profunctors, semigroups, text, time, transformers, uuid
+}:
+
+cabal.mkDerivation (self: {
+  pname = "opaleye";
+  version = "0.3";
+  sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx";
+  buildDepends = [
+    contravariant postgresqlSimple productProfunctors profunctors
+    semigroups text time transformers uuid
+  ];
+  testDepends = [
+    postgresqlSimple productProfunctors profunctors time
+  ];
+  jailbreak = true;
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+    description = "An SQL-generating DSL targeting PostgreSQL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
index 28609f9e0f6..5ae373fbac2 100644
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "openssl-streams";
-  version = "1.1.0.2";
-  sha256 = "0h3jxxdls0p1xxr02rfag7j9y13ll3xgzx2ldv1nsfcv3rzw2pfy";
+  version = "1.2.0.0";
+  sha256 = "01hdrsdrp2x7i5zydn2b0blzir7vqvn63n9sf9pwcgnkk6s5j1wc";
   buildDepends = [ HsOpenSSL ioStreams network ];
   testDepends = [
     HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
index 82bc0fa8a9e..ea2dc95e364 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/0.10.0.nix
@@ -1,24 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ansiWlPprint, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-, testFrameworkThPrime, transformers, transformersCompat
-}:
+{ cabal, ansiWlPprint, transformers, transformersCompat }:
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.9.1.1";
-  sha256 = "1fy8839y9dg2a5pj7abjiqkm3qcz8faip32q3x1zi5mrz4v3q2g6";
+  version = "0.10.0";
+  sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
   buildDepends = [ ansiWlPprint transformers transformersCompat ];
-  testDepends = [
-    HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 testFrameworkThPrime
-  ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/pcapriotti/optparse-applicative";
     description = "Utilities and combinators for parsing command line options";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
new file mode 100644
index 00000000000..bef76ab73ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, ansiWlPprint, transformers, transformersCompat }:
+
+cabal.mkDerivation (self: {
+  pname = "optparse-applicative";
+  version = "0.11.0.1";
+  sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9";
+  buildDepends = [ ansiWlPprint transformers transformersCompat ];
+  jailbreak = true;
+  meta = {
+    homepage = "https://github.com/pcapriotti/optparse-applicative";
+    description = "Utilities and combinators for parsing command line options";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index e567bd82059..feb273fbdeb 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -1,20 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat
+{ cabal, aeson, aesonPretty, attoparsec, dataDefault, filepath
 , hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb
-, tagsoup, temporary, text, time, vector, yaml
+, tagsoup, temporary, text, time, vector, xmlConduit, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.4.0.1";
-  sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx";
+  version = "0.6";
+  sha256 = "1whi8mrbhfi8wr3qbj1lkgc1pngn8151jjri409hshl1mng4aq5b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc
-    pandocTypes parsec rfc5051 split syb tagsoup temporary text time
-    vector yaml
+    aeson aesonPretty attoparsec dataDefault filepath hsBibutils mtl
+    pandoc pandocTypes parsec rfc5051 split syb tagsoup temporary text
+    time vector xmlConduit yaml
   ];
   testDepends = [
     aeson filepath pandoc pandocTypes temporary text yaml
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 1b2571563c3..3788c1f3bf8 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -4,32 +4,35 @@
 , blazeHtml, blazeMarkup, dataDefault, deepseqGenerics, Diff
 , executablePath, extensibleExceptions, filepath, haddockLibrary
 , happy, highlightingKate, hslua, HTTP, httpClient, httpClientTls
-, httpTypes, HUnit, JuicyPixels, mtl, network, pandocTypes, parsec
-, QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, texmath, text, time, unorderedContainers, vector, wai, waiExtra
-, xml, yaml, zipArchive, zlib
+, httpTypes, HUnit, JuicyPixels, mtl, network, networkUri
+, pandocTypes, parsec, QuickCheck, random, scientific, SHA, syb
+, tagsoup, temporary, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, texmath, text, time
+, unorderedContainers, vector, xml, yaml, zipArchive, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.13.0.1";
-  sha256 = "0pjyxsr93gv0vrdxlr5i0c56mg6rf21qxf1141cb8l0hl0b416d6";
+  version = "1.13.1";
+  sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv";
+  editedCabalFile = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson alex base64Bytestring binary blazeHtml blazeMarkup
     dataDefault deepseqGenerics extensibleExceptions filepath
     haddockLibrary happy highlightingKate hslua HTTP httpClient
-    httpClientTls httpTypes JuicyPixels mtl network pandocTypes parsec
-    random scientific SHA syb tagsoup temporary texmath text time
-    unorderedContainers vector wai waiExtra xml yaml zipArchive zlib
+    httpClientTls httpTypes JuicyPixels mtl network networkUri
+    pandocTypes parsec random scientific SHA syb tagsoup temporary
+    texmath text time unorderedContainers vector xml yaml zipArchive
+    zlib
   ];
   testDepends = [
     ansiTerminal Diff executablePath filepath highlightingKate HUnit
     pandocTypes QuickCheck syb testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text zipArchive
   ];
+  configureFlags = "-fhttps -fmake-pandoc-man-pages";
   jailbreak = true;
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index 907a9a2e032..d79b931132d 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pango";
-  version = "0.13.0.0";
-  sha256 = "0qrsivr6z8pp4ibg1vyzyg2fw0jzrshn6h6g6vff93awxzqq9rlw";
+  version = "0.13.0.4";
+  sha256 = "1fglwywac36abpjjpgdsk62f4sndgr5nf29fmana0yac7hxsm1sq";
   buildDepends = [ cairo glib mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
index b9f6eda669e..2bf50add862 100644
--- a/pkgs/development/libraries/haskell/parallel-io/default.nix
+++ b/pkgs/development/libraries/haskell/parallel-io/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ extensibleExceptions random ];
+  jailbreak = true;
   meta = {
     homepage = "http://batterseapower.github.com/parallel-io";
     description = "Combinators for executing IO actions in parallel on a thread pool";
diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
deleted file mode 100644
index 99575921cc6..00000000000
--- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "1.1.0.1";
-  sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f";
-  meta = {
-    description = "parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
deleted file mode 100644
index 52a5d3c3c33..00000000000
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "2.2.0.1";
-  sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
deleted file mode 100644
index 095603717b7..00000000000
--- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "3.1.0.1";
-  sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
deleted file mode 100644
index f881e2f83c7..00000000000
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "parallel";
-  version = "3.2.0.2";
-  sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Parallel programming library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
index e1d1b24286d..987ee8c5bdc 100644
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parallel";
-  version = "3.2.0.4";
-  sha256 = "0v8l2rbczjadynbz4q4r00k8a1mqj70y63zbklpxckafq1zn7nwc";
+  version = "3.2.0.5";
+  sha256 = "16hhsi8pr29qqg9ssks0y9j0vmnvpyy1qk46s0c0vgj3pyzl38mm";
   buildDepends = [ deepseq ];
   meta = {
     description = "Parallel programming library";
diff --git a/pkgs/development/libraries/haskell/parsec-extra/default.nix b/pkgs/development/libraries/haskell/parsec-extra/default.nix
new file mode 100644
index 00000000000..b3dfb2e0a15
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsec-extra/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, monadsTf, parsec, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "parsec-extra";
+  version = "0.1.0.5";
+  sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4";
+  buildDepends = [ monadsTf parsec transformers ];
+  meta = {
+    description = "Some miscellaneous basic string parsers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
deleted file mode 100644
index 458a2bd2977..00000000000
--- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec";
-  version = "2.1.0.1";
-  sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df";
-  meta = {
-    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
-    description = "Monadic parser combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
deleted file mode 100644
index e997acd4b49..00000000000
--- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec";
-  version = "3.1.1";
-  sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
-    description = "Monadic parser combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
deleted file mode 100644
index dd55106fa0d..00000000000
--- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec";
-  version = "3.1.2";
-  sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch";
-  buildDepends = [ mtl text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
-    description = "Monadic parser combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.5.nix b/pkgs/development/libraries/haskell/parsec/3.1.5.nix
deleted file mode 100644
index b6a5d37e531..00000000000
--- a/pkgs/development/libraries/haskell/parsec/3.1.5.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, text }:
-
-cabal.mkDerivation (self: {
-  pname = "parsec";
-  version = "3.1.5";
-  sha256 = "1f1wg4qxp1ss2160sa3vbqff18fabwhqjkyfj4sgyfmwf9fj8wn5";
-  buildDepends = [ mtl text ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
-    description = "Monadic parser combinators";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/default.nix
index 3e81947cfed..f2258da9968 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix
+++ b/pkgs/development/libraries/haskell/parsec/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, mtl, text }:
+{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }:
 
 cabal.mkDerivation (self: {
   pname = "parsec";
-  version = "3.1.3";
-  sha256 = "1a64gzirgpa1i78gbbp9z059nh29xmcja4g8vgjb1fbylx6vn54z";
+  version = "3.1.7";
+  sha256 = "12h7n367gaw9ifd19yd3ppi4j6kghf7rryacl0ips0fwlxw1x8wa";
   buildDepends = [ mtl text ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
   jailbreak = true;
   meta = {
     homepage = "http://www.cs.uu.nl/~daan/parsec.html";
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix
new file mode 100644
index 00000000000..45bb96561c3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsek/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "parsek";
+  version = "1.0.1.2";
+  sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd";
+  meta = {
+    description = "Parallel Parsing Processes";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/default.nix
index 5c49d144a10..25f4a137083 100644
--- a/pkgs/development/libraries/haskell/parsers/default.nix
+++ b/pkgs/development/libraries/haskell/parsers/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parsers";
-  version = "0.12.1";
-  sha256 = "0g9grf713zhn23vgmb6mdrm8r5snq1xa8jqnj6pghydj6m4rh97v";
+  version = "0.12.1.1";
+  sha256 = "1yx75xbmg3lms0hj79r5w9fl81g5cbsm842lijhd9jnnbli2mzfw";
   buildDepends = [
     attoparsec charset parsec text transformers unorderedContainers
   ];
diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
index f7480295f6d..db35b2fe020 100644
--- a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pcap-enumerator";
-  version = "0.4";
-  sha256 = "0ka2n7740s02marvd1b11mrxc663kj0zcn7hksl5i13ls026hpb8";
+  version = "0.5";
+  sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb";
   buildDepends = [ enumerator pcap transformers ];
   meta = {
     homepage = "http://github.com/cutsea110/pcap-enumerator";
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
new file mode 100644
index 00000000000..5ca5ab95622
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, attoparsec, base16Bytestring, ioStreams, pdfToolboxCore
+, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pdf-toolbox-content";
+  version = "0.0.3.1";
+  sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz";
+  buildDepends = [
+    attoparsec base16Bytestring ioStreams pdfToolboxCore text
+  ];
+  meta = {
+    homepage = "https://github.com/Yuras/pdf-toolbox";
+    description = "A collection of tools for processing PDF files";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
new file mode 100644
index 00000000000..bc7b179a0da
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, attoparsec, errors, ioStreams, scientific, transformers
+, zlibBindings
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pdf-toolbox-core";
+  version = "0.0.3.0";
+  sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6";
+  buildDepends = [
+    attoparsec errors ioStreams scientific transformers zlibBindings
+  ];
+  meta = {
+    homepage = "https://github.com/Yuras/pdf-toolbox";
+    description = "A collection of tools for processing PDF files";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
new file mode 100644
index 00000000000..77615ed8665
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cipherRc4, cryptohash, ioStreams, pdfToolboxContent
+, pdfToolboxCore, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pdf-toolbox-document";
+  version = "0.0.4.0";
+  sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa";
+  buildDepends = [
+    cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore
+    text transformers
+  ];
+  meta = {
+    homepage = "https://github.com/Yuras/pdf-toolbox";
+    description = "A collection of tools for processing PDF files";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
index beb2ca94263..db4b89990b2 100644
--- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, blazeBuilder, conduit, monadControl, mysql
-, mysqlSimple, persistent, resourcet, text, transformers
+{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger
+, mysql, mysqlSimple, persistent, resourcet, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-mysql";
-  version = "1.3.0.2";
-  sha256 = "0yv2f8zqypbp5swdpxmgnfmmfsr6lwhb27k0hl9bh7ya76anhvqy";
+  version = "2.1.2";
+  sha256 = "06i2wcrqvk216bq3853acqi6wgrdzkz3wzah231gv3yz348lr6sv";
   buildDepends = [
-    aeson blazeBuilder conduit monadControl mysql mysqlSimple
-    persistent resourcet text transformers
+    aeson blazeBuilder conduit monadControl monadLogger mysql
+    mysqlSimple persistent resourcet text transformers
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 207183db846..1ccdeca9277 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -1,17 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, blazeBuilder, conduit, monadControl, persistent
-, postgresqlLibpq, postgresqlSimple, resourcet, text, time
-, transformers
+{ cabal, aeson, blazeBuilder, conduit, monadControl, monadLogger
+, persistent, postgresqlLibpq, postgresqlSimple, resourcet, text
+, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.1.1";
-  sha256 = "1qi19fm7waxrbh795jvcny7aaj6b64jqcwv772xjzl9dbv3q9qhc";
+  version = "2.1.1";
+  sha256 = "0mfvzd62qn7ffx6nrgkr52qzl3prjq8xkahvb6j5akb6azdmzg80";
   buildDepends = [
-    aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
-    postgresqlSimple resourcet text time transformers
+    aeson blazeBuilder conduit monadControl monadLogger persistent
+    postgresqlLibpq postgresqlSimple resourcet text time transformers
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 288e91ab78d..34a427ddb07 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-sqlite";
-  version = "1.3.0.5";
-  sha256 = "05b7byc4z7mhni90cj2aan63f599wv0511zqbsm6kbylk1zpyizb";
+  version = "2.1.1";
+  sha256 = "1hypaixwp6q10gfwbg0xfqfw7vz9j56max5i0k1mklan6js7wy9w";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 4b3c97c1a9c..1c8f502ba7b 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -1,16 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, hspec, monadControl, monadLogger, persistent
-, QuickCheck, text, transformers, unorderedContainers
+{ cabal, aeson, hspec, monadControl, monadLogger, pathPieces
+, persistent, QuickCheck, tagged, text, transformers
+, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.2.2";
-  sha256 = "0vcj0y2i423cz1iry5gsz5cvqynpnbhzl6basqcqn6k8ca7s876i";
+  version = "2.1";
+  sha256 = "0rj3yqm38kg7lvj9hi4c5yaypvxj6pwb47b0kg8h2hsa0rshhrdy";
   buildDepends = [
-    aeson monadControl monadLogger persistent text transformers
-    unorderedContainers
+    aeson monadControl monadLogger pathPieces persistent tagged text
+    transformers unorderedContainers
   ];
   testDepends = [
     aeson hspec persistent QuickCheck text transformers
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index a5add651473..9775f510d42 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,21 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, base64Bytestring, blazeHtml
-, blazeMarkup, conduit, exceptions, hspec, liftedBase, monadControl
-, monadLogger, pathPieces, resourcePool, resourcet, scientific
-, silently, sqlite, text, time, transformers, transformersBase
-, unorderedContainers, vector
+, blazeMarkup, conduit, exceptions, fastLogger, hspec, liftedBase
+, monadControl, monadLogger, mtl, pathPieces, resourcePool
+, resourcet, scientific, silently, sqlite, tagged, text, time
+, transformers, transformersBase, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.3";
-  sha256 = "1pz3xdbk46qprcyb0sll5zzr2vp6x08w7pd5glz2jf2242k7cdrd";
+  version = "2.1.1.4";
+  sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
-    exceptions liftedBase monadControl monadLogger pathPieces
-    resourcePool resourcet scientific silently text time transformers
-    transformersBase unorderedContainers vector
+    exceptions fastLogger liftedBase monadControl monadLogger mtl
+    pathPieces resourcePool resourcet scientific silently tagged text
+    time transformers transformersBase unorderedContainers vector
   ];
   testDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit hspec
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 51eba83bb82..d9d5caf4d29 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.5.1";
-  sha256 = "0qvsvbcn211xp4c669cpljmnsqn9zk1rn94ya1dbq77l970s8xah";
+  version = "0.5.1.1";
+  sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
     attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
index 94f899c6a8d..ea9fe83eab7 100644
--- a/pkgs/development/libraries/haskell/pipes-binary/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-binary";
-  version = "0.4.0.2";
-  sha256 = "1lbz2hybglkmm7dawg16pma2yr732yy1agh5b9vwlw2ik92hrm58";
+  version = "0.4.0.3";
+  sha256 = "0r56h5f9i6hy4zb2bhfi26y7y3z0j4nacdb2dgkxmh5mqjd33f0q";
   buildDepends = [
     binary pipes pipesBytestring pipesParse transformers
   ];
diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix
index c18d2297f67..e26526fb046 100644
--- a/pkgs/development/libraries/haskell/pipes-csv/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-csv/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Fast, streaming csv parser";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix
index 285d1405191..5f432bc9dd9 100644
--- a/pkgs/development/libraries/haskell/pipes-http/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-http/default.nix
@@ -4,12 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-http";
-  version = "1.0.1";
-  sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w";
+  version = "1.0.2";
+  sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk";
   buildDepends = [ httpClient httpClientTls pipes ];
+  jailbreak = true;
   meta = {
     description = "HTTP client with pipes interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-shell/default.nix b/pkgs/development/libraries/haskell/pipes-shell/default.nix
new file mode 100644
index 00000000000..f7f5e20bcf4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-shell/default.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, hspec, pipes, pipesBytestring, pipesSafe, stm
+, stmChans, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-shell";
+  version = "0.1.3";
+  sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
+  buildDepends = [
+    async pipes pipesBytestring pipesSafe stm stmChans text
+  ];
+  testDepends = [
+    async hspec pipes pipesBytestring pipesSafe stm stmChans text
+  ];
+  jailbreak = true;
+  doCheck = false;
+  meta = {
+    description = "Create proper Pipes from System.Process";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix
index deef6e0fdb6..177eb6e7d35 100644
--- a/pkgs/development/libraries/haskell/pipes-text/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-text/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-text";
-  version = "0.0.0.12";
-  sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m";
+  version = "0.0.0.15";
+  sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9";
   buildDepends = [
     pipes pipesBytestring pipesGroup pipesParse pipesSafe
     streamingCommons text transformers
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "Text pipes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
index 9a4ed04892b..bbb555681e0 100644
--- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-zlib";
-  version = "0.4.0.1";
-  sha256 = "1k91q5hci4hk2kzaqfvg1nwbklqyg83wwhm3sdfhdn2famj0mls0";
+  version = "0.4.3";
+  sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc";
   buildDepends = [ pipes transformers zlib zlibBindings ];
   meta = {
     homepage = "https://github.com/k0001/pipes-zlib";
-    description = "Zlib compression and decompression for Pipes streams";
+    description = "Zlib and GZip compression and decompression for Pipes streams";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
index 9f723826dbb..9703b14fc71 100644
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -6,12 +6,13 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes";
-  version = "4.1.2";
-  sha256 = "0prxk4qjdcmxjdvpi1bwql0s3l1kwlaz9sydr9swa8bc8ams3a11";
+  version = "4.1.4";
+  sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb";
   buildDepends = [ mmorph mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
   ];
+  jailbreak = true;
   meta = {
     description = "Compositional pipelines";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix
index f486737765e..82ee1a418c7 100644
--- a/pkgs/development/libraries/haskell/pointed/default.nix
+++ b/pkgs/development/libraries/haskell/pointed/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm
-, tagged, transformers
+, tagged, transformers, transformersCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "pointed";
-  version = "4.1";
-  sha256 = "1l40nl1sx16hbqz1kv70g6jp2igvvj93p5db8b6bsgjxx9ibck6g";
+  version = "4.1.1";
+  sha256 = "183ix3cax4qvph6grghpj5n4m7bd5xznqahjbgwz88gkf9rp2gbj";
   buildDepends = [
     comonad dataDefaultClass semigroupoids semigroups stm tagged
-    transformers
+    transformers transformersCompat
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
new file mode 100644
index 00000000000..e2bb34f895c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "polynomials-bernstein";
+  version = "1.1.1";
+  sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6";
+  buildDepends = [ vector ];
+  meta = {
+    description = "A solver for systems of polynomial equations in bernstein form";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
index c9e237b6506..2b4e881421c 100644
--- a/pkgs/development/libraries/haskell/polyparse/default.nix
+++ b/pkgs/development/libraries/haskell/polyparse/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "polyparse";
-  version = "1.9";
-  sha256 = "12khjhv1dvs4j1jyh3law7m1gmkad8s6q7clh7w6l5ll2n1dc4lz";
+  version = "1.10";
+  sha256 = "0nz7dv91a2f7gf4jnma8qcqa4n6qjcyggf8qdja46sdcabpd0ij2";
   buildDepends = [ text ];
   meta = {
     homepage = "http://code.haskell.org/~malcolm/polyparse/";
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index f8f748056c3..14098c980bb 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -14,5 +14,7 @@ cabal.mkDerivation (self: {
     description = "Resource pool allocations via ResourceT. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix
index 28e7e515c2b..0eb3c13f9bd 100644
--- a/pkgs/development/libraries/haskell/poppler/default.nix
+++ b/pkgs/development/libraries/haskell/poppler/default.nix
@@ -12,6 +12,10 @@ cabal.mkDerivation (self: {
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc ];
   pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ];
+  patchPhase = ''
+    sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
+    sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
+  '';
   meta = {
     homepage = "http://www.haskell.org/gtk2hs/";
     description = "Binding to the Poppler";
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 0c4fea2da65..d48e80e3014 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -1,17 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder
-, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq
-, scientific, text, time, transformers, uuid, vector
+, blazeTextual, caseInsensitive, cryptohash, hashable, HUnit
+, postgresqlLibpq, scientific, text, time, transformers, uuid
+, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.4.4.0";
-  sha256 = "1rx0rcafiicdv4qbf68dbsfqwiayrl7205dm0c5bdjlvszv576r7";
+  version = "0.4.8.0";
+  sha256 = "09mflczxjm7a8nixi4a989nq1ijhpikl4j9kqvzcpmfgb8sx38nm";
   buildDepends = [
-    aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
-    scientific text time transformers uuid vector
+    aeson attoparsec blazeBuilder blazeTextual caseInsensitive hashable
+    postgresqlLibpq scientific text time transformers uuid vector
   ];
   testDepends = [
     aeson base16Bytestring cryptohash HUnit text time vector
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
deleted file mode 100644
index 4bbd60e0ebe..00000000000
--- a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "preprocessor-tools";
-  version = "0.1.3";
-  sha256 = "0jz85v93zpv6cwvad18wr12nsikmv4n20gn37zli2h34zi543i9v";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    homepage = "http://www.ccs.neu.edu/~tov/pubs/haskell-session-types";
-    description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/default.nix
index 021becccfa1..021becccfa1 100644
--- a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/default.nix
diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix
index fed380b9bd0..a8efaf7554e 100644
--- a/pkgs/development/libraries/haskell/presburger/default.nix
+++ b/pkgs/development/libraries/haskell/presburger/default.nix
@@ -1,11 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal }:
+{ cabal, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "presburger";
-  version = "1.1";
-  sha256 = "0pb0rabhhzrrrsr8260lgjpp168pm8ldqwfqbc2i1wy95n7wxk7c";
+  version = "1.2";
+  sha256 = "1kx51ydpjg5dv762p85qh9w76qm038rw9pgfnd0az1vms97r1kpm";
+  testDepends = [ QuickCheck ];
   meta = {
     homepage = "http://github.com/yav/presburger";
     description = "A decision procedure for quantifier-free linear arithmetic";
diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix
new file mode 100644
index 00000000000..ee63eccf005
--- /dev/null
+++ b/pkgs/development/libraries/haskell/present/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoLisp, dataDefault, mtl, semigroups, text }:
+
+cabal.mkDerivation (self: {
+  pname = "present";
+  version = "2.2";
+  sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4";
+  buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ];
+  meta = {
+    description = "Make presentations for data types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
index 46d7fbbdcfb..4f6d728122c 100644
--- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Primitive memory-related operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
index d9bbd51c199..08b081d227c 100644
--- a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.5.4.0.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "primitive";
-  version = "0.5.2.1";
-  sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f";
+  version = "0.5.4.0";
+  sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10";
   meta = {
     homepage = "https://github.com/haskell/primitive";
     description = "Primitive memory-related operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix
new file mode 100644
index 00000000000..444baa76a1a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/product-profunctors/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, contravariant, profunctors }:
+
+cabal.mkDerivation (self: {
+  pname = "product-profunctors";
+  version = "0.6";
+  sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4";
+  buildDepends = [ contravariant profunctors ];
+  testDepends = [ profunctors ];
+  jailbreak = true;
+  meta = {
+    homepage = "https://github.com/tomjaguarpaw/product-profunctors";
+    description = "product-profunctors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
index 00d339fa44e..b1336cd59da 100644
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ b/pkgs/development/libraries/haskell/profunctors/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "4.2.0.1";
-  sha256 = "00cfria3zjijx9nm533a25x240c7q0sn9vna6m4y4rz1f7l2gnqc";
+  version = "4.3.2";
+  sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v";
   buildDepends = [
     comonad distributive semigroupoids tagged transformers
   ];
diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index 9aa8dff59aa..8cb7dfd32ae 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "project-template";
-  version = "0.1.4.1";
-  sha256 = "1vsx8a4kzdcwbdy47hb2wz32najsa6bqq6jkyal9nbc5ydwb65lb";
+  version = "0.1.4.2";
+  sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr";
   buildDepends = [
     base64Bytestring conduit conduitExtra mtl resourcet systemFileio
     systemFilepath text transformers
diff --git a/pkgs/development/libraries/haskell/protobuf/default.nix b/pkgs/development/libraries/haskell/protobuf/default.nix
index be437c7410d..3b0c1508ce0 100644
--- a/pkgs/development/libraries/haskell/protobuf/default.nix
+++ b/pkgs/development/libraries/haskell/protobuf/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "protobuf";
-  version = "0.2.0.3";
-  sha256 = "0jcrnym0j8w4vjrdmvn88x8ddp8wf809wviy1vkz94p2nyp6l2hw";
+  version = "0.2.0.4";
+  sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j";
   buildDepends = [
     cereal dataBinaryIeee754 deepseq mtl text unorderedContainers
   ];
diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
index 3b030735bbb..e7df6ac2075 100644
--- a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
+++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix
@@ -4,14 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "protocol-buffers-descriptor";
-  version = "2.0.14";
-  sha256 = "0xbpmm9a4fg42c9zbarawqdl4klfjjc233ilbsibb7asa3v7zmj3";
+  version = "2.0.17";
+  sha256 = "0jl041645d83iqqiw891d2k760jql6djvi2mmjh9lnmp48lwjy3p";
   buildDepends = [ protocolBuffers ];
   meta = {
     homepage = "http://code.haskell.org/protocol-buffers/";
     description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
index a2cb0efcf74..d3d81a14658 100644
--- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix
+++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix
@@ -1,18 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, binary, filepath, mtl, syb, utf8String }:
+{ cabal, binary, filepath, mtl, parsec, syb, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "protocol-buffers";
-  version = "2.0.14";
-  sha256 = "1wihnpvc7kjq345a6v702s42gmrqd9cjm50safc7kigyvhr5vm1i";
-  buildDepends = [ binary filepath mtl syb utf8String ];
+  version = "2.0.17";
+  sha256 = "12aky44ssgdj6vsjg0yvr8350cym7n6kn7gdaax0nxzpfxrjfy1v";
+  buildDepends = [ binary filepath mtl parsec syb utf8String ];
   meta = {
     homepage = "http://code.haskell.org/protocol-buffers/";
     description = "Parse Google Protocol Buffer specifications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
   };
 })
diff --git a/pkgs/development/libraries/haskell/psqueues/default.nix b/pkgs/development/libraries/haskell/psqueues/default.nix
new file mode 100644
index 00000000000..aea7f2f0950
--- /dev/null
+++ b/pkgs/development/libraries/haskell/psqueues/default.nix
@@ -0,0 +1,20 @@
+{ cabal, deepseq, hashable, HUnit, QuickCheck, tagged
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "psqueues";
+  version = "0.1.1.0";
+  sha256 = "1w6i6cl9wfblbg8d06lffh4l5y42li9a27myyvwnzfv86z49s9cb";
+  buildDepends = [ deepseq hashable ];
+  testDepends = [
+    deepseq hashable HUnit QuickCheck tagged testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    description = "Pure priority search queues";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/pure-cdb/default.nix b/pkgs/development/libraries/haskell/pure-cdb/default.nix
index 871825db121..b173a619cfd 100644
--- a/pkgs/development/libraries/haskell/pure-cdb/default.nix
+++ b/pkgs/development/libraries/haskell/pure-cdb/default.nix
@@ -4,11 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "pure-cdb";
-  version = "0.1";
-  sha256 = "0fxfhd73h5frnjpk617lspwf17wldsrd5a5cxar5y3a8wi0i4b8c";
+  version = "0.1.1";
+  sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n";
   buildDepends = [ binary mtl vector ];
   testDepends = [ mtl testSimple Unixutils vector ];
-  doCheck = false;
   meta = {
     homepage = "https://github.com/bosu/pure-cdb";
     description = "Another pure-haskell CDB (Constant Database) implementation";
diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index c5087a692f9..fd6fe516de7 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -1,27 +1,28 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec
-, patternArrows, time, transformers, unorderedContainers
-, utf8String, xdgBasedir
+{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs
+, optparseApplicative, parsec, patternArrows, time, transformers
+, unorderedContainers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.4.1";
-  sha256 = "1d2i2sspr1dbzjznk70flvnik0b2m226a3z0rkqwrjjbl92bhgwb";
+  version = "0.6.3";
+  sha256 = "0hd6aslsfw2jd06wyfzi1kr86vfj91ywvgl9rv9cyawzczk7l7v4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdtheline filepath haskeline monadUnify mtl parsec patternArrows
-    time transformers unorderedContainers utf8String xdgBasedir
+    fileEmbed filepath haskeline monadUnify mtl optparseApplicative
+    parsec patternArrows time transformers unorderedContainers
+    utf8String
+  ];
+  testDepends = [
+    filepath mtl nodejs parsec transformers utf8String
   ];
-  testDepends = [ filepath mtl parsec transformers utf8String ];
-  doCheck = false;
   meta = {
     homepage = "http://www.purescript.org/";
     description = "PureScript Programming Language Compiler";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index 08f18e8fe11..cca1e04bd4e 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -1,12 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, base64Bytestring, binary, cryptohash, random, SHA }:
+{ cabal, base64Bytestring, binary, byteable, cryptohash, random }:
 
 cabal.mkDerivation (self: {
   pname = "pwstore-fast";
-  version = "2.4.1";
-  sha256 = "1k98b1s2ld0jx8fy53k8d8pscp6n0plh51b2lj6ai6w8xj4vknw4";
-  buildDepends = [ base64Bytestring binary cryptohash random SHA ];
+  version = "2.4.4";
+  sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj";
+  buildDepends = [
+    base64Bytestring binary byteable cryptohash random
+  ];
   meta = {
     homepage = "https://github.com/PeterScott/pwstore";
     description = "Secure password storage";
diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 5aa1314f8e7..11bcb7aab6d 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-instances";
-  version = "0.3.8";
-  sha256 = "0132a37zi1haz1aaggxa1hr421bcmxlbaa4m2l53m2rmr4z5mgkg";
+  version = "0.3.9";
+  sha256 = "1a0mbd1kga4qnamp80x2g4avjwcy8z0zrriqxdhb1525wyyb0656";
   buildDepends = [
     hashable QuickCheck text time unorderedContainers
   ];
diff --git a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
new file mode 100644
index 00000000000..edc2924f09b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "quickcheck-unicode";
+  version = "1.0.0.0";
+  sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq";
+  buildDepends = [ QuickCheck ];
+  meta = {
+    homepage = "https://github.com/bos/quickcheck-unicode";
+    description = "Generator and shrink functions for testing Unicode-related software";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 4cdbed03762..73506a3ba75 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, erf, mathFunctions, monadLoops, mtl, randomShuffle
-, randomSource, rvar, syb, transformers, vector
+{ cabal, erf, logfloat, mathFunctions, monadLoops, mtl
+, randomShuffle, randomSource, rvar, syb, transformers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "random-fu";
-  version = "0.2.6.0";
-  sha256 = "1mi1hr3hxlnyjf01hgn7xinr1m0rax26759zbkhf5xn04ps0g01p";
+  version = "0.2.6.1";
+  sha256 = "04fi92szpjyg0ffgxfayz00vpiqi67hzyahhin12wvw3pxbyyp9g";
   buildDepends = [
-    erf mathFunctions monadLoops mtl randomShuffle randomSource rvar
-    syb transformers vector
+    erf logfloat mathFunctions monadLoops mtl randomShuffle
+    randomSource rvar syb transformers vector
   ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix
index 26763deb10a..3939c439248 100644
--- a/pkgs/development/libraries/haskell/random/1.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/random/1.0.1.3.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "random number library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/random/1.1.nix b/pkgs/development/libraries/haskell/random/1.1.nix
new file mode 100644
index 00000000000..5ff11eeefda
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random/1.1.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, time }:
+
+cabal.mkDerivation (self: {
+  pname = "random";
+  version = "1.1";
+  sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p";
+  buildDepends = [ time ];
+  meta = {
+    description = "random number library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/rawStringsQq/default.nix b/pkgs/development/libraries/haskell/rawStringsQq/default.nix
new file mode 100644
index 00000000000..ca5c2248958
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rawStringsQq/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "raw-strings-qq";
+  version = "1.0.2";
+  sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9";
+  meta = {
+    homepage = "https://github.com/23Skidoo/raw-strings-qq";
+    description = "Raw string literals for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
index b9e61e32edd..2bff24cd3ab 100644
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];
   configureFlags = "-f-buildExamples";
+  jailbreak = true;
   meta = {
     homepage = "http://haskell.org/haskellwiki/Reactive-banana";
     description = "Examples for the reactive-banana library, using wxHaskell";
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index dd92b7e79de..00fe58be4b1 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HTTP, network, xhtml }:
+{ cabal, HTTP, network, networkUri, xhtml }:
 
 cabal.mkDerivation (self: {
   pname = "recaptcha";
-  version = "0.1.0.2";
-  sha256 = "04sdfp6bmcd3qkz1iqxijfiqa4qf78m5d16r9gjv90ckqf68kbih";
-  buildDepends = [ HTTP network xhtml ];
+  version = "0.1.0.3";
+  sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
+  buildDepends = [ HTTP network networkUri xhtml ];
   meta = {
     homepage = "http://github.com/jgm/recaptcha/tree/master";
     description = "Functions for using the reCAPTCHA service in web applications";
diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index bfa8a063b8e..5cf9535e1b2 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reducers";
-  version = "3.10.2.1";
-  sha256 = "1wn6q6cw9is1gan9y5n3fzjkhmpjpria4p13zp4kqxmj881067vy";
+  version = "3.10.3";
+  sha256 = "0hi77mgc2f38y0xfykn7x6gdl6xg710skpx4z76s8c0wwnd28pr6";
   buildDepends = [
     comonad fingertree hashable keys pointed semigroupoids semigroups
     text transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
deleted file mode 100644
index b5b7068da01..00000000000
--- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-base";
-  version = "0.72.0.2";
-  sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee";
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
deleted file mode 100644
index 5aa971ac347..00000000000
--- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-base";
-  version = "0.93.1";
-  sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef";
-  buildDepends = [ mtl ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/default.nix
index 2a99cc96c25..2a99cc96c25 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/default.nix
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
deleted file mode 100644
index 306d603a9cb..00000000000
--- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat";
-  version = "0.71.0.1";
-  sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d";
-  buildDepends = [ regexBase regexPosix ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
deleted file mode 100644
index 91dda463e6d..00000000000
--- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat";
-  version = "0.92";
-  sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936";
-  buildDepends = [ regexBase regexPosix ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
deleted file mode 100644
index 7fddc11a672..00000000000
--- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase, regexPosix }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-compat";
-  version = "0.93.1";
-  sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf";
-  buildDepends = [ regexBase regexPosix ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix
index 83dffb381fc..83dffb381fc 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/default.nix
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
index 49923bf2d6c..f5ddf2a6388 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
+++ b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
@@ -3,15 +3,14 @@
 { cabal, regexBase }:
 
 cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.94.4";
-  sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw";
+  pname = "regex-pcre-builtin";
+  version = "0.94.4.8.8.35";
+  sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
   buildDepends = [ regexBase ];
   meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
+    homepage = "http://hackage.haskell.org/package/regex-pcre";
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
deleted file mode 100644
index 893e3667701..00000000000
--- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.72.0.3";
-  sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
deleted file mode 100644
index ec4bdaab431..00000000000
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.94.1";
-  sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
deleted file mode 100644
index 20f2dd71414..00000000000
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.94.2";
-  sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
deleted file mode 100644
index 0bcc6d26052..00000000000
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
-  pname = "regex-posix";
-  version = "0.95.1";
-  sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl";
-  buildDepends = [ regexBase ];
-  meta = {
-    homepage = "http://sourceforge.net/projects/lazy-regex";
-    description = "Replaces/Enhances Text.Regex";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
index 292edc23563..292edc23563 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/default.nix
diff --git a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
index 35a3f32847e..4b4fe43102a 100644
--- a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
+++ b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generic generation of HXT XmlPickler instances using Regular";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rematch/default.nix b/pkgs/development/libraries/haskell/rematch/default.nix
new file mode 100644
index 00000000000..0ef47cde904
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rematch/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec, HUnit }:
+
+cabal.mkDerivation (self: {
+  pname = "rematch";
+  version = "0.2.0.0";
+  sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
+  testDepends = [ hspec HUnit ];
+  doCheck = false;
+  meta = {
+    description = "A simple api for matchers";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index bbd6f1b782e..76492381c7a 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resource-pool";
-  version = "0.2.3.0";
-  sha256 = "15igbvnqs6ig1k30l3jngyi60ay7k15mwgza5smv8zbpx86vb1mh";
+  version = "0.2.3.2";
+  sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
   buildDepends = [
     hashable monadControl stm time transformers transformersBase vector
   ];
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 81a7c9d28a2..2ee001b4225 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "1.1.2.3";
-  sha256 = "1n1z1q3k8lg3wqdkrmcfl9mvlx1p81gkh5j911w1006rnm8r87im";
+  version = "1.1.3.3";
+  sha256 = "0ih5p1k0n3ylcv0yk5x7hjzbzhs67vxmng708g9vz7a24xs2m7w2";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl transformers
     transformersBase
diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix
index 0712742717b..a1a1ce6287b 100644
--- a/pkgs/development/libraries/haskell/rest-client/default.nix
+++ b/pkgs/development/libraries/haskell/rest-client/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-client";
-  version = "0.4";
-  sha256 = "18mvmp4c5zznph8q5ash6224wig5kwvb6v19dkn39n4l72cdq7wm";
+  version = "0.4.0.5";
+  sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
   buildDepends = [
     aesonUtils caseInsensitive dataDefault exceptionTransformers
     httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Utility library for use in generated API client libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix
index 53c3ede3ec1..1c4affbafdc 100644
--- a/pkgs/development/libraries/haskell/rest-core/default.nix
+++ b/pkgs/development/libraries/haskell/rest-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-core";
-  version = "0.32";
-  sha256 = "130kz1gsrbamw8gs4vc0fqfjh1gi7i52xxmj4fg1vl2dr77gf6my";
+  version = "0.34.0.3";
+  sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19";
   buildDepends = [
     aeson aesonUtils either errors fclabels hxt hxtPickleUtils
     jsonSchema mtl multipart random restStringmap restTypes safe split
@@ -18,10 +18,10 @@ cabal.mkDerivation (self: {
   testDepends = [
     HUnit mtl testFramework testFrameworkHunit unorderedContainers
   ];
-  jailbreak = true;
   meta = {
     description = "Rest API library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
index 012f6db8bf2..f97d701fba1 100644
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ b/pkgs/development/libraries/haskell/rest-gen/default.nix
@@ -2,28 +2,30 @@
 
 { cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath
 , hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt
-, jsonSchema, restCore, safe, scientific, split, tagged
+, jsonSchema, restCore, safe, scientific, semigroups, split, tagged
 , testFramework, testFrameworkHunit, text, uniplate
 , unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "rest-gen";
-  version = "0.14.2.1";
-  sha256 = "1dvcs25ndmzwdann5yq4567zjirirzskf9v31gkrki0im8mi9x14";
+  version = "0.16.1.3";
+  sha256 = "1nh3rjnn36v13ikvvxc7xahrj3gsswhiq2w54xclrxjl2fzsqz3a";
   buildDepends = [
     aeson blazeHtml Cabal codeBuilder fclabels filepath hashable
     haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore
-    safe scientific split tagged text uniplate unorderedContainers
-    vector
+    safe scientific semigroups split tagged text uniplate
+    unorderedContainers vector
   ];
   testDepends = [
-    haskellSrcExts HUnit restCore testFramework testFrameworkHunit
+    fclabels haskellSrcExts HUnit restCore testFramework
+    testFrameworkHunit
   ];
   jailbreak = true;
   meta = {
     description = "Documentation and client generation from rest definition";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
index 4c79bc58c06..0cb090524e8 100644
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix
@@ -4,12 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-happstack";
-  version = "0.2.10.1";
-  sha256 = "0p4km3l8n50flj9cnxvjl34pp3msxz2yq4d91r318di8pacrgnxc";
+  version = "0.2.10.6";
+  sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5";
   buildDepends = [ happstackServer mtl restCore restGen utf8String ];
   meta = {
     description = "Rest driver for Happstack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix
index 8e9bc69eb01..ac584ae4844 100644
--- a/pkgs/development/libraries/haskell/rest-snap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-snap/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-snap";
-  version = "0.1.17.13";
-  sha256 = "13c143dzxhfrshn19ylqfmhnxjirixfif8d1fmzagz1v893narkz";
+  version = "0.1.17.16";
+  sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia";
   buildDepends = [
     caseInsensitive restCore safe snapCore unorderedContainers
     uriEncode utf8String
@@ -16,5 +16,7 @@ cabal.mkDerivation (self: {
     description = "Rest driver for Snap";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
+
diff --git a/pkgs/development/libraries/haskell/rest-stringmap/default.nix b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
index c1f0c13cbc2..9c1e98c0655 100644
--- a/pkgs/development/libraries/haskell/rest-stringmap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Maps with stringy keys that can be transcoded to JSON and XML";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix
index 41b8044b593..9a4caac1ad2 100644
--- a/pkgs/development/libraries/haskell/rest-types/default.nix
+++ b/pkgs/development/libraries/haskell/rest-types/default.nix
@@ -6,16 +6,16 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-types";
-  version = "1.10.2";
-  sha256 = "1j8fpv4xdhbf1awy0v9zn9a3sjwl42l6472wczp3wwwcpsi65d9q";
+  version = "1.12";
+  sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6";
   buildDepends = [
     aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler
     restStringmap text uuid
   ];
-  jailbreak = true;
   meta = {
     description = "Silk Rest Framework Types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix
index d23d81da33d..761519a99e2 100644
--- a/pkgs/development/libraries/haskell/rest-wai/default.nix
+++ b/pkgs/development/libraries/haskell/rest-wai/default.nix
@@ -1,20 +1,22 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore
-, restTypes, text, unorderedContainers, utf8String, wai
+{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore, text
+, unorderedContainers, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "rest-wai";
-  version = "0.1.0.3";
-  sha256 = "08pprgn9xnd3ipr6clify3snm4ahshlws869mfvziplc4hdcnb59";
+  version = "0.1.0.6";
+  sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz";
   buildDepends = [
-    caseInsensitive httpTypes mimeTypes mtl restCore restTypes text
-    unorderedContainers utf8String wai
+    caseInsensitive httpTypes mimeTypes mtl restCore text
+    unorderedContainers wai
   ];
   meta = {
     description = "Rest driver for WAI applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
+
diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix
index affe39729f3..bcf4272ad7a 100644
--- a/pkgs/development/libraries/haskell/rethinkdb/default.nix
+++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix
@@ -1,24 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, dataDefault, mtl, network
-, protocolBuffers, protocolBuffersDescriptor, text, time
-, unorderedContainers, utf8String, vector
+{ cabal, aeson, base64Bytestring, binary, dataDefault, doctest, mtl
+, network, scientific, text, time, unorderedContainers, utf8String
+, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "rethinkdb";
-  version = "1.8.0.5";
-  sha256 = "1s3mzbs0b2jdvs1gfdxb2fp2lw7978ja63411iz43yjd29d3pwzq";
+  version = "1.15.2.1";
+  sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5";
   buildDepends = [
-    aeson attoparsec dataDefault mtl network protocolBuffers
-    protocolBuffersDescriptor text time unorderedContainers utf8String
-    vector
+    aeson base64Bytestring binary dataDefault mtl network scientific
+    text time unorderedContainers utf8String vector
   ];
+  testDepends = [ doctest ];
+  jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://github.com/atnnn/haskell-rethinkdb";
-    description = "RethinkDB driver for Haskell";
+    description = "A driver for RethinkDB 1.15";
     license = self.stdenv.lib.licenses.asl20;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
index 9a0a994cf77..0df453d10bb 100644
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ b/pkgs/development/libraries/haskell/retry/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "retry";
-  version = "0.5";
-  sha256 = "1qp949w8pisgki06j5qgaxw1761q3gfccc7bqnhqpchazl4p6p6n";
+  version = "0.5.1";
+  sha256 = "1k5qv7c960dayhddvra1gpy1zv90rdjcrzpg8nzar9bpcxapczvj";
   buildDepends = [ dataDefaultClass exceptions transformers ];
   testDepends = [
     dataDefaultClass exceptions hspec HUnit QuickCheck time
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/reverse-apply/default.nix
index 3cb0238b82f..8f39027b251 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/reverse-apply/default.nix
@@ -3,13 +3,12 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "xhtml";
-  version = "3000.2.0.1";
-  sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0";
+  pname = "reverse-apply";
+  version = "2.0.1";
+  sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
   meta = {
-    description = "An XHTML combinator library";
+    description = "Standard version of the reverse apply operator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix
index c6534ff0cf4..0ebf6dac301 100644
--- a/pkgs/development/libraries/haskell/robots-txt/default.nix
+++ b/pkgs/development/libraries/haskell/robots-txt/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "robots-txt";
-  version = "0.4.1.0";
-  sha256 = "1q18pgilrwppmd8d7pby3p6qgk47alzmd8izqspk7n4h4agrscn4";
+  version = "0.4.1.1";
+  sha256 = "16r6j96iay1r6435ym34dp9iggwlfigmzmqq5k5f5ss5bljfc72f";
   buildDepends = [ attoparsec time ];
   testDepends = [ attoparsec heredoc hspec QuickCheck transformers ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/rope/default.nix b/pkgs/development/libraries/haskell/rope/default.nix
new file mode 100644
index 00000000000..3c751d5eddd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rope/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, fingertree, mtl, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "rope";
+  version = "0.6.4";
+  sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
+  buildDepends = [ fingertree mtl utf8String ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://github.com/ekmett/rope";
+    description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index ecb2a2c9db1..0802c8ba3f5 100644
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rvar";
-  version = "0.2.0.1";
-  sha256 = "17wgd4gc1hn04dck168nkyzn9jyipgbysxsznyzy2z36vafqqqbm";
+  version = "0.2.0.2";
+  sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
   buildDepends = [ MonadPrompt mtl randomSource transformers ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/saltine/default.nix b/pkgs/development/libraries/haskell/saltine/default.nix
new file mode 100644
index 00000000000..acb4066fb2e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/saltine/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, libsodium, profunctors, QuickCheck, testFramework
+, testFrameworkQuickcheck2, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "saltine";
+  version = "0.0.0.3";
+  sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y";
+  buildDepends = [ profunctors ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2 vector
+  ];
+  extraLibraries = [ libsodium ];
+  meta = {
+    description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix
index 0a21f13dbc2..492dcd816ed 100644
--- a/pkgs/development/libraries/haskell/sbv/default.nix
+++ b/pkgs/development/libraries/haskell/sbv/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sbv";
-  version = "3.1";
-  sha256 = "19rn5ynqqjz0zw7gcb0y4clzxxnmq56a2qx369mz283455l86h5j";
+  version = "3.3";
+  sha256 = "193k7njrd7b0qp865ahbjh32h49b86kyc58laifgq6ka2zv64x2f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
index 22bf663334c..10e294b4214 100644
--- a/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix
+++ b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scientific";
-  version = "0.3.3.0";
-  sha256 = "1kj49ibq53m7cfs9pq396l4fbqnarqzay7a65rmsrzi2vz15parv";
+  version = "0.3.3.3";
+  sha256 = "1hngkmd1kggc84sz4mddc0yj2vyzc87dz5dkkywjgxczys51mhqn";
   buildDepends = [ deepseq hashable text ];
   testDepends = [
     QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck
diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 91876f7e318..1e184577a66 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,21 +1,22 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
-, hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat
+{ cabal, aeson, blazeBuilder, caseInsensitive, dataDefault, hspec2
+, hspecWai, httpTypes, liftedBase, monadControl, mtl, regexCompat
 , text, transformers, transformersBase, wai, waiExtra, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.8.2";
-  sha256 = "07vjdj26380inlyi350mdifm7v1dpbc56041vi2czf5zzhx97qb0";
+  version = "0.9.1";
+  sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm";
   buildDepends = [
-    aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
+    aeson blazeBuilder caseInsensitive dataDefault httpTypes
     monadControl mtl regexCompat text transformers transformersBase wai
     waiExtra warp
   ];
-  testDepends = [ hspec httpTypes liftedBase wai waiExtra ];
+  testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/scotty-web/scotty";
     description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix
new file mode 100644
index 00000000000..29561239d19
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sdl2/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, SDL2, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "sdl2";
+  version = "1.3.0";
+  sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa";
+  buildDepends = [ transformers ];
+  extraLibraries = [ SDL2 ];
+  pkgconfigDepends = [ SDL2 ];
+  meta = {
+    description = "Low-level bindings to SDL2";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
index fddba193457..c03a92d0fd3 100644
--- a/pkgs/development/libraries/haskell/securemem/default.nix
+++ b/pkgs/development/libraries/haskell/securemem/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "securemem";
-  version = "0.1.3";
-  sha256 = "1kycpk73vh8wwxzn35hmv36vwsc9r4g53f2fy6bn21q9gfm2r90j";
+  version = "0.1.4";
+  sha256 = "1wdbcnyaarrixfvz79mcyqmfnn9h5zsmrrsa64xj8650ppyaxi48";
   buildDepends = [ byteable ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-securemem";
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index ed9fa0bf3fb..8cd94e9079f 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hashable, nats, text, unorderedContainers }:
+{ cabal, deepseq, hashable, nats, text, unorderedContainers }:
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.15.2";
-  sha256 = "1lh06d0mwivzbfjg635r3m39qcpyjvnwni7mspz96qb3zcm0c5kp";
-  buildDepends = [ hashable nats text unorderedContainers ];
+  version = "0.16";
+  sha256 = "0mq5c6py0z3jaxr1j0aalz4vjd1v6ygffv91h7nh5621rcv4ga4s";
+  buildDepends = [ deepseq hashable nats text unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Anything that associates";
diff --git a/pkgs/development/libraries/haskell/serialport/default.nix b/pkgs/development/libraries/haskell/serialport/default.nix
new file mode 100644
index 00000000000..5e733f82ca1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/serialport/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, HUnit }:
+
+cabal.mkDerivation (self: {
+  pname = "serialport";
+  version = "0.4.7";
+  sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
+  testDepends = [ HUnit ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/jputcu/serialport";
+    description = "Cross platform serial port library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix
new file mode 100644
index 00000000000..d11e25222ea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-client/default.nix
@@ -0,0 +1,27 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec
+, httpClient, httpTypes, network, networkUri, QuickCheck, safe
+, servant, servantServer, stringConversions, text, transformers
+, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "servant-client";
+  version = "0.2.1";
+  sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn";
+  buildDepends = [
+    aeson attoparsec either exceptions httpClient httpTypes networkUri
+    safe servant stringConversions text transformers
+  ];
+  testDepends = [
+    aeson deepseq either hspec httpTypes network QuickCheck servant
+    servantServer wai warp
+  ];
+  meta = {
+    homepage = "http://haskell-servant.github.io/";
+    description = "automatical derivation of querying functions for servant webservices";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix
new file mode 100644
index 00000000000..3da6936532c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-docs/default.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, hashable, lens, servant, stringConversions
+, systemFilepath, text, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "servant-docs";
+  version = "0.2.1";
+  sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson hashable lens servant stringConversions systemFilepath text
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "http://haskell-servant.github.io/";
+    description = "generate API docs for your servant webservice";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix
new file mode 100644
index 00000000000..2a85cb19106
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-jquery/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, filepath, lens, servant, servantServer, stm
+, transformers, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "servant-jquery";
+  version = "0.2.1";
+  sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson filepath lens servant servantServer stm transformers warp
+  ];
+  meta = {
+    homepage = "http://haskell-servant.github.io/";
+    description = "Automatically derive jquery-based javascript functions to query servant webservices";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-pool/default.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix
deleted file mode 100644
index 692d694ed46..00000000000
--- a/pkgs/development/libraries/haskell/servant-pool/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, resourcePool, servant, time }:
-
-cabal.mkDerivation (self: {
-  pname = "servant-pool";
-  version = "0.1";
-  sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69";
-  buildDepends = [ resourcePool servant time ];
-  meta = {
-    homepage = "http://github.com/zalora/servant-pool";
-    description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-postgresql/default.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix
deleted file mode 100644
index 154eefea320..00000000000
--- a/pkgs/development/libraries/haskell/servant-postgresql/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, postgresqlSimple, servant, servantPool, servantResponse }:
-
-cabal.mkDerivation (self: {
-  pname = "servant-postgresql";
-  version = "0.1";
-  sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj";
-  buildDepends = [
-    postgresqlSimple servant servantPool servantResponse
-  ];
-  meta = {
-    homepage = "http://github.com/zalora/servant-postgresql";
-    description = "Useful functions and instances for using servant with a PostgreSQL context";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-response/default.nix b/pkgs/development/libraries/haskell/servant-response/default.nix
deleted file mode 100644
index 3f7f9c1eee0..00000000000
--- a/pkgs/development/libraries/haskell/servant-response/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, httpTypes, text }:
-
-cabal.mkDerivation (self: {
-  pname = "servant-response";
-  version = "0.1";
-  sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy";
-  buildDepends = [ aeson httpTypes text ];
-  meta = {
-    homepage = "http://github.com/zalora/servant";
-    description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
deleted file mode 100644
index 732b2c95cc7..00000000000
--- a/pkgs/development/libraries/haskell/servant-scotty/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "servant-scotty";
-  version = "0.1.1";
-  sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783";
-  buildDepends = [
-    aeson httpTypes scotty servant servantResponse text transformers
-  ];
-  meta = {
-    homepage = "http://github.com/zalora/servant";
-    description = "Generate a web service for servant 'Resource's using scotty and JSON";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix
new file mode 100644
index 00000000000..8c3ce56d412
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-server/default.nix
@@ -0,0 +1,31 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai
+, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant
+, split, stringConversions, systemFilepath, temporary, text
+, transformers, wai, waiAppStatic, waiExtra, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "servant-server";
+  version = "0.2.3";
+  sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec either httpTypes networkUri safe servant split
+    stringConversions systemFilepath text transformers wai waiAppStatic
+    warp
+  ];
+  testDepends = [
+    aeson either exceptions hspec hspecWai httpTypes network parsec
+    QuickCheck servant stringConversions temporary text transformers
+    wai waiExtra warp
+  ];
+  meta = {
+    homepage = "http://haskell-servant.github.io/";
+    description = "A family of combinators for defining webservices APIs and serving them";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix
index 38f89764c4c..1c206c1ab22 100644
--- a/pkgs/development/libraries/haskell/servant/default.nix
+++ b/pkgs/development/libraries/haskell/servant/default.nix
@@ -1,14 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal }:
+{ cabal, hspec, parsec, QuickCheck, stringConversions, text }:
 
 cabal.mkDerivation (self: {
   pname = "servant";
-  version = "0.1";
-  sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0";
+  version = "0.2.1";
+  sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x";
+  buildDepends = [ parsec stringConversions text ];
+  testDepends = [ hspec parsec QuickCheck stringConversions text ];
   meta = {
-    homepage = "http://github.com/zalora/servant";
-    description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you";
+    homepage = "http://haskell-servant.github.io/";
+    description = "A family of combinators for defining webservices APIs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
index fcfd2d34d58..a76a2f5cf32 100644
--- a/pkgs/development/libraries/haskell/setlocale/default.nix
+++ b/pkgs/development/libraries/haskell/setlocale/default.nix
@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "setlocale";
-  version = "0.0.3";
-  sha256 = "08pd20ibmslr94p52rn6x9w3swn9jy7vjlvxzw29h8dlqgmvcrjl";
+  version = "1.0.0.1";
+  sha256 = "15dzf4hgkn5saz6qyn1xqvinvy0y571crfxfwycmcmm4az6rsqk0";
+  jailbreak = true;
   meta = {
-    description = "A Haskell interface to setlocale()";
-    license = self.stdenv.lib.licenses.publicDomain;
+    description = "Haskell bindings to setlocale";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 610c7c22590..3ed0912b0f3 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -1,25 +1,25 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, binary, deepseq, filepath, hashable, QuickCheck, random
-, time, transformers, unorderedContainers, utf8String
+{ gcc, cabal, binary, deepseq, extra, filepath, hashable, jsFlot
+, jsJquery, QuickCheck, random, time, transformers
+, unorderedContainers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.13.2";
-  sha256 = "0ibq0y0dxxahfwgcvamjfhbl5mrqmj7ryzf8bfmqky843fg7dyna";
+  version = "0.14.3";
+  sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl";
   isLibrary = true;
   isExecutable = true;
+  buildTools = [ gcc ];
   buildDepends = [
-    binary deepseq filepath hashable random time transformers
-    unorderedContainers utf8String
+    binary deepseq extra filepath hashable jsFlot jsJquery random time
+    transformers unorderedContainers utf8String
   ];
   testDepends = [
-    binary deepseq filepath hashable QuickCheck random time
-    transformers unorderedContainers utf8String
+    binary deepseq extra filepath hashable jsFlot jsJquery QuickCheck
+    random time transformers unorderedContainers utf8String
   ];
   meta = {
-    homepage = "https://github.com/ndmitchell/shake";
+    homepage = "http://www.shakebuild.com/";
     description = "Build system library, like Make, but more accurate dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 251eb07d8aa..5c6b804810d 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "2.0.1.1";
-  sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p";
+  version = "2.0.2.1";
+  sha256 = "1s73nlkccfg3wl0qfx6f7q3afiakdhzh5xksnfhsg5hjhx80qhza";
   buildDepends = [
     aeson blazeHtml blazeMarkup exceptions parsec systemFileio
     systemFilepath text time transformers
diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix
new file mode 100644
index 00000000000..a93e38b1b82
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix
@@ -0,0 +1,25 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, conduit, conduitExtra, controlMonadLoop, filepath
+, monadControl, monadsTf, resourcet, semigroups, split, text
+, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "shell-conduit";
+  version = "4.5";
+  sha256 = "1vgqfba6k0nv8nwa48fv2hkr9xlrrfrdh2awgpllrimnh0yww41g";
+  buildDepends = [
+    async conduit conduitExtra controlMonadLoop filepath monadControl
+    monadsTf resourcet semigroups split text transformers
+    transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/chrisdone/shell-conduit";
+    description = "Write shell scripts with Conduit";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix
index 6f059a75352..dcc7211f869 100644
--- a/pkgs/development/libraries/haskell/shellmate/default.nix
+++ b/pkgs/development/libraries/haskell/shellmate/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Simple interface for shell scripting in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix
deleted file mode 100644
index 2840ba736f5..00000000000
--- a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text
-, time, unixCompat
-}:
-
-cabal.mkDerivation (self: {
-  pname = "shelly";
-  version = "0.15.4.1";
-  sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck";
-  buildDepends = [
-    mtl systemFileio systemFilepath text time unixCompat
-  ];
-  testDepends = [
-    hspec HUnit mtl systemFileio systemFilepath text time unixCompat
-  ];
-  meta = {
-    homepage = "https://github.com/yesodweb/Shelly.hs";
-    description = "shell-like (systems) programming in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 6deaa209dc8..251cb6a17b5 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.5";
-  sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1";
+  version = "1.6.0";
+  sha256 = "0yrx7sv1s8pddpap143d3yi3ypvf84jjh16i8b3dm4kb3m4x3mdv";
   buildDepends = [
     async enclosedExceptions exceptions liftedAsync liftedBase
     monadControl mtl systemFileio systemFilepath text time transformers
diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix
index f1ad007c8f9..49e574772f1 100644
--- a/pkgs/development/libraries/haskell/simple-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/simple-conduit/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     primitive semigroups stm streamingCommons text transformers
     transformersBase vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jwiegley/simple-conduit";
     description = "A simple streaming I/O library based on monadic folds";
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 3e8381bf34b..d291aba9630 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -1,16 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, conduit, conduitExtra, hspec, HUnit, network
-, networkConduit, resourcet
-}:
+{ cabal, conduit, conduitExtra, hspec, HUnit, network, resourcet }:
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.15";
-  sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9";
-  buildDepends = [ network resourcet ];
+  version = "0.2.18";
+  sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49";
+  buildDepends = [ network ];
   testDepends = [
-    conduit conduitExtra hspec HUnit network networkConduit resourcet
+    conduit conduitExtra hspec HUnit network resourcet
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/sitemap/default.nix b/pkgs/development/libraries/haskell/sitemap/default.nix
new file mode 100644
index 00000000000..1a6b2849476
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sitemap/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, lens, taggy, taggyLens, text }:
+
+cabal.mkDerivation (self: {
+  pname = "sitemap";
+  version = "0.1.2";
+  sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
+  buildDepends = [ lens taggy taggyLens text ];
+  meta = {
+    homepage = "http://github.com/alpmestan/sitemap";
+    description = "Sitemap parser";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 5fcd9df4642..c60bf97d54f 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "1.0.9";
-  sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb";
+  version = "1.0.9.2";
+  sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   jailbreak = true;
diff --git a/pkgs/development/libraries/haskell/slack-api/default.nix b/pkgs/development/libraries/haskell/slack-api/default.nix
new file mode 100644
index 00000000000..d0e6b32f572
--- /dev/null
+++ b/pkgs/development/libraries/haskell/slack-api/default.nix
@@ -0,0 +1,19 @@
+{ cabal, aeson, errors, HsOpenSSL, ioStreams, lens, lensAeson
+, monadLoops, mtl, network, opensslStreams, text, time
+, transformers, websockets, wreq
+}:
+
+cabal.mkDerivation (self: {
+  pname = "slack-api";
+  version = "0.2.1";
+  sha256 = "1k6p60gb13g09y6isr1r90zw548vs4y1fz34amfhdx79g9zm30hy";
+  buildDepends = [
+    aeson errors HsOpenSSL ioStreams lens lensAeson monadLoops mtl
+    network opensslStreams text time transformers websockets wreq
+  ];
+  meta = {
+    description = "Bindings to the Slack RTM API";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index fbab444444b..75cb227cd85 100644
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -1,16 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, base64Bytestring, cprngAes, dataDefault, filepath
-, mimeMail, network, stringsearch, text, tls
+{ cabal, attoparsec, base64Bytestring, conduit, conduitExtra
+, cprngAes, dataDefault, filepath, mimeMail, network, resourcet
+, stringsearch, text, tls, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "smtps-gmail";
-  version = "1.2.1";
-  sha256 = "04sancbfbbszajgb1jp613qp43qxvzz9b14c0v3sgfva7fdhaw9q";
+  version = "1.3.0";
+  sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9";
   buildDepends = [
-    base64Bytestring cprngAes dataDefault filepath mimeMail network
-    stringsearch text tls
+    attoparsec base64Bytestring conduit conduitExtra cprngAes
+    dataDefault filepath mimeMail network resourcet stringsearch text
+    tls transformers
   ];
   meta = {
     homepage = "https://github.com/enzoh/smtps-gmail";
diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix
index f62b484328c..f9d043dff80 100644
--- a/pkgs/development/libraries/haskell/snap-cors/default.nix
+++ b/pkgs/development/libraries/haskell/snap-cors/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, caseInsensitive, hashable, network, snap, text
-, transformers, unorderedContainers
+{ cabal, attoparsec, caseInsensitive, hashable, network, networkUri
+, snap, text, transformers, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "snap-cors";
-  version = "1.2.5";
-  sha256 = "1zjvvi1prskkb26yp51j09gfkhpw0ggj69d89098yq0sl6d0vy1c";
+  version = "1.2.6";
+  sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8";
   buildDepends = [
-    attoparsec caseInsensitive hashable network snap text transformers
-    unorderedContainers
+    attoparsec caseInsensitive hashable network networkUri snap text
+    transformers unorderedContainers
   ];
   meta = {
     homepage = "http://github.com/ocharles/snap-cors";
diff --git a/pkgs/development/libraries/haskell/snap-error-collector/default.nix b/pkgs/development/libraries/haskell/snap-error-collector/default.nix
new file mode 100644
index 00000000000..b9b6376394a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap-error-collector/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, async, MonadCatchIOTransformers, monadLoops, snap, stm
+, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snap-error-collector";
+  version = "1.1.0";
+  sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2";
+  buildDepends = [
+    async MonadCatchIOTransformers monadLoops snap stm time
+    transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ocharles/snap-error-collector";
+    description = "Collect errors in batches and dispatch them";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix
index 71b8c3c49da..a8252a4f3f0 100644
--- a/pkgs/development/libraries/haskell/snap-web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/snap-web-routes/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.5.0.0";
   sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
   buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/lukerandall/snap-web-routes";
     description = "Type safe URLs for Snap";
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 0fca2136663..410e9db6f92 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     HUnit MonadCatchIOTransformers mtl random regexPosix text time
     unixCompat unorderedContainers vector zlibEnum
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework (core interfaces and types)";
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index d2278f329f4..cacb0c03945 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
   ];
   configureFlags = "-fopenssl";
   patchPhase = ''
-    sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' snap-server.cabal
+    sed -i -e 's|text *>= .*,|text,|' -e 's|HsOpenSSL >= .*|HsOpenSSL|' -e 's|network.*2.6,|network,|' snap-server.cabal
   '';
   meta = {
     homepage = "http://snapframework.com/";
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 189750bd446..bb4afe88512 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.13.2.8";
-  sha256 = "1jrnh1raw2jrl04l54f5w5xfp9yyb9bj0ly9v1baqkiggswacbzg";
+  version = "0.13.3.2";
+  sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -21,10 +21,6 @@ cabal.mkDerivation (self: {
     snapCore snapServer stm syb text time transformers
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
-  jailbreak = true;
-  patchPhase = ''
-    sed -i -e 's|lens .*< 4.2|lens|' snap.cabal
-  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";
diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
index 0d483a65ad7..96a64488f2a 100644
--- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.2.6.1";
   sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
   buildDepends = [ acidState snap text ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/mightybyte/snaplet-acid-state";
     description = "acid-state snaplet for Snap Framework";
diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
index 5238fee7b9f..7745fa5ddbe 100644
--- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
@@ -1,6 +1,6 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, clientsession, configurator, errors
+{ cabal, clientsession, configurator, errors, lens
 , MonadCatchIOTransformers, mtl, postgresqlSimple
 , resourcePoolCatchio, snap, text, transformers
 , unorderedContainers
@@ -8,10 +8,10 @@
 
 cabal.mkDerivation (self: {
   pname = "snaplet-postgresql-simple";
-  version = "0.5";
-  sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm";
+  version = "0.6";
+  sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6";
   buildDepends = [
-    clientsession configurator errors MonadCatchIOTransformers mtl
+    clientsession configurator errors lens MonadCatchIOTransformers mtl
     postgresqlSimple resourcePoolCatchio snap text transformers
     unorderedContainers
   ];
@@ -20,7 +20,5 @@ cabal.mkDerivation (self: {
     description = "postgresql-simple snaplet for the Snap Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix
index d6bfcd260ca..1b7a7b10b21 100644
--- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix
@@ -1,15 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, configurator, hedis, lens, mtl, network, snap
+{ cabal, configurator, hedis, lens, mtl, network, snap, text
 , transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "snaplet-redis";
-  version = "0.1.3.3";
-  sha256 = "17w2b9cnri45m535hyszb1fickhhglid3zy5a4bbljmnwvi4y08l";
+  version = "0.1.4.1";
+  sha256 = "0vrsvmgrds7l4q88q7gmy1bz36z5ba45rib2vm5z6v2cf0x22qz2";
   buildDepends = [
-    configurator hedis lens mtl network snap transformers
+    configurator hedis lens mtl network snap text transformers
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
index 1024b2ac4ee..6f0f3d5de06 100644
--- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, configurator, heist, mtl, snap, stripe, text, textFormat
-, transformers, xmlhtml
+{ cabal, configurator, heist, lensFamilyCore, mtl, snap, stripe
+, text, textFormat, transformers, xmlhtml
 }:
 
 cabal.mkDerivation (self: {
   pname = "snaplet-stripe";
-  version = "0.2.0";
-  sha256 = "01ichbwk31zfjq5rc09scz0j4ir6b7jnppdvmm8ilvkj7bl442xs";
+  version = "0.3.0";
+  sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
   buildDepends = [
-    configurator heist mtl snap stripe text textFormat transformers
-    xmlhtml
+    configurator heist lensFamilyCore mtl snap stripe text textFormat
+    transformers xmlhtml
   ];
   jailbreak = true;
   meta = {
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "Stripe snaplet for the Snap Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix
index 0a7d4b1c230..57827d495f3 100644
--- a/pkgs/development/libraries/haskell/socket-io/default.nix
+++ b/pkgs/development/libraries/haskell/socket-io/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "socket-io";
-  version = "1.1.0";
-  sha256 = "1ffip6jlp3i6pz8gbk8m2ra2q8568mgwgi988yh046w787yf9kpw";
+  version = "1.2.0";
+  sha256 = "1271qmd83q669dcs6ni0f84i5kgvh8vgr4xgx2lcprirbzkx0gdl";
   buildDepends = [
     aeson attoparsec engineIo mtl stm text transformers
     unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/sodium/default.nix b/pkgs/development/libraries/haskell/sodium/default.nix
index f27c5d0e51c..0dbd0647a86 100644
--- a/pkgs/development/libraries/haskell/sodium/default.nix
+++ b/pkgs/development/libraries/haskell/sodium/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sodium";
-  version = "0.10.0.2";
-  sha256 = "0rm1blh0br4gdnqb6ixvql6nrxzcjxjkwp4lmqmsisa2b68gbzqy";
+  version = "0.11.0.2";
+  sha256 = "0m3ig6nqkw0m6xh6ijgr2w06i4ydyfwx7rsbkrrxflichadm9r2g";
   buildDepends = [ mtl ];
   meta = {
     description = "Sodium Reactive Programming (FRP) System";
diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
deleted file mode 100644
index 5dfcdf6de0c..00000000000
--- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, QuickCheck }:
-
-cabal.mkDerivation (self: {
-  pname = "split";
-  version = "0.2.1.1";
-  sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz";
-  testDepends = [ QuickCheck ];
-  meta = {
-    description = "Combinator library for splitting lists";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index 087871bbc53..8d30afc77ad 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -4,10 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "srcloc";
-  version = "0.4.0";
-  sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k";
+  version = "0.4.1";
+  sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz";
   meta = {
-    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    homepage = "http://www.cs.drexel.edu/~mainland/";
     description = "Data types for managing source code locations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/state-plus/default.nix b/pkgs/development/libraries/haskell/state-plus/default.nix
new file mode 100644
index 00000000000..d35da29273e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/state-plus/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, checkers, mtl, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "state-plus";
+  version = "0.1.1";
+  sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
+  buildDepends = [ mtl ];
+  testDepends = [ checkers mtl QuickCheck ];
+  meta = {
+    description = "MonadPlus for StateT";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index cebb79c3344..c13aa992317 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.5.1";
-  sha256 = "08cnr92c442b1in46xcklni35597hbsggw97arq2f9w5sfir341q";
+  version = "2.5.3";
+  sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw";
   buildDepends = [
     async cereal cerealConduit conduit conduitExtra liftedAsync
     liftedBase monadControl monadLoops resourcet stm stmChans
diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix
index 91105712a6a..d093c5e07db 100644
--- a/pkgs/development/libraries/haskell/stm-containers/default.nix
+++ b/pkgs/development/libraries/haskell/stm-containers/default.nix
@@ -1,19 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl
-, placeholders, primitive, QuickCheck, unorderedContainers
+{ cabal, basePrelude, focus, free, hashable, HTF, listT, lochTh
+, mtl, mtlPrelude, placeholders, primitive, QuickCheck
+, transformers, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "stm-containers";
-  version = "0.1.3";
-  sha256 = "0ir2b6y1sqr0i68j0fqmwyysk7x9z18n84dbjppyjzzidcsrkar0";
+  version = "0.2.7";
+  sha256 = "1qgmrxccnvids2xq2n28cllfqh88f0b2512hm5grrab7qb07phar";
   buildDepends = [
-    basePrelude focus hashable lochTh placeholders primitive
+    basePrelude focus hashable listT lochTh placeholders primitive
+    transformers
   ];
   testDepends = [
-    basePrelude focus free hashable HTF lochTh mtl placeholders
-    primitive QuickCheck unorderedContainers
+    basePrelude focus free hashable HTF listT lochTh mtl mtlPrelude
+    placeholders primitive QuickCheck transformers unorderedContainers
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/stm-delay/default.nix b/pkgs/development/libraries/haskell/stm-delay/default.nix
new file mode 100644
index 00000000000..ee2500db8d3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-delay/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-delay";
+  version = "0.1.1.1";
+  sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
+  buildDepends = [ stm ];
+  testDepends = [ stm ];
+  meta = {
+    homepage = "https://github.com/joeyadams/haskell-stm-delay";
+    description = "Updatable one-shot timer polled with STM";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
deleted file mode 100644
index d69827bbb69..00000000000
--- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.1.1.2";
-  sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
-  meta = {
-    description = "Software Transactional Memory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
deleted file mode 100644
index ab99000b7e7..00000000000
--- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "stm";
-  version = "2.1.2.1";
-  sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8";
-  meta = {
-    description = "Software Transactional Memory";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index 3f0d47dfc2a..c4d19f61188 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.4.2";
-  sha256 = "0ghm3a64q84bfyp1qp452jw4ns52nd5jz8fk308vljfpakv30qyf";
+  version = "0.1.7.3";
+  sha256 = "12sm59dhjrygly215888i2xcsn5m5a393ir0mm6w62883x49wzxb";
   buildDepends = [
     blazeBuilder network random stm text transformers zlib
   ];
diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix
index 5176cad03cd..9225bacbfe3 100644
--- a/pkgs/development/libraries/haskell/string-conversions/default.nix
+++ b/pkgs/development/libraries/haskell/string-conversions/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "string-conversions";
-  version = "0.3.0.2";
-  sha256 = "0jcm0vv0ll74zfc7s2l8qpqpbfnkv7ir9d1kg68m6b0f9sq0dgng";
+  version = "0.3.0.3";
+  sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p";
   buildDepends = [ text utf8String ];
   meta = {
     description = "Simplifies dealing with different types for strings";
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 9cc43e142a7..d739d11c17a 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.10.2";
-  sha256 = "1r1vwn334jdsk6szynzz7w9jpbfqs3zs7wzlpwfigsyyrjy3bn3q";
+  version = "0.5.11.0";
+  sha256 = "1174gs5a2n6l2flyb2x93yiq7viwb52kbadw6jya6041xrpblckz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix
deleted file mode 100644
index 967bc75e522..00000000000
--- a/pkgs/development/libraries/haskell/syb/0.3.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.3.3";
-  sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
deleted file mode 100644
index de9da047889..00000000000
--- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.3.6.1";
-  sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix
deleted file mode 100644
index 72f883e5243..00000000000
--- a/pkgs/development/libraries/haskell/syb/0.3.7.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.3.7";
-  sha256 = "0wysa348icabskih3k9xbmwaaw34hg58lpz3w3075942h650bx2r";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix
deleted file mode 100644
index 355fd3671e4..00000000000
--- a/pkgs/development/libraries/haskell/syb/0.3.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.3";
-  sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
index 4451b2c3bdb..46a2979d775 100644
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ b/pkgs/development/libraries/haskell/symbol/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, deepseq, syb }:
+{ cabal, deepseq }:
 
 cabal.mkDerivation (self: {
   pname = "symbol";
-  version = "0.2.1";
-  sha256 = "1g9rpz40v6wnmp671wvbbinzvvxkibdnny4i6ai28pn3sxa6fgkj";
-  buildDepends = [ deepseq syb ];
+  version = "0.2.4";
+  sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
+  buildDepends = [ deepseq ];
   jailbreak = true;
   meta = {
     homepage = "http://www.cs.drexel.edu/~mainland/";
diff --git a/pkgs/development/libraries/haskell/system-argv0/default.nix b/pkgs/development/libraries/haskell/system-argv0/default.nix
new file mode 100644
index 00000000000..6f0eb038b60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/system-argv0/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, systemFilepath, text }:
+
+cabal.mkDerivation (self: {
+  pname = "system-argv0";
+  version = "0.1.1";
+  sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
+  buildDepends = [ systemFilepath text ];
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-filesystem/";
+    description = "Get argv[0] as a FilePath";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index 9853c4abd08..cf3dcee3301 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -5,14 +5,14 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.14";
-  sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29";
+  version = "0.3.16";
+  sha256 = "1x18ffhas6bhjis0glf0xd6ap8vy7cap8lkmnkn4px83d82yzi8k";
   buildDepends = [ systemFilepath text time ];
   testDepends = [
     chell systemFilepath temporary text time transformers
   ];
   meta = {
-    homepage = "https://john-millikin.com/software/haskell-filesystem/";
+    homepage = "https://github.com/fpco/haskell-filesystem";
     description = "Consistent filesystem interaction across GHC versions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 4adf48d26e7..8ec752d7a39 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -4,13 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.12";
-  sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2";
+  version = "0.4.13";
+  sha256 = "0g1lam859vs71vyc8qsg6aianw5s7w19rk02acf2gr8dg3ypznca";
   buildDepends = [ deepseq text ];
   testDepends = [ chell chellQuickcheck QuickCheck text ];
   doCheck = false;
   meta = {
-    homepage = "https://john-millikin.com/software/haskell-filesystem/";
+    homepage = "https://github.com/fpco/haskell-filesystem";
     description = "High-level, byte-based file and directory path manipulations";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix
index 53b178066eb..b8159a777d4 100644
--- a/pkgs/development/libraries/haskell/tables/default.nix
+++ b/pkgs/development/libraries/haskell/tables/default.nix
@@ -21,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "In-memory storage with multiple keys using lenses and traversals";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagged-transformer/default.nix b/pkgs/development/libraries/haskell/tagged-transformer/default.nix
new file mode 100644
index 00000000000..34da51018e0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tagged-transformer/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, comonad, contravariant, distributive, exceptions, mtl
+, reflection, semigroupoids, tagged
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tagged-transformer";
+  version = "0.7.1";
+  sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j";
+  buildDepends = [
+    comonad contravariant distributive exceptions mtl reflection
+    semigroupoids tagged
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/tagged-transformer";
+    description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index 903eccdfed3..10585eb3412 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.7.2";
-  sha256 = "06w7gss2vqnly2zijf0hkq60jx13nsxwsjsnyfbn25r4f6gjsnq5";
+  version = "0.7.3";
+  sha256 = "016bzws7w09xhyyqiz56ahlf7zhagihn370ga0083fgv172lym7b";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix
index d94a3b27f2c..d456afbd65f 100644
--- a/pkgs/development/libraries/haskell/taggy/default.nix
+++ b/pkgs/development/libraries/haskell/taggy/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "taggy";
-  version = "0.1.2";
-  sha256 = "0sj7da4yawfajyrd2gg2dxzgj5n99mdm5cz3bdhfipas4bb4216y";
+  version = "0.1.3";
+  sha256 = "18azsibsfjz4zj69dk4a3jrdw6zvd8n1gsd1ynd2hy7i9z168iw8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 35d004445fc..40ddd46ba54 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagsoup";
-  version = "0.13.2";
-  sha256 = "0q9r4vsdlib6dm0b387zg089b1410f0nspzigx2awqi2xqfsi0xz";
+  version = "0.13.3";
+  sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ text ];
diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
index ee721836245..2e939317504 100644
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
@@ -1,19 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, caseInsensitive, conduit, conduitExtra
-, dataDefault, hspec, HUnit, QuickCheck, resourcet, text
-, transformers, xmlConduit
+{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
+, conduitExtra, dataDefault, hspec, HUnit, QuickCheck, resourcet
+, text, transformers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "tagstream-conduit";
-  version = "0.5.5.1";
-  sha256 = "0bpxjhqqqigfnwcxx3h2am5zmgr1lyaxaac3lnz490j6zf8x9jn7";
+  version = "0.5.5.3";
+  sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
   buildDepends = [
-    attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    caseInsensitive conduit conduitExtra dataDefault resourcet text
-    transformers xmlConduit
+    attoparsec blazeBuilder caseInsensitive conduit conduitExtra
+    dataDefault resourcet text transformers xmlConduit
   ];
   testDepends = [ conduit hspec HUnit QuickCheck resourcet text ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
index 9f8e59322b0..8f6b953e954 100644
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
@@ -1,15 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, genericDeriving, mtl, reducers, stm, tagged, tasty
-, transformers, xml
+{ cabal, genericDeriving, mtl, stm, tagged, tasty, transformers
+, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-ant-xml";
-  version = "1.0.0.8";
-  sha256 = "0khjx3anxp63ch6wkdhqnsk5miavkq014ab30rpir97gdqw0vykm";
+  version = "1.0.1";
+  sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc";
   buildDepends = [
-    genericDeriving mtl reducers stm tagged tasty transformers xml
+    genericDeriving mtl stm tagged tasty transformers xml
   ];
   meta = {
     homepage = "http://github.com/ocharles/tasty-ant-xml";
diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix
index 8c3083d07fe..459a0f1123a 100644
--- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix
@@ -1,12 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, hspec, tasty }:
+{ cabal, hspec, hspecCore, QuickCheck, random, tasty
+, tastyQuickcheck, tastySmallcheck
+}:
 
 cabal.mkDerivation (self: {
   pname = "tasty-hspec";
-  version = "0.1.0.1";
-  sha256 = "0m8v9kj557vfqzmrindwfcjl7wqmdix2xvmsb94n8hx9qv075s3v";
-  buildDepends = [ hspec tasty ];
+  version = "1.1";
+  sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6";
+  buildDepends = [
+    hspec hspecCore QuickCheck random tasty tastyQuickcheck
+    tastySmallcheck
+  ];
   meta = {
     homepage = "http://github.com/mitchellwrosen/tasty-hspec";
     description = "Hspec support for the Tasty test framework";
diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
index 067e6081818..edbdf8b9cd6 100644
--- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-hunit";
-  version = "0.9";
-  sha256 = "1ivp9h34cdrahqy8i0y10fa0mqxa947dpbwvhr46sjja053asjxc";
+  version = "0.9.0.1";
+  sha256 = "0rhdjb4fakcbkz4cvmmf679zad9h5yr31i1g9xm1338p6xd4vwcb";
   buildDepends = [ tasty ];
   meta = {
     homepage = "http://documentup.com/feuerbach/tasty";
diff --git a/pkgs/development/libraries/haskell/tasty-program/default.nix b/pkgs/development/libraries/haskell/tasty-program/default.nix
new file mode 100644
index 00000000000..60a88315f72
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tasty-program/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, tasty }:
+
+cabal.mkDerivation (self: {
+  pname = "tasty-program";
+  version = "1.0.1";
+  sha256 = "04q2pp7hwqiiry17dd3ng0i6ikqzpg7hfgf0ckcg33xw450kpx9n";
+  buildDepends = [ filepath tasty ];
+  meta = {
+    homepage = "https://github.com/jstolarek/tasty-program";
+    description = "Use tasty framework to test whether a program executes correctly";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
index f4af3a19097..36b22a30f53 100644
--- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
@@ -1,13 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, QuickCheck, tagged, tasty }:
+{ cabal, pcreLight, QuickCheck, tagged, tasty, tastyHunit }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-quickcheck";
-  version = "0.8.1";
-  sha256 = "1diqc5dmddrfc6i0zqkmlnnhsv8paqy2fdmbx8484qa4ylk5r6bs";
+  version = "0.8.3.2";
+  sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v";
   buildDepends = [ QuickCheck tagged tasty ];
+  testDepends = [ pcreLight tasty tastyHunit ];
   meta = {
+    homepage = "http://documentup.com/feuerbach/tasty";
     description = "QuickCheck support for the Tasty test framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
index 326392718ba..af251514b42 100644
--- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-rerun";
-  version = "1.1.2";
-  sha256 = "0vgx6l9yd21aiwivd6zp67rgjly1j2wwqdmx99p17prr430rm4id";
+  version = "1.1.3";
+  sha256 = "1pgm3h7kyg7q8ydgqqj9sn65ckl6i7cz6a8g1cfighf4gy5y0cj3";
   buildDepends = [
     mtl optparseApplicative reducers split stm tagged tasty
     transformers
diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
index ea1a37d5e9b..9bdf0c52895 100644
--- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix
@@ -4,11 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-smallcheck";
-  version = "0.8";
-  sha256 = "0c4ccmhql118j4dlvy5cmrnma454b0rdv1wq2ds6xhpdhx20h1br";
+  version = "0.8.0.1";
+  sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm";
   buildDepends = [ async smallcheck tagged tasty ];
   meta = {
-    homepage = "https://github.com/feuerbach/tasty";
+    homepage = "http://documentup.com/feuerbach/tasty";
     description = "SmallCheck support for the Tasty test framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix
index 2679c57cff0..98d62036e83 100644
--- a/pkgs/development/libraries/haskell/tasty-th/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-th/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-th";
-  version = "0.1.2";
-  sha256 = "1x3kixv0hnb7icigz2kfq959pivdc4jaaalvdgn8dlyqzkvfjzx4";
+  version = "0.1.3";
+  sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3";
   buildDepends = [ languageHaskellExtract tasty ];
   meta = {
     homepage = "http://github.com/bennofs/tasty-th";
diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 6303320460f..e99c8672c86 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative
-, regexTdfaRc, stm, tagged, unboundedDelays
+, regexTdfaRc, stm, tagged, time, unboundedDelays
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.8.1.3";
-  sha256 = "0hc030ms89w3cl1k3r8nrym3g7sg2n66ch2ljg6d7fwhrsgxnagf";
+  version = "0.10.1";
+  sha256 = "1l8ah7018f3m8css56h59fcly1jhanm5wd0hbgm8mg6pn7rrjml5";
   buildDepends = [
     ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm
-    tagged unboundedDelays
+    tagged time unboundedDelays
   ];
   meta = {
     homepage = "http://documentup.com/feuerbach/tasty";
diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix
index f51ae4f0a3d..4eceef5729d 100644
--- a/pkgs/development/libraries/haskell/template/default.nix
+++ b/pkgs/development/libraries/haskell/template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "template";
-  version = "0.2.0.9";
-  sha256 = "0i1xq6nj240gddbd8d5m42gzix16k81wqmirpy5a4fssnkpwjqnb";
+  version = "0.2.0.10";
+  sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
   buildDepends = [ mtl text ];
   meta = {
     description = "Simple string substitution";
diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix
index 4387ceb423e..d143a66713a 100644
--- a/pkgs/development/libraries/haskell/terminal-size/default.nix
+++ b/pkgs/development/libraries/haskell/terminal-size/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "terminal-size";
-  version = "0.2.1.0";
-  sha256 = "0d41af1is3vdb1kgd8dk82fags86bgs67vkbzpdhjdwa3aimsxgn";
+  version = "0.3.0";
+  sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw";
   meta = {
     description = "Get terminal window height and width";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix
deleted file mode 100644
index 6a065cb6e84..00000000000
--- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ncurses }:
-
-cabal.mkDerivation (self: {
-  pname = "terminfo";
-  version = "0.3.2.6";
-  sha256 = "0ag81rwwwaanxdn9ccanvdi1qnh62vy8y2jbgp5bp95hhgqq887f";
-  extraLibraries = [ ncurses ];
-  meta = {
-    homepage = "http://code.haskell.org/terminfo";
-    description = "Haskell bindings to the terminfo library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
index 9bb59e14a1e..9bb59e14a1e 100644
--- a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix
+++ b/pkgs/development/libraries/haskell/terminfo/default.nix
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
deleted file mode 100644
index 5b822c2418c..00000000000
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, extensibleExceptions, QuickCheck, random
-, testFramework
-}:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework-quickcheck";
-  version = "0.3.0";
-  sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv";
-  buildDepends = [
-    deepseq extensibleExceptions QuickCheck random testFramework
-  ];
-  meta = {
-    homepage = "http://batterseapower.github.com/test-framework/";
-    description = "QuickCheck support for the test-framework package";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
index f53c68e5e7f..a7881a7ebfc 100644
--- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-th-prime";
-  version = "0.0.6";
-  sha256 = "11fk7sk644ky8f22imrfqk8yx07050vy9szha0pnkkjk9i3bqfcq";
+  version = "0.0.7";
+  sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p";
   buildDepends = [ cpphs haskellSrcExts testFramework ];
   meta = {
     description = "Template Haskell for test framework";
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
index e17ca346e7f..b4ba1fd1009 100644
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework";
-  version = "0.8.0.3";
-  sha256 = "136nw5dapsz3jrnw1pdfkjgplxigpr2mrf6i85154vx342zvw5ar";
+  version = "0.8.1.0";
+  sha256 = "1js7jbdw0xijpjlca3yh7mw427s3rjkymm1qi565r928pbsbdkhm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/test-simple/default.nix b/pkgs/development/libraries/haskell/test-simple/default.nix
new file mode 100644
index 00000000000..181c92147e3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-simple/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, executablePath, mtl, QuickCheck, statePlus }:
+
+cabal.mkDerivation (self: {
+  pname = "test-simple";
+  version = "0.1.7";
+  sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
+  buildDepends = [ mtl QuickCheck statePlus ];
+  testDepends = [ executablePath mtl QuickCheck ];
+  meta = {
+    description = "Simple Perl inspired testing";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index fdcc5a6af3b..f8bff923c6d 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, mtl, pandocTypes, parsec, split, syb, temporary
-, text, utf8String, xml
+{ cabal, filepath, mtl, networkUri, pandocTypes, parsec, split, syb
+, temporary, text, utf8String, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.8";
-  sha256 = "1j0i9594fqhl2fzxyndyy6fvrpaqdarq817pxdar0hmccy55b7gb";
+  version = "0.8.0.1";
+  sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl pandocTypes parsec syb xml ];
+  buildDepends = [ mtl networkUri pandocTypes parsec syb xml ];
   testDepends = [ filepath split temporary text utf8String xml ];
   meta = {
     homepage = "http://github.com/jgm/texmath";
diff --git a/pkgs/development/libraries/haskell/text-binary/default.nix b/pkgs/development/libraries/haskell/text-binary/default.nix
new file mode 100644
index 00000000000..9e6205b7001
--- /dev/null
+++ b/pkgs/development/libraries/haskell/text-binary/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, text }:
+
+cabal.mkDerivation (self: {
+  pname = "text-binary";
+  version = "0.1.0";
+  sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z";
+  buildDepends = [ binary text ];
+  meta = {
+    homepage = "https://github.com/kawu/text-binary";
+    description = "Binary instances for text types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
deleted file mode 100644
index 5f63f68cfe7..00000000000
--- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.0.5";
-  sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv";
-  buildDepends = [ deepseq ];
-  doCheck = false;
-  meta = {
-    homepage = "http://bitbucket.org/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix
deleted file mode 100644
index c922db7e959..00000000000
--- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.0.6";
-  sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp";
-  buildDepends = [ deepseq ];
-  doCheck = false;
-  meta = {
-    homepage = "http://bitbucket.org/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix
deleted file mode 100644
index afaa25305a3..00000000000
--- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.1.5";
-  sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l";
-  buildDepends = [ deepseq ];
-  doCheck = false;
-  meta = {
-    homepage = "https://bitbucket.org/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix
deleted file mode 100644
index 6cbed7c1268..00000000000
--- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.3.1";
-  sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix
index 7a61b4bbd3a..3908a7a0cae 100644
--- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix
+++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/1.2.0.3.nix
index f465f4c2afc..d0d2112a5e2 100644
--- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix
+++ b/pkgs/development/libraries/haskell/text/1.2.0.3.nix
@@ -1,17 +1,17 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
+{ cabal, deepseq, HUnit, QuickCheck, quickcheckUnicode, random
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "0.11.2.0";
-  sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p";
+  version = "1.2.0.3";
+  sha256 = "11prz0vli6rclj04vpx5dnzfyznvsrq7i2jmh4sjy37nic5bqf0x";
   buildDepends = [ deepseq ];
   testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
+    deepseq HUnit QuickCheck quickcheckUnicode random testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
   ];
   doCheck = false;
   meta = {
@@ -19,6 +19,5 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
index 0ecd9d70989..e81a8cf921e 100644
--- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
@@ -4,10 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "th-lift-instances";
-  version = "0.1.3";
-  sha256 = "0snqgcdkskwvrsw239j3xq84mwnf5x79kfsn495kprdc6yh3qdkx";
+  version = "0.1.4";
+  sha256 = "02sf7qn1rs33cdf1dl7vpwkhqzhmj8h3naw0ngh2kz05ymk2qng4";
   buildDepends = [ text thLift vector ];
   testDepends = [ doctest filepath QuickCheck text vector ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/bennofs/th-lift-instances/";
     description = "Lift instances for template-haskell for common data types";
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index a27360632b9..28fdedbde75 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -4,11 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "th-lift";
-  version = "0.6.1";
-  sha256 = "0m1ips0n06jnjr5lssq7x4jaa5878sw03l8iaprya37bnkxxak5d";
+  version = "0.7";
+  sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza";
   meta = {
+    homepage = "http://github.com/mboes/th-lift";
     description = "Derive Template Haskell's Lift class for datatypes";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index d93be541aee..8f6da0bd038 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, thLift }:
+{ cabal, thLift, thReifyMany }:
 
 cabal.mkDerivation (self: {
   pname = "th-orphans";
-  version = "0.8.1";
-  sha256 = "1glf1zkiip18l0qdy3856ag7ksbxzd11dzdyq00qrz87kck5y58w";
-  buildDepends = [ thLift ];
+  version = "0.8.2";
+  sha256 = "19d4ls2plxmn5n9c99503mvi99ffp6y6zxi564zf6cdfgw8v73fy";
+  buildDepends = [ thLift thReifyMany ];
   jailbreak = true;
   meta = {
     description = "Orphan instances for TH datatypes";
diff --git a/pkgs/development/libraries/haskell/th-reify-many/default.nix b/pkgs/development/libraries/haskell/th-reify-many/default.nix
new file mode 100644
index 00000000000..940f8c8c29d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/th-reify-many/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, mtl, safe, thExpandSyns }:
+
+cabal.mkDerivation (self: {
+  pname = "th-reify-many";
+  version = "0.1.2";
+  sha256 = "1r7ran4vi2mrhcr6qil89cni6ci3dgm775lfw5ciml3gz1948vz9";
+  buildDepends = [ mtl safe thExpandSyns ];
+  meta = {
+    homepage = "http://github.com/mgsloan/th-reify-many";
+    description = "Recurseively reify template haskell datatype info";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/thread-local-storage/default.nix b/pkgs/development/libraries/haskell/thread-local-storage/default.nix
new file mode 100644
index 00000000000..5405f903e1d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/thread-local-storage/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, atomicPrimops }:
+
+cabal.mkDerivation (self: {
+  pname = "thread-local-storage";
+  version = "0.1.0.3";
+  sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l";
+  testDepends = [ atomicPrimops ];
+  doCheck = false;
+  meta = {
+    description = "Several options for thread-local-storage (TLS) in Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
index fad37db7c9c..5586c28079b 100644
--- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix
+++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
@@ -1,7 +1,7 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsecEnumerator, dataDefault, deepseq
-, filepath, hashable, MonadCatchIOTransformers, network, safe
+, filepath, hashable, MonadCatchIOTransformers, networkUri, safe
 , snapCore, snapServer, stm, text, time, transformers
 , unorderedContainers, utf8String, vault, websockets
 , websocketsSnap
@@ -9,15 +9,15 @@
 
 cabal.mkDerivation (self: {
   pname = "threepenny-gui";
-  version = "0.4.2.0";
-  sha256 = "1746l90h9xkwnwxvfqsr93nax7ihv8lwc4kz203v13rrwckr7m8h";
+  version = "0.5.0.0";
+  sha256 = "0rr826k6p2hbp66qr12sci6km40krbi7lbs293r11jxi0ivj5drd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsecEnumerator dataDefault deepseq filepath hashable
-    MonadCatchIOTransformers network safe snapCore snapServer stm text
-    time transformers unorderedContainers utf8String vault websockets
-    websocketsSnap
+    MonadCatchIOTransformers networkUri safe snapCore snapServer stm
+    text time transformers unorderedContainers utf8String vault
+    websockets websocketsSnap
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index 18763701126..7c18f2c555b 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "thyme";
-  version = "0.3.5.2";
-  sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x";
+  version = "0.3.5.5";
+  sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4";
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
     time vector vectorSpace vectorThUnbox
diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.5.nix
index 5e8d967b8dc..ba77c73874d 100644
--- a/pkgs/development/libraries/haskell/time/1.4.2.nix
+++ b/pkgs/development/libraries/haskell/time/1.5.nix
@@ -1,20 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, Cabal, deepseq, QuickCheck, testFramework
+{ cabal, deepseq, QuickCheck, testFramework
 , testFrameworkQuickcheck2
 }:
 
 cabal.mkDerivation (self: {
   pname = "time";
-  version = "1.4.2";
-  sha256 = "1kpsak2wka23c8591ry6i1d7hmd54s7iw5n6hpx48jhcxf1w199h";
+  version = "1.5";
+  sha256 = "0vj82msx650z473inhr8yav7k38zj7096wam477y77wardx57pdc";
   buildDepends = [ deepseq ];
   testDepends = [
-    Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2
+    deepseq QuickCheck testFramework testFrameworkQuickcheck2
   ];
   doCheck = false;
   meta = {
-    homepage = "http://semantic.org/TimeLib/";
+    homepage = "https://github.com/haskell/time";
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix
index 236cedc9c1f..8b8704c0de7 100644
--- a/pkgs/development/libraries/haskell/timezone-olson/default.nix
+++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timezone-olson";
-  version = "0.1.4";
-  sha256 = "1l5j6gqi9vlx7sifn7vv3by4z9ha3h6klfds4ywqv3dv0gh5725k";
+  version = "0.1.6";
+  sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z";
   buildDepends = [ binary extensibleExceptions time timezoneSeries ];
   meta = {
     homepage = "http://projects.haskell.org/time-ng/";
diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix
index d12ae9aec05..d46f2d81254 100644
--- a/pkgs/development/libraries/haskell/timezone-series/default.nix
+++ b/pkgs/development/libraries/haskell/timezone-series/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timezone-series";
-  version = "0.1.3";
-  sha256 = "0b13a929wrgfl1agkyp3d5wy89aw69zm4l0src7p16rh3kr38w73";
+  version = "0.1.4";
+  sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40";
   buildDepends = [ time ];
   meta = {
     homepage = "http://projects.haskell.org/time-ng/";
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
deleted file mode 100644
index 0d5c97433b2..00000000000
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls-extra";
-  version = "0.6.6";
-  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandom mtl network pem time tls vector
-  ];
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS extra default values and helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix
deleted file mode 100644
index ddb1651fd10..00000000000
--- a/pkgs/development/libraries/haskell/tls/1.1.5.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandom, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls";
-  version = "1.1.5";
-  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
-  buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
-  ];
-  testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS/SSL protocol native implementation (Server and Client)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/1.2.8.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix
deleted file mode 100644
index 22eb615a657..00000000000
--- a/pkgs/development/libraries/haskell/tls/1.2.8.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes
-, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash
-, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom
-, dataDefaultClass, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls";
-  version = "1.2.8";
-  sha256 = "0fm36jn2yri3fn6wadl5v4k0cpnansqlid4fhavgnp6mazf0q5ha";
-  buildDepends = [
-    asn1Encoding asn1Types byteable cereal cipherAes cipherDes
-    cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
-    cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network x509
-    x509Store x509Validation
-  ];
-  testDepends = [
-    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time x509
-    x509Validation
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS/SSL protocol native implementation (Server and Client)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
new file mode 100644
index 00000000000..d9b82d13769
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -0,0 +1,32 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, asn1Encoding, asn1Types, async, byteable, cereal
+, cipherAes, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes
+, cryptohash, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes
+, cryptoRandom, dataDefaultClass, hourglass, mtl, network
+, QuickCheck, tasty, tastyQuickcheck, transformers, x509, x509Store
+, x509Validation
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tls";
+  version = "1.2.13";
+  sha256 = "1djjscmyn3wcnlzz1r0clz2nxa2y23rlyjk30xjsdp0m1sq0vdc3";
+  buildDepends = [
+    asn1Encoding asn1Types async byteable cereal cipherAes cipherDes
+    cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
+    cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network
+    transformers x509 x509Store x509Validation
+  ];
+  testDepends = [
+    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass
+    hourglass mtl QuickCheck tasty tastyQuickcheck x509 x509Validation
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-tls";
+    description = "TLS/SSL protocol native implementation (Server and Client)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/torrent/default.nix b/pkgs/development/libraries/haskell/torrent/default.nix
new file mode 100644
index 00000000000..0133de6c221
--- /dev/null
+++ b/pkgs/development/libraries/haskell/torrent/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bencode, binary, filepath, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "torrent";
+  version = "10000.0.0";
+  sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r";
+  buildDepends = [ bencode binary filepath syb ];
+  meta = {
+    description = "BitTorrent file parser and generater";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix
index eee617ffd2b..8b6623d4639 100644
--- a/pkgs/development/libraries/haskell/tostring/default.nix
+++ b/pkgs/development/libraries/haskell/tostring/default.nix
@@ -1,15 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, text, utf8String }:
+{ cabal, caseInsensitive, text, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "tostring";
-  version = "0.2.0.1";
-  sha256 = "1gihls2xslr9fzad2659zv8af9k4cm84888nhx3z9bwasviyg448";
-  buildDepends = [ text utf8String ];
+  version = "0.2.1";
+  sha256 = "0lvfvjs1q6hndbchij3zn1xi6vb1v53r379jvyc2m92sqqcfnylw";
+  buildDepends = [ caseInsensitive text utf8String ];
   meta = {
     description = "The ToString class";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix
deleted file mode 100644
index 4ff5df9d1c5..00000000000
--- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers-compat";
-  version = "0.3.3";
-  sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps";
-  buildDepends = [ transformers ];
-  meta = {
-    homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index d0dc4ae024d..d0dc4ae024d 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
deleted file mode 100644
index cb3dd611ef3..00000000000
--- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "transformers";
-  version = "0.2.2.0";
-  sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz";
-  meta = {
-    description = "Concrete functor and monad transformers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
index d705040387b..3557941a9a8 100644
--- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers";
-  version = "0.4.1.0";
-  sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
+  version = "0.4.2.0";
+  sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr";
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     description = "Concrete functor and monad transformers";
diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix
index 50d5c61dd09..2ec410dc0a4 100644
--- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix
+++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "traverse-with-class";
-  version = "0.1.1.1";
-  sha256 = "0agdgnibv8q65av2fkr2qm0air8zqmygwpkl30wmay5mqqknzxiq";
+  version = "0.2.0.3";
+  sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g";
   buildDepends = [ transformers ];
   meta = {
     description = "Generic applicative traversals";
diff --git a/pkgs/development/libraries/haskell/trivia/default.nix b/pkgs/development/libraries/haskell/trivia/default.nix
new file mode 100644
index 00000000000..b32653032b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/trivia/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, comonad, distributive }:
+
+cabal.mkDerivation (self: {
+  pname = "trivia";
+  version = "0.0";
+  sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
+  buildDepends = [ comonad distributive ];
+  meta = {
+    homepage = "https://github.com/fumieval/trivia";
+    description = "The trivial monad and comonad";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix
index 974c2fe140b..6997d2229ce 100644
--- a/pkgs/development/libraries/haskell/tuple/default.nix
+++ b/pkgs/development/libraries/haskell/tuple/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tuple";
-  version = "0.2.0.1";
-  sha256 = "1c4vf798rjwshnk04avyjp4rjzj8i9qx4yksv00m3rjy6psr57xg";
+  version = "0.3.0.2";
+  sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
   buildDepends = [ OneTuple ];
   meta = {
     description = "Various functions on tuples";
diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index 0d576680044..31542d43ebc 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -3,27 +3,28 @@
 { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive
 , conduit, conduitExtra, dataDefault, doctest, filepath, hlint
 , hspec, httpClient, httpConduit, httpTypes, lens, lensAeson
-, monadControl, monadLogger, networkUri, resourcet, text, time
-, transformers, transformersBase, twitterTypes
+, monadControl, networkUri, resourcet, text, time, transformers
+, transformersBase, twitterTypes, twitterTypesLens, fetchurl
 }:
 
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
-  version = "0.0.5.6";
-  sha256 = "1l6gk4538nqknrj082hkdy2jp4gzyq3y473p8gg4mm2n67417r9m";
+  version = "0.1.0";
+  sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji";
+  editedCabalFile = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec authenticateOauth conduit conduitExtra dataDefault
-    httpClient httpConduit httpTypes lens lensAeson monadLogger
-    networkUri resourcet text time transformers twitterTypes
+    httpClient httpConduit httpTypes lens lensAeson networkUri
+    resourcet text time transformers twitterTypes twitterTypesLens
   ];
   testDepends = [
     aeson attoparsec authenticateOauth caseInsensitive conduit
     conduitExtra dataDefault doctest filepath hlint hspec httpClient
-    httpConduit httpTypes lens lensAeson monadControl monadLogger
-    networkUri resourcet text time transformers transformersBase
-    twitterTypes
+    httpConduit httpTypes lens lensAeson monadControl networkUri
+    resourcet text time transformers transformersBase twitterTypes
+    twitterTypesLens
   ];
   meta = {
     homepage = "https://github.com/himura/twitter-conduit";
@@ -31,7 +32,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix
new file mode 100644
index 00000000000..85407fc00b2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, lens, text, twitterTypes }:
+
+cabal.mkDerivation (self: {
+  pname = "twitter-types-lens";
+  version = "0.6.0";
+  sha256 = "0n2z7v2mcvj2czkszkp87sf7cv4zj82yccygs9ah5ax28dw823v3";
+  buildDepends = [ lens text twitterTypes ];
+  meta = {
+    homepage = "https://github.com/himura/twitter-types-lens";
+    description = "Twitter JSON types (lens powered)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index 4a3df6f1b9f..9ed6a77ac2d 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, filepath, httpTypes, HUnit
-, testFramework, testFrameworkHunit, testFrameworkThPrime, text
+{ cabal, aeson, attoparsec, filepath, HUnit, testFramework
+, testFrameworkHunit, testFrameworkThPrime, text
 , unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.5.0";
-  sha256 = "0nnis96rki60ily7ydq155nawmhz7dn51d1d3hwikb1vz16ji47a";
-  buildDepends = [ aeson httpTypes text unorderedContainers ];
+  version = "0.6.0";
+  sha256 = "0yvs57f3m0nq11qpxziazp9r95g1v231d2djmch9c5d8g22cjvdn";
+  buildDepends = [ aeson text unorderedContainers ];
   testDepends = [
-    aeson attoparsec filepath httpTypes HUnit testFramework
-    testFrameworkHunit testFrameworkThPrime text unorderedContainers
+    aeson attoparsec filepath HUnit testFramework testFrameworkHunit
+    testFrameworkThPrime text unorderedContainers
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/type-aligned/default.nix b/pkgs/development/libraries/haskell/type-aligned/default.nix
new file mode 100644
index 00000000000..a1e547ca0e2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/type-aligned/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "type-aligned";
+  version = "0.9.3";
+  sha256 = "1wkjbb6giq71j5j72w4018hifn58gpgwxppbhgi5a8xdcxp8afl0";
+  meta = {
+    homepage = "https://github.com/atzeus/type-aligned";
+    description = "Various type-aligned sequence data structures";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/typography-geometry/default.nix b/pkgs/development/libraries/haskell/typography-geometry/default.nix
new file mode 100644
index 00000000000..c0b5b5fb1ab
--- /dev/null
+++ b/pkgs/development/libraries/haskell/typography-geometry/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, parallel, polynomialsBernstein, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "typography-geometry";
+  version = "1.0.0";
+  sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf";
+  buildDepends = [ parallel polynomialsBernstein vector ];
+  meta = {
+    description = "Drawings for printed text documents";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix
new file mode 100644
index 00000000000..351df38fc0d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unbound-generics/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, contravariant, mtl, QuickCheck, tasty, tastyHunit
+, tastyQuickcheck, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "unbound-generics";
+  version = "0.0.2";
+  sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai";
+  buildDepends = [ contravariant mtl transformers ];
+  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
+  meta = {
+    homepage = "http://github.com/lambdageek/unbound-generics";
+    description = "Reimplementation of Unbound using GHC Generics";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unification-fd/default.nix b/pkgs/development/libraries/haskell/unification-fd/default.nix
new file mode 100644
index 00000000000..5489310e332
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unification-fd/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, logict, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "unification-fd";
+  version = "0.9.0";
+  sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki";
+  buildDepends = [ logict mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Simple generic unification algorithms";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unique/default.nix b/pkgs/development/libraries/haskell/unique/default.nix
new file mode 100644
index 00000000000..0325a0da75d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unique/default.nix
@@ -0,0 +1,14 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "Unique";
+  version = "0.2";
+  sha256 = "0qylqb71gkvfwnnz4ij22x79y583y409fszqnyqd6dc90gycfm98";
+  meta = {
+    description = "It provides the functionality like unix \"uniq\" utility";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix
index c5d5262750d..2024aacf7ff 100644
--- a/pkgs/development/libraries/haskell/units/default.nix
+++ b/pkgs/development/libraries/haskell/units/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "units";
-  version = "2.1";
-  sha256 = "1qrjc57j15ras0v43cpd7qhh9nzh9dbnkaik6s4c8aj8nkhgd8vs";
+  version = "2.2";
+  sha256 = "1hd7klv0h2rsq971rbghvgy2921bf0zxikdsl26qw08yb0zirvza";
   buildDepends = [
     mtl multimap parsec singletons syb thDesugar vectorSpace
   ];
@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
     thDesugar vectorSpace
   ];
   meta = {
-    homepage = "http://www.cis.upenn.edu/~eir/packages/units";
+    homepage = "https://github.com/goldfirere/units";
     description = "A domain-specific type system for dimensional analysis";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix
index caaf6c1bde5..c8fa0d244fb 100644
--- a/pkgs/development/libraries/haskell/unix-memory/default.nix
+++ b/pkgs/development/libraries/haskell/unix-memory/default.nix
@@ -1,17 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
-}:
+{ cabal, mtl, QuickCheck, tasty, tastyHunit, tastyQuickcheck }:
 
 cabal.mkDerivation (self: {
   pname = "unix-memory";
-  version = "0.1.1";
-  sha256 = "02jmccs7mcg2lhpnb1ps7ycxzmn46b4drf994vv0pawwjrkrhnhk";
-  testDepends = [
-    HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
+  version = "0.1.2";
+  sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
+  testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-unix-memory";
     description = "Unix memory syscalls";
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 60f0f21b292..74bfb292775 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.3.3";
-  sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x";
+  version = "0.3.4";
+  sha256 = "1bni03bzayg3vwj6mwcl4z41zixv8nida8jc3vkv41fr7mzb24g5";
   buildDepends = [ binary ];
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix
deleted file mode 100644
index d7040ac611a..00000000000
--- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "unordered-containers";
-  version = "0.2.3.0";
-  sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd";
-  buildDepends = [ deepseq hashable ];
-  testDepends = [
-    ChasingBottoms hashable HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/tibbe/unordered-containers";
-    description = "Efficient hashing-based container types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix
deleted file mode 100644
index 9cb06b029e6..00000000000
--- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "unordered-containers";
-  version = "0.2.4.0";
-  sha256 = "1x6djgmawzq8i8spib729pdlpnxyi4gz4p08lyn6jhfqjq6fpsil";
-  buildDepends = [ deepseq hashable ];
-  testDepends = [
-    ChasingBottoms hashable HUnit QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/tibbe/unordered-containers";
-    description = "Efficient hashing-based container types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index 70f00b68d42..07f1b8beb97 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.2.5.0";
-  sha256 = "0y85a9zg77h05c5ajchvfazg84ksvyi92r6bbmh09qzlf7mlb4bj";
+  version = "0.2.5.1";
+  sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f";
   buildDepends = [ deepseq hashable ];
   testDepends = [
     ChasingBottoms hashable HUnit QuickCheck testFramework
diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix
index 7a86bcd2f65..d6e445ebd4e 100644
--- a/pkgs/development/libraries/haskell/uri-encode/default.nix
+++ b/pkgs/development/libraries/haskell/uri-encode/default.nix
@@ -9,9 +9,11 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ networkUri text utf8String ];
+  jailbreak = true;
   meta = {
     description = "Unicode aware uri-encoding";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix
index 11276f2bc4a..633818d9518 100644
--- a/pkgs/development/libraries/haskell/uri/default.nix
+++ b/pkgs/development/libraries/haskell/uri/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uri";
-  version = "0.1.6.2";
-  sha256 = "0f2ms8awm4x7pw8ms6in0mxspqmnhv8bxas0947rkrzc5m9k0h3s";
+  version = "0.1.6.3";
+  sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j";
   buildDepends = [ parsec safe utf8String ];
   meta = {
     homepage = "http://gitorious.org/uri";
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
index 74ae443f8a6..e60af0e3152 100644
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ b/pkgs/development/libraries/haskell/urlencoded/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Generate or process x-www-urlencoded data";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index eb36f5555ae..0c65e8dc1df 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuid";
-  version = "1.3.3";
-  sha256 = "12sfspmrnpqbwwscv3w41pkkdbfvy1aaa84y7is0d3ffk5rll80m";
+  version = "1.3.7";
+  sha256 = "01idfi9vdmcz8fkgnfa0bpz6khx4x2r0rzynzha42irl7881da21";
   buildDepends = [
     binary cryptohash deepseq hashable networkInfo random time
   ];
@@ -19,7 +19,7 @@ cabal.mkDerivation (self: {
   jailbreak = true;
   doCheck = false;
   meta = {
-    homepage = "http://projects.haskell.org/uuid/";
+    homepage = "https://github.com/aslatter/uuid";
     description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix
index e116dd529cf..87f0ed126fa 100644
--- a/pkgs/development/libraries/haskell/vado/default.nix
+++ b/pkgs/development/libraries/haskell/vado/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vado";
-  version = "0.0.1";
-  sha256 = "11b8glzzpzhm8cfw3vyvvvz3h0xid5r3prwhnvplajr7v3r562h2";
+  version = "0.0.3";
+  sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ attoparsec filepath text ];
@@ -15,7 +15,5 @@ cabal.mkDerivation (self: {
     description = "Runs commands on remote machines using ssh";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix
new file mode 100644
index 00000000000..903165b2f5f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/validation/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, bifunctors, doctest, filepath, lens, QuickCheck
+, semigroupoids, semigroups, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "validation";
+  version = "0.4.2";
+  sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm";
+  buildDepends = [
+    bifunctors lens semigroupoids semigroups transformers
+  ];
+  testDepends = [ doctest filepath QuickCheck ];
+  meta = {
+    homepage = "https://github.com/tonymorris/validation";
+    description = "A data-type like Either but with an accumulating Applicative";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
index 318f369fc3e..5e1d6ebf5b8 100644
--- a/pkgs/development/libraries/haskell/vcsgui/default.nix
+++ b/pkgs/development/libraries/haskell/vcsgui/default.nix
@@ -1,20 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, gtk3, mtl, vcswrapper }:
+{ cabal, filepath, gtk3, mtl, text, vcswrapper }:
 
 cabal.mkDerivation (self: {
   pname = "vcsgui";
-  version = "0.0.4";
-  sha256 = "12hfdhnv3xc2dyqk76lyx5ggiygyap4hm50sd6qmwfjj3f2w6b98";
+  version = "0.1.1.0";
+  sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ filepath gtk3 mtl vcswrapper ];
+  buildDepends = [ filepath gtk3 mtl text vcswrapper ];
   meta = {
     homepage = "https://github.com/forste/haskellVCSGUI";
     description = "GUI library for source code management systems";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix
index 75336ef8816..335c5b319bc 100644
--- a/pkgs/development/libraries/haskell/vcswrapper/default.nix
+++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix
@@ -4,11 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "vcswrapper";
-  version = "0.0.4";
-  sha256 = "130pmzxdsqv703k2g197vd5rl60fwkqqv2xck66ygb932wsq3fnk";
+  version = "0.1.1";
+  sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath hxt mtl parsec split text ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/forste/haskellVCSWrapper";
     description = "Wrapper for source code management systems";
diff --git a/pkgs/development/libraries/haskell/vector-fftw/default.nix b/pkgs/development/libraries/haskell/vector-fftw/default.nix
new file mode 100644
index 00000000000..f1bdbfb3d1e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector-fftw/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, fftw, primitive, storableComplex, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "vector-fftw";
+  version = "0.1.3.2";
+  sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
+  buildDepends = [ primitive storableComplex vector ];
+  extraLibraries = [ fftw ];
+  meta = {
+    homepage = "http://hackage.haskell.org/package/vector-fftw";
+    description = "A binding to the fftw library for one-dimensional vectors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
deleted file mode 100644
index 0f48fbecf06..00000000000
--- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.10.0.1";
-  sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc";
-  buildDepends = [ deepseq primitive ];
-  meta = {
-    homepage = "http://code.haskell.org/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix
deleted file mode 100644
index e93160ff6d0..00000000000
--- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, deepseq, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.10.11.0";
-  sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j";
-  buildDepends = [ deepseq primitive ];
-  meta = {
-    homepage = "https://github.com/haskell/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.2.nix b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix
new file mode 100644
index 00000000000..011c9b367fa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix
@@ -0,0 +1,23 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, deepseq, primitive, QuickCheck, random, testFramework
+, testFrameworkQuickcheck2, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "vector";
+  version = "0.10.12.2";
+  sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25";
+  buildDepends = [ deepseq primitive ];
+  testDepends = [
+    QuickCheck random testFramework testFrameworkQuickcheck2
+    transformers
+  ];
+  configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}";
+  meta = {
+    homepage = "https://github.com/haskell/vector";
+    description = "Efficient Arrays";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
index d07f27bee31..42796bea548 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.10.9.3";
   sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
   buildDepends = [ deepseq primitive ];
+  configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}";
   meta = {
     homepage = "https://github.com/haskell/vector";
     description = "Efficient Arrays";
diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix
index 46ea723641c..6ba3c4a86ce 100644
--- a/pkgs/development/libraries/haskell/vinyl/default.nix
+++ b/pkgs/development/libraries/haskell/vinyl/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vinyl";
-  version = "0.4.3";
-  sha256 = "1npcpvr94l2gpk9z4y527raf2p3d6099m231vw0myci37ljnjgdf";
+  version = "0.5";
+  sha256 = "0jm31cynhl8ggmi6ndj7lhfm85cqml67svxm4v3kc8mnw5gj3c59";
   testDepends = [ doctest lens singletons ];
   meta = {
     description = "Extensible Records";
diff --git a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix
new file mode 100644
index 00000000000..4d8188792ac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix
@@ -0,0 +1,19 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aws, httpConduit, httpTypes, resourcet, text, time
+, xmlConduit, xmlHamlet
+}:
+
+cabal.mkDerivation (self: {
+  pname = "vk-aws-route53";
+  version = "0.1.2";
+  sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
+  buildDepends = [
+    aws httpConduit httpTypes resourcet text time xmlConduit xmlHamlet
+  ];
+  meta = {
+    description = "Amazon Route53 DNS service plugin for the aws package";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix
index 13483375823..52a57bd0cae 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
+++ b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix
@@ -3,16 +3,15 @@
 { cabal }:
 
 cabal.mkDerivation (self: {
-  pname = "HUnit";
-  version = "1.2.4.2";
-  sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x";
+  pname = "vk-posix-pty";
+  version = "0.2.1";
+  sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97";
   isLibrary = true;
   isExecutable = true;
   meta = {
-    homepage = "http://hunit.sourceforge.net/";
-    description = "A unit testing framework for Haskell";
+    homepage = "https://github.com/proger/posix-pty/tree/fork";
+    description = "Pseudo terminal interaction with subprocesses";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index f6cc8eaa4d9..16f4bfeb8ef 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "void";
-  version = "0.6.1";
-  sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42";
+  version = "0.7";
+  sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq";
   buildDepends = [ hashable semigroups ];
   meta = {
     homepage = "http://github.com/ekmett/void";
diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index e8775c7d112..33f0b906973 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -1,17 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text
-, time, vector, vty
+{ cabal, dataDefault, filepath, mtl, QuickCheck, random, regexBase
+, stm, text, time, vector, vty
 }:
 
 cabal.mkDerivation (self: {
   pname = "vty-ui";
-  version = "1.7.1";
-  sha256 = "1xgv2psbqcqpzgj1f1pis6hr7yvny8y9ajimllam7zsk6kbhngzz";
+  version = "1.8";
+  sha256 = "08jrcwml5g74mp4wy7kqp9jd5mfbxl04517v5354jiwn4dc77azm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    filepath mtl QuickCheck random regexBase stm text time vector vty
+    dataDefault filepath mtl QuickCheck random regexBase stm text time
+    vector vty
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix
deleted file mode 100644
index 1eccdd58fef..00000000000
--- a/pkgs/development/libraries/haskell/vty/4.7.5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random
-, stringQq, terminfo, utf8String, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "vty";
-  version = "4.7.5";
-  sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    deepseq mtl parallel parsec stringQq terminfo utf8String vector
-  ];
-  testDepends = [
-    Cabal deepseq mtl parallel parsec QuickCheck random terminfo
-    utf8String vector
-  ];
-  jailbreak = true;
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/coreyoconnor/vty";
-    description = "A simple terminal UI library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vty/5.2.1.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 6034807929e..d91f04f6f26 100644
--- a/pkgs/development/libraries/haskell/vty/5.2.1.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty";
-  version = "5.2.1";
-  sha256 = "15xg7yznizscvyjlnivakrzk60l0a0pigax7sgnn2ab79rfzcxww";
+  version = "5.2.6";
+  sha256 = "05d5vczifyzg36w1d4wwa9h27fpwgxaxws5ilmg47gq4zr1a6yxi";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,12 +23,12 @@ cabal.mkDerivation (self: {
     testFramework testFrameworkHunit testFrameworkSmallcheck text
     utf8String vector
   ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/coreyoconnor/vty";
     description = "A simple terminal UI library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 530f9828ae5..ce99df0390e 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "3.0.0";
-  sha256 = "117r2ps440i2i156k50b674fkny2ywwbbla6ry0km041604cl733";
+  version = "3.0.0.3";
+  sha256 = "0krvjnysmfaqds715mp6lhh5am327swi2vja5insmn08da87zhnb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix
index 6174784a134..5c5c1134396 100644
--- a/pkgs/development/libraries/haskell/wai-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-conduit";
-  version = "3.0.0";
-  sha256 = "0v92jyxkigq7yj3hzy7kg360036nav986ny7b558l6j7zc90jsdg";
+  version = "3.0.0.1";
+  sha256 = "0m5mfr6plzb873by4pab9d4g4cwfcpxl6g5c5qyljb8sydfzhhym";
   buildDepends = [ blazeBuilder conduit httpTypes transformers wai ];
   meta = {
     homepage = "https://github.com/yesodweb/wai";
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 39514c8a3bd..480a6101487 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,16 +1,16 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, ansiTerminal, base64Bytestring, blazeBuilder
-, caseInsensitive, dataDefault, dataDefaultClass, deepseq
-, fastLogger, hspec, httpTypes, HUnit, liftedBase, network
-, resourcet, streamingCommons, stringsearch, text, time
-, transformers, void, wai, waiLogger, word8, zlib
+, caseInsensitive, dataDefaultClass, deepseq, fastLogger, hspec
+, httpTypes, HUnit, liftedBase, network, resourcet
+, streamingCommons, stringsearch, text, time, transformers, void
+, wai, waiLogger, word8, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "3.0.2.1";
-  sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca";
+  version = "3.0.2.2";
+  sha256 = "0lbm5z4fzsss1y4749598ish967j64nfvlvdmgj27nvshi7qn4s9";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder caseInsensitive
     dataDefaultClass deepseq fastLogger httpTypes liftedBase network
@@ -18,8 +18,8 @@ cabal.mkDerivation (self: {
     wai waiLogger word8
   ];
   testDepends = [
-    blazeBuilder dataDefault fastLogger hspec httpTypes HUnit resourcet
-    text transformers wai zlib
+    fastLogger hspec httpTypes HUnit resourcet text transformers wai
+    zlib
   ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
index 4c89a25dae8..e9db0b365be 100644
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -4,12 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-middleware-static";
-  version = "0.6.0";
-  sha256 = "1rsy8qkxcjqdpzqkar0smyy49p8vqapi47k8d24101lz3rym6018";
+  version = "0.6.0.1";
+  sha256 = "1ylf2nm535d3dw0ksa9dfz1b4b78mqzkdrpdfd5pxswcqbgs266d";
   buildDepends = [ filepath httpTypes mtl text wai ];
   jailbreak = true;
   meta = {
-    homepage = "https://github.com/scotty-web/scotty";
+    homepage = "https://github.com/scotty-web/wai-middleware-static";
     description = "WAI middleware that serves requests to static files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/wai-util/default.nix b/pkgs/development/libraries/haskell/wai-util/default.nix
new file mode 100644
index 00000000000..fc9b964b26d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-util/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, httpAccept
+, httpTypes, mimeMail, network, resourcet, text, transformers, wai
+, waiExtra
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-util";
+  version = "0.7";
+  sha256 = "1lmx4f7174hzy4a60r2hq9vm9xhbg8vnb9cyi77zyb5p59s53p73";
+  buildDepends = [
+    aeson blazeBuilder caseInsensitive conduit httpAccept httpTypes
+    mimeMail network resourcet text transformers wai waiExtra
+  ];
+  meta = {
+    homepage = "https://github.com/singpolyma/wai-util";
+    description = "Collection of utility functions for use with WAI";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
index a60a6e9dda0..d225b70f0e7 100644
--- a/pkgs/development/libraries/haskell/wai-websockets/default.nix
+++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix
@@ -1,20 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes
-, ioStreams, network, text, transformers, wai, waiAppStatic, warp
-, websockets
+, network, text, transformers, wai, waiAppStatic, warp, websockets
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-websockets";
-  version = "3.0.0.1";
-  sha256 = "01rbwyx2ks6hdaw5qw7dibidyw4bh85s2gzqy4rhmxpdcnmxxmnz";
+  version = "3.0.0.2";
+  sha256 = "1p0ylwc19g63z4qijnis1x5wys5h2avim6s2fn7m2ihrlc3pkhsb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeBuilder caseInsensitive fileEmbed httpTypes ioStreams network
-    text transformers wai waiAppStatic warp websockets
+    blazeBuilder caseInsensitive fileEmbed httpTypes network text
+    transformers wai waiAppStatic warp websockets
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "Provide a bridge betweeen WAI and the websockets package";
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index 1c63b4ce596..2effc4fc83b 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "3.0.1.1";
-  sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0";
+  version = "3.0.2";
+  sha256 = "0k67yzr05d6vjwqamnzzggk1mlj9wabqrm26dqbrrc40jj3kddgw";
   buildDepends = [ blazeBuilder httpTypes network text vault ];
   testDepends = [ blazeBuilder hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index 4eca4c8c192..8b4668dcf5a 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "3.0.0";
-  sha256 = "14gm43a811v9h87ia2b9y9kynafrvq3yw89gswlj832469jx9sfw";
+  version = "3.0.1";
+  sha256 = "0s87ricslidyg6m17q5mllpl47v0d8mvvd6psq4izz5l27dg2xpy";
   buildDepends = [
     cprngAes dataDefaultClass network streamingCommons tls wai warp
   ];
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index bf53afbe8c8..ae363291803 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "3.0.1.1";
-  sha256 = "1sgmcyk9ngys990287wsga3kk6wf29sj414w6jmv8a4sal202mqc";
+  version = "3.0.4";
+  sha256 = "0kykf3nki9a7mqr1z9jhk4z0cbzlmk9lyc7zw5y36285mx9id0dr";
   buildDepends = [
     autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes
     network simpleSendfile streamingCommons text unixCompat void wai
diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
index bed9467a9d2..88f26878280 100644
--- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes-boomerang";
-  version = "0.28.2";
-  sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05";
+  version = "0.28.3";
+  sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn";
   buildDepends = [ boomerang mtl parsec text webRoutes ];
   meta = {
     description = "Library for maintaining correctness and composability of URLs within an application";
diff --git a/pkgs/development/libraries/haskell/web-routes-happstack/default.nix b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
new file mode 100644
index 00000000000..299357e2073
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes-happstack/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, happstackServer, text, webRoutes }:
+
+cabal.mkDerivation (self: {
+  pname = "web-routes-happstack";
+  version = "0.23.9";
+  sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
+  buildDepends = [ happstackServer text webRoutes ];
+  meta = {
+    description = "Adds support for using web-routes with Happstack";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index 12f2212c8e3..b29d42dc961 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.27.6";
-  sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp";
+  version = "0.27.7";
+  sha256 = "0q6rl8vasbkq24jdfdq6jrjivcqqmdy34w8zw5zczmscpyjqf0zb";
   buildDepends = [
     blazeBuilder httpTypes mtl parsec split text utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix
index d3a041d9a8d..7433f165e4d 100644
--- a/pkgs/development/libraries/haskell/webdriver/default.nix
+++ b/pkgs/development/libraries/haskell/webdriver/default.nix
@@ -2,28 +2,28 @@
 
 { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault
 , directoryTree, exceptions, filepath, httpClient, httpTypes
-, liftedBase, monadControl, mtl, network, parallel, scientific
-, temporary, text, time, transformers, transformersBase
+, liftedBase, monadControl, mtl, network, networkUri, parallel
+, scientific, temporary, text, time, transformers, transformersBase
 , unorderedContainers, vector, zipArchive
 }:
 
 cabal.mkDerivation (self: {
   pname = "webdriver";
-  version = "0.6.0.1";
-  sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1";
+  version = "0.6.0.4";
+  sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf";
   buildDepends = [
     aeson attoparsec base64Bytestring cond dataDefault directoryTree
     exceptions filepath httpClient httpTypes liftedBase monadControl
-    mtl network scientific temporary text time transformers
+    mtl network networkUri scientific temporary text time transformers
     transformersBase unorderedContainers vector zipArchive
   ];
   testDepends = [ parallel text ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/kallisti-dev/hs-webdriver";
     description = "a Haskell client for the Selenium WebDriver protocol";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix
index 0d47aeb7955..63b8566b924 100644
--- a/pkgs/development/libraries/haskell/webkit/default.nix
+++ b/pkgs/development/libraries/haskell/webkit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "webkit";
-  version = "0.13.0.0";
-  sha256 = "152rbb01fq9cxjxqm26s1qcv3nashzymkbjy52ql06y7s1n5i3q5";
+  version = "0.13.1.1";
+  sha256 = "0652as9wq0ajaqmcx14y2svishccgrywyagrbzga7m06r3h94dz5";
   buildDepends = [ cairo glib gtk mtl pango text ];
   buildTools = [ gtk2hsBuildtools ];
   pkgconfigDepends = [ webkit ];
diff --git a/pkgs/development/libraries/haskell/webkitgtk3/default.nix b/pkgs/development/libraries/haskell/webkitgtk3/default.nix
new file mode 100644
index 00000000000..4f1d8a15cf7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/webkitgtk3/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, cairo, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
+, webkitgtk
+}:
+
+cabal.mkDerivation (self: {
+  pname = "webkitgtk3";
+  version = "0.13.1.1";
+  sha256 = "0lm52xsgf3sayj5d32fyf9fy89zinn7c4z6rq4qw2bsnsdw8hcyb";
+  buildDepends = [ cairo glib gtk3 mtl pango text ];
+  buildTools = [ gtk2hsBuildtools ];
+  pkgconfigDepends = [ webkitgtk ];
+  meta = {
+    homepage = "http://projects.haskell.org/gtk2hs/";
+    description = "Binding to the Webkit library";
+    license = self.stdenv.lib.licenses.lgpl21;
+    platforms = self.stdenv.lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix
index bd68d64b757..72bd7feb781 100644
--- a/pkgs/development/libraries/haskell/websockets-snap/default.nix
+++ b/pkgs/development/libraries/haskell/websockets-snap/default.nix
@@ -1,17 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, enumerator, ioStreams, mtl, snapCore
-, snapServer, websockets
-}:
+{ cabal, enumerator, mtl, snapCore, snapServer, websockets }:
 
 cabal.mkDerivation (self: {
   pname = "websockets-snap";
-  version = "0.8.2.2";
-  sha256 = "1r5y5czpxrc06i7w3y3fa4dlqmxdypcc8yplg28cv4k3mkfa1hf4";
-  buildDepends = [
-    blazeBuilder enumerator ioStreams mtl snapCore snapServer
-    websockets
-  ];
+  version = "0.9.0.0";
+  sha256 = "051y62xga7drrfllv10giyr49z1z9ql8681dgwynmdad5x6asf85";
+  buildDepends = [ enumerator mtl snapCore snapServer websockets ];
+  jailbreak = true;
   meta = {
     description = "Snap integration for the websockets library";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index 5db1ec41613..79e03b748e6 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -1,24 +1,25 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, attoparsec, base64Bytestring, binary, blazeBuilder
-, caseInsensitive, entropy, HUnit, ioStreams, mtl, network
-, QuickCheck, random, SHA, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text
+, caseInsensitive, entropy, HUnit, mtl, network, QuickCheck, random
+, SHA, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "websockets";
-  version = "0.8.2.6";
-  sha256 = "074d0wkxy2qyi8w9cjgbalqi8b21wf5ak71lcnh94iw76dfxbizf";
+  version = "0.9.2.1";
+  sha256 = "11pdh5dc7r9svg789yx66lff5gcmzs6yg7m74ciz3ybb2i4p855s";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy ioStreams mtl network random SHA text
+    entropy mtl network random SHA text
   ];
   testDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
-    entropy HUnit ioStreams mtl network QuickCheck random SHA
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 text
+    entropy HUnit mtl network QuickCheck random SHA testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 text
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jaspervdj.be/websockets";
     description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
index ac8d69ebd3f..0507b1ea1a6 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-extras";
-  version = "3.5";
-  sha256 = "172xp23j3w8jbd7h0sna9g8p4d6xwy8154gqj93ycz2907r2kwb7";
+  version = "3.5.0.3";
+  sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp";
   buildDepends = [ nats semigroupoids semigroups text utf8String ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
index 37dc11b1f0f..6f2e62008f5 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-terminfo";
-  version = "3.7.1.1";
-  sha256 = "1mjnbkk3cw2v7nda7qxdkl21pmclz6m17sviqp4qf3rc8rgin3zd";
+  version = "3.7.1.3";
+  sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv";
   buildDepends = [
     nats semigroups terminfo text transformers wlPprintExtras
   ];
diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
index 2d6d48d41ae..9ec7c2e1743 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
@@ -4,9 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-text";
-  version = "1.1.0.2";
-  sha256 = "0wbfqp38as2qpn66sq4hvl3hzvj66v301cz9rmgnx2i62r0a3s81";
+  version = "1.1.0.3";
+  sha256 = "1ghrkqdfsdkn71mpipbxiaar2gd8mdyd3dxbsz68awwnlpapy4f3";
   buildDepends = [ text ];
+  jailbreak = true;
   meta = {
     description = "A Wadler/Leijen Pretty Printer for Text values";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/word-trie/default.nix b/pkgs/development/libraries/haskell/word-trie/default.nix
new file mode 100644
index 00000000000..f817254aa62
--- /dev/null
+++ b/pkgs/development/libraries/haskell/word-trie/default.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, derive, hspec, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "word-trie";
+  version = "0.2.0.4";
+  sha256 = "0qgljhl2pj54mhsan9w6gchf3l94rs2c5bi9f93q1nz55va1027f";
+  buildDepends = [ binary derive ];
+  testDepends = [ binary derive hspec QuickCheck ];
+  meta = {
+    homepage = "https://github.com/yi-editor/word-trie";
+    description = "Implementation of a finite trie over words";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/wordexp/default.nix b/pkgs/development/libraries/haskell/wordexp/default.nix
new file mode 100644
index 00000000000..7d03b1adea5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wordexp/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, c2hs, semigroups }:
+
+cabal.mkDerivation (self: {
+  pname = "wordexp";
+  version = "0.2.0.0";
+  sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
+  buildDepends = [ semigroups ];
+  buildTools = [ c2hs ];
+  meta = {
+    description = "wordexp(3) wrappers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
index d0a3e94fcd2..8b6e7151273 100644
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -1,24 +1,31 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, doctest, exceptions, filepath
-, httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson
-, mimeTypes, temporary, testFramework, testFrameworkHunit, text
-, time
+{ cabal, aeson, aesonPretty, aesonQq, attoparsec, base16Bytestring
+, base64Bytestring, byteable, caseInsensitive, cryptohash, doctest
+, exceptions, filepath, hashable, httpClient, httpClientTls
+, httpTypes, HUnit, lens, lensAeson, mimeTypes, networkInfo
+, PSQueue, QuickCheck, snapCore, snapServer, temporary
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, time, transformers, unixCompat, unorderedContainers, uuid
 }:
 
 cabal.mkDerivation (self: {
   pname = "wreq";
-  version = "0.2.0.0";
-  sha256 = "0ajrwn4yn6h65v97jfhbb4x3j307gdf34dyjnnhsrmsf7911l44d";
+  version = "0.3.0.1";
+  sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec exceptions httpClient httpClientTls httpTypes lens
-    lensAeson mimeTypes text time
+    aeson attoparsec base16Bytestring byteable caseInsensitive
+    cryptohash exceptions hashable httpClient httpClientTls httpTypes
+    lens lensAeson mimeTypes PSQueue text time unorderedContainers
   ];
   testDepends = [
-    aeson doctest filepath httpClient httpTypes HUnit lens lensAeson
-    temporary testFramework testFrameworkHunit text
+    aeson aesonPretty aesonQq base64Bytestring caseInsensitive doctest
+    filepath hashable httpClient httpTypes HUnit lens lensAeson
+    networkInfo QuickCheck snapCore snapServer temporary testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 text transformers
+    unixCompat uuid
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
new file mode 100644
index 00000000000..72a8648cab6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch
@@ -0,0 +1,10 @@
+Only in wxc-0.91.0.0: dist
+diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs
+--- wxc-0.91.0.0-orig/Setup.hs	2014-10-31 13:30:15.514809137 +0100
++++ wxc-0.91.0.0/Setup.hs	2014-10-31 13:33:53.606372005 +0100
+@@ -507,5 +507,3 @@
+         inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest

+ 

+     installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)

+-    ldconfig inst_lib_dir

+-

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index c10897b4b11..4e824124050 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -4,15 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "wx";
-  version = "0.90.1.0";
-  sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9";
+  version = "0.91.0.0";
+  sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy";
   buildDepends = [ stm wxcore ];
-  preConfigure = "find . -type f -exec touch {} +";
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
index 4026a892f6e..2a184043251 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -4,11 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "wxc";
-  version = "0.90.1.1";
-  sha256 = "0cvfphskvsq3lsl24h6jh8r6yw5jg8qa9wdc883yasfvmzmxwwgc";
+  version = "0.91.0.0";
+  sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa";
   buildDepends = [ wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
   noHaddock = true;
+  patches = [ ./no-ldconfig.patch ];
   postInstall = ''
     cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so
   '';
@@ -17,6 +18,6 @@ cabal.mkDerivation (self: {
     description = "wxHaskell C++ wrapper";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 8fc4df1a0ce..7d1bebe1d88 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -6,18 +6,15 @@
 
 cabal.mkDerivation (self: {
   pname = "wxcore";
-  version = "0.90.1.1";
-  sha256 = "1ma6vjf87b493vz3sj6hxzifqixk62n6b5gvixpfzfig1lysddgp";
+  version = "0.91.0.0";
+  sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz";
   buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
-  patchPhase = ''
-    sed -i -e 's|array >= .*,|array,|' wxcore.cabal
-  '';
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell core";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = with self.stdenv.lib.maintainers; [ andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index f89d39ca5ed..c178207e699 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wxdirect";
-  version = "0.90.1.1";
-  sha256 = "0ibhxl4n66w094jhca01z2vmibgz0nn7qddgxzqngvajzjvnha98";
+  version = "0.91.0.0";
+  sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath parsec strict time ];
diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
index 9b060630edb..36486dbf40e 100644
--- a/pkgs/development/libraries/haskell/x509-store/default.nix
+++ b/pkgs/development/libraries/haskell/x509-store/default.nix
@@ -1,15 +1,15 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl
-, pem, time, x509
+, pem, x509
 }:
 
 cabal.mkDerivation (self: {
   pname = "x509-store";
-  version = "1.4.4";
-  sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8";
+  version = "1.5.0";
+  sha256 = "1w9sqb007s4avjzvrdwq13a4c528h7h2lg3m8cl31syrgznc9ny5";
   buildDepends = [
-    asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
+    asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem x509
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix
index b36b8c9cdfb..87bb4ed1fec 100644
--- a/pkgs/development/libraries/haskell/x509-system/default.nix
+++ b/pkgs/development/libraries/haskell/x509-system/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, filepath, mtl, pem, time, x509, x509Store }:
+{ cabal, filepath, mtl, pem, x509, x509Store }:
 
 cabal.mkDerivation (self: {
   pname = "x509-system";
-  version = "1.4.5";
-  sha256 = "0pwn624n6fagg9rw2p09x2k212rc8167jhqz6z5wf6m7y56ql28x";
-  buildDepends = [ filepath mtl pem time x509 x509Store ];
+  version = "1.5.0";
+  sha256 = "159zwg35nq42j1rl0p4x00hdf3iy48hd7kavz0rnpwd2p7ljamr3";
+  buildDepends = [ filepath mtl pem x509 x509Store ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
     description = "Handle per-operating-system X.509 accessors and storage";
diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix
index 32176c8f4b8..1caec0606bc 100644
--- a/pkgs/development/libraries/haskell/x509-validation/default.nix
+++ b/pkgs/development/libraries/haskell/x509-validation/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, asn1Encoding, asn1Types, byteable, cryptohash
-, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl
-, network, pem, time, x509, x509Store
+, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath
+, hourglass, mtl, network, pem, x509, x509Store
 }:
 
 cabal.mkDerivation (self: {
   pname = "x509-validation";
-  version = "1.5.0";
-  sha256 = "1xarn00ipi77whly5yjlpqa0xd25lj0jf4xk8ylp4ba58hvcxqrn";
+  version = "1.5.1";
+  sha256 = "19cp187id9hdlzkr7sbv2sdxqxnpjv0db09hwf3zdqqqxr30mn6x";
   buildDepends = [
     asn1Encoding asn1Types byteable cryptohash cryptoPubkey
-    cryptoPubkeyTypes dataDefaultClass filepath mtl network pem time
-    x509 x509Store
+    cryptoPubkeyTypes dataDefaultClass filepath hourglass mtl network
+    pem x509 x509Store
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
index 4c8eb53c995..201b727e2fc 100644
--- a/pkgs/development/libraries/haskell/x509/default.nix
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -1,21 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash
-, cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
+, cryptoPubkeyTypes, filepath, hourglass, mtl, pem, tasty
+, tastyQuickcheck
 }:
 
 cabal.mkDerivation (self: {
   pname = "x509";
-  version = "1.4.11";
-  sha256 = "1ax56jps640cj1swy08y4k75vx908ckwkg2hi7y2s3bhnvpz49ga";
+  version = "1.5.0.1";
+  sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba";
   buildDepends = [
     asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
-    filepath mtl pem time
+    filepath hourglass mtl pem
   ];
   testDepends = [
-    asn1Types cryptoPubkeyTypes HUnit mtl QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 time
+    asn1Types cryptoPubkeyTypes hourglass mtl tasty tastyQuickcheck
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index 445577c2309..1ced4424f53 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -4,8 +4,10 @@
 
 cabal.mkDerivation (self: {
   pname = "xdot";
-  version = "0.2.4.3";
-  sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg";
+  version = "0.2.4.6";
+  sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
deleted file mode 100644
index 74b9fc5620c..00000000000
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "xhtml";
-  version = "3000.2.0.4";
-  sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw";
-  meta = {
-    homepage = "https://github.com/haskell/xhtml";
-    description = "An XHTML combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
deleted file mode 100644
index 065252d31b7..00000000000
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "xhtml";
-  version = "3000.2.0.5";
-  sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v";
-  meta = {
-    homepage = "https://github.com/haskell/xhtml";
-    description = "An XHTML combinator library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/default.nix
index be1e32afbe3..be1e32afbe3 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/default.nix
diff --git a/pkgs/development/libraries/haskell/xlsx/default.nix b/pkgs/development/libraries/haskell/xlsx/default.nix
index 779814c05dd..e2fdfa0d1a7 100644
--- a/pkgs/development/libraries/haskell/xlsx/default.nix
+++ b/pkgs/development/libraries/haskell/xlsx/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xlsx";
-  version = "0.1.0.2";
-  sha256 = "0m9ph34mpnc6vj1d3x80y0gaya5bqdhfa193jn0a8clw4qz88sbr";
+  version = "0.1.0.3";
+  sha256 = "1i1dfb6gv4h3nc9ja7yxjzb8g207vzp58dnk4rgfcfglyvadn8kp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 3df8c163d63..8a352a27ba3 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -1,19 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, attoparsecConduit, blazeBuilder
-, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit
+{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, conduit
 , conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl
 , resourcet, systemFilepath, text, transformers, xmlTypes
 }:
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.2.1";
-  sha256 = "1bh0d2fqcdbx2dq5ybipf7ws59blrb8yd98z1rnbvv1fj9r0xw10";
+  version = "1.2.3.1";
+  sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8";
   buildDepends = [
-    attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
-    blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq
-    monadControl resourcet systemFilepath text transformers xmlTypes
+    attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra
+    dataDefault deepseq monadControl resourcet systemFilepath text
+    transformers xmlTypes
   ];
   testDepends = [
     blazeMarkup conduit hspec HUnit resourcet text transformers
diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
index 3dded2dcb44..405f165c6a7 100644
--- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
+++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix
@@ -6,18 +6,17 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-html-conduit-lens";
-  version = "0.3.2.0";
-  sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0";
+  version = "0.3.2.1";
+  sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
   buildDepends = [ htmlConduit lens text xmlConduit ];
   testDepends = [
     doctest hspec hspecExpectationsLens lens xmlConduit
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/supki/xml-html-conduit-lens#readme";
     description = "Optics for xml-conduit and html-conduit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix
index f9e60441975..033afd9ee53 100644
--- a/pkgs/development/libraries/haskell/xml-lens/default.nix
+++ b/pkgs/development/libraries/haskell/xml-lens/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-lens";
-  version = "0.1.6.1";
-  sha256 = "093grvlpm19l3g10ka82xpzl2wr0gli71kfkbvk4gvg3194fkw4h";
+  version = "0.1.6.2";
+  sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz";
   buildDepends = [ lens text xmlConduit ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index 794808eed0d..1f4b2474d75 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmlhtml";
-  version = "0.2.3.2";
-  sha256 = "1djw9d0hff9ii0n1bgbjjsca9n0w7mxj3ivf9dslyr3kv3yb4013";
+  version = "0.2.3.3";
+  sha256 = "0n95284z24ddgw7v8zjqzanyrshxydcxs4ivchpj88gh5r3ryv5j";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
   ];
diff --git a/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix b/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
new file mode 100644
index 00000000000..80a503704cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xmonad-screenshot/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, gtk, xmonad }:
+
+cabal.mkDerivation (self: {
+  pname = "xmonad-screenshot";
+  version = "0.1.1.0";
+  sha256 = "1iy6c8dis5jkgamkbbgxvbajz8f03bwhwdwk46l6wvlgmb072wl4";
+  buildDepends = [ gtk xmonad ];
+  meta = {
+    homepage = "http://github.com/supki/xmonad-screenshot";
+    description = "Workspaces screenshooting utility for XMonad";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 26cb0dec098..bf63586eed4 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -1,22 +1,23 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet
-, scientific, text, transformers, unorderedContainers, vector
+{ cabal, aeson, aesonQq, attoparsec, conduit, enclosedExceptions
+, filepath, hspec, hspecExpectations, HUnit, resourcet, scientific
+, text, transformers, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.9";
-  sha256 = "13qqqil19yi1qbl9gqma6kxwkz8j5iq6z347fabk916gy9jng3dl";
+  version = "0.8.10.1";
+  sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec conduit resourcet scientific text transformers
-    unorderedContainers vector
+    aeson attoparsec conduit enclosedExceptions filepath resourcet
+    scientific text transformers unorderedContainers vector
   ];
   testDepends = [
-    aeson conduit hspec HUnit resourcet text transformers
-    unorderedContainers vector
+    aeson aesonQq conduit hspec hspecExpectations HUnit resourcet text
+    transformers unorderedContainers vector
   ];
   meta = {
     homepage = "http://github.com/snoyberg/yaml/";
diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
index 9f577fc4520..2cb6609ab77 100644
--- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix
@@ -1,19 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cryptohash, pwstoreFast, text, yesodAuth, yesodCore
-, yesodForm, yesodPersistent
+{ cabal, cryptohash, hspec, persistent, pwstoreFast, text
+, yesodAuth, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth-hashdb";
-  version = "1.3.0.1";
-  sha256 = "0q78mw09g6b04zaz54s03222mh59nm604qh8gyw5kka06f93hk4q";
+  version = "1.4.1.1";
+  sha256 = "0bb37iawsdq3m5p1sjdnz954f3nfdmvvhm0hxap1z2hf9dk516ci";
   buildDepends = [
-    cryptohash pwstoreFast text yesodAuth yesodCore yesodForm
-    yesodPersistent
+    cryptohash persistent pwstoreFast text yesodAuth yesodCore
+    yesodForm yesodPersistent
   ];
+  testDepends = [ hspec text ];
   meta = {
-    homepage = "http://www.yesodweb.com/";
+    homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
     description = "Authentication plugin for Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 1224e105c3f..cf705ac8fc9 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,27 +1,26 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, attoparsecConduit, authenticate, base16Bytestring
-, base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, conduit, conduitExtra, cryptohash, dataDefault
-, emailValidate, fileEmbed, hamlet, httpClient, httpConduit
-, httpTypes, liftedBase, mimeMail, networkUri, persistent
-, persistentTemplate, random, resourcet, safe, shakespeare
-, shakespeareCss, shakespeareJs, text, time, transformers
-, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
+{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring
+, binary, blazeBuilder, blazeHtml, blazeMarkup, byteable, conduit
+, conduitExtra, cryptohash, dataDefault, emailValidate, fileEmbed
+, httpClient, httpConduit, httpTypes, liftedBase, mimeMail
+, networkUri, persistent, persistentTemplate, random, resourcet
+, safe, shakespeare, text, time, transformers, unorderedContainers
+, wai, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.4.2";
-  sha256 = "0hf5x1qhpxil3na7f1vdjr5i5n7q41a23ikkra9avg3yss94k04d";
+  version = "1.4.1";
+  sha256 = "1nvc5ni4bwhb10ayr75s3z44ynv9kq3lp6kgd536xyagbi054gdp";
   buildDepends = [
-    aeson attoparsecConduit authenticate base16Bytestring
-    base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable
-    conduit conduitExtra cryptohash dataDefault emailValidate fileEmbed
-    hamlet httpClient httpConduit httpTypes liftedBase mimeMail
-    networkUri persistent persistentTemplate random resourcet safe
-    shakespeare shakespeareCss shakespeareJs text time transformers
-    unorderedContainers wai yesodCore yesodForm yesodPersistent
+    aeson authenticate base16Bytestring base64Bytestring binary
+    blazeBuilder blazeHtml blazeMarkup byteable conduit conduitExtra
+    cryptohash dataDefault emailValidate fileEmbed httpClient
+    httpConduit httpTypes liftedBase mimeMail networkUri persistent
+    persistentTemplate random resourcet safe shakespeare text time
+    transformers unorderedContainers wai yesodCore yesodForm
+    yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 27a1c1522ef..7033bff4d15 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -3,27 +3,26 @@
 { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
 , conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify
 , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase
-, network, networkConduit, optparseApplicative, parsec
-, projectTemplate, resourcet, shakespeare, shakespeareCss
-, shakespeareJs, shakespeareText, split, streamingCommons
-, systemFileio, systemFilepath, tar, text, time, transformers
+, network, optparseApplicative, parsec, projectTemplate, resourcet
+, shakespeare, split, streamingCommons, systemFileio
+, systemFilepath, tar, text, time, transformers, transformersCompat
 , unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.12.4";
-  sha256 = "1pg1zxixgsqz5da2dhs94zi77h63jz3llf0049fgdfg166c685vj";
+  version = "1.4.1";
+  sha256 = "0kzhnq0mv8s4qdkzqj05c7jdmp2xllv02kqgihwhyr2s4wvqmviw";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     attoparsec base64Bytestring blazeBuilder Cabal conduit conduitExtra
     dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit
-    httpReverseProxy httpTypes liftedBase network networkConduit
-    optparseApplicative parsec projectTemplate resourcet shakespeare
-    shakespeareCss shakespeareJs shakespeareText split streamingCommons
-    systemFileio systemFilepath tar text time transformers unixCompat
-    unorderedContainers wai waiExtra warp yaml zlib
+    httpReverseProxy httpTypes liftedBase network optparseApplicative
+    parsec projectTemplate resourcet shakespeare split streamingCommons
+    systemFileio systemFilepath tar text time transformers
+    transformersCompat unixCompat unorderedContainers wai waiExtra warp
+    yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 857b237ba42..571778cfdc4 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,36 +1,35 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml
+{ cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
 , conduitExtra, cookie, dataDefault, deepseq, exceptions
-, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase
-, monadControl, monadLogger, mtl, network, networkConduit, parsec
-, pathPieces, QuickCheck, random, resourcet, safe, shakespeare
-, shakespeareCss, shakespeareI18n, shakespeareJs, streamingCommons
-, text, time, transformers, transformersBase, unixCompat, vector
-, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes
+, fastLogger, hspec, hspecExpectations, httpTypes, HUnit
+, liftedBase, monadControl, monadLogger, mtl, mwcRandom, network
+, parsec, pathPieces, primitive, QuickCheck, random, resourcet
+, safe, shakespeare, streamingCommons, text, time, transformers
+, transformersBase, unixCompat, unorderedContainers, vector, wai
+, waiExtra, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.19.1";
-  sha256 = "1021z0jrfbafbdybpj0jkacr9ljyap5cpmfk2911dsz3nz7sy6zg";
+  version = "1.4.7.2";
+  sha256 = "0k6zsjds594zy0cvnryz071nis3zmv1sjiyn14cc80j0rvjll46y";
   buildDepends = [
-    aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
-    caseInsensitive cereal clientsession conduit conduitExtra cookie
-    dataDefault deepseq exceptions fastLogger hamlet httpTypes
-    liftedBase monadControl monadLogger mtl parsec pathPieces random
-    resourcet safe shakespeare shakespeareCss shakespeareI18n
-    shakespeareJs text time transformers transformersBase unixCompat
-    vector wai waiExtra waiLogger warp yesodRoutes
+    aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive
+    cereal clientsession conduit conduitExtra cookie dataDefault
+    deepseq exceptions fastLogger httpTypes liftedBase monadControl
+    monadLogger mtl mwcRandom parsec pathPieces primitive random
+    resourcet safe shakespeare text time transformers transformersBase
+    unixCompat unorderedContainers vector wai waiExtra waiLogger warp
+    word8
   ];
   testDepends = [
-    async blazeBuilder conduit conduitExtra hamlet hspec httpTypes
-    HUnit liftedBase network networkConduit QuickCheck random resourcet
-    shakespeare shakespeareCss shakespeareJs streamingCommons text
-    transformers wai waiExtra waiTest
+    async blazeBuilder clientsession conduit conduitExtra cookie hspec
+    hspecExpectations httpTypes HUnit liftedBase mwcRandom network
+    pathPieces QuickCheck random resourcet shakespeare streamingCommons
+    text transformers wai waiExtra
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 57f456823c2..f052a38357d 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,21 +1,20 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, byteable, dataDefault, emailValidate, hamlet, hspec, networkUri
-, persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs
-, text, time, transformers, wai, xssSanitize, yesodCore
-, yesodPersistent
+, byteable, dataDefault, emailValidate, hspec, networkUri
+, persistent, resourcet, shakespeare, text, time, transformers, wai
+, xssSanitize, yesodCore, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.15.2";
-  sha256 = "05r7w65n63qrlvxlm2j4s0vin4p7gc4cqa8j83465mnl1dzxliy1";
+  version = "1.4.3";
+  sha256 = "08ivcqq4glyyvjm60fsmd4linqr6kkh6wn4bbcpzinvpv6asr6mr";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
-    dataDefault emailValidate hamlet networkUri persistent resourcet
-    shakespeare shakespeareCss shakespeareJs text time transformers wai
-    xssSanitize yesodCore yesodPersistent
+    dataDefault emailValidate networkUri persistent resourcet
+    shakespeare text time transformers wai xssSanitize yesodCore
+    yesodPersistent
   ];
   testDepends = [ hspec text time ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod-markdown/default.nix b/pkgs/development/libraries/haskell/yesod-markdown/default.nix
new file mode 100644
index 00000000000..bf77f9fea9d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-markdown/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, blazeHtml, blazeMarkup, pandoc, persistent, shakespeare
+, texmath, text, xssSanitize, yesodCore, yesodForm
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-markdown";
+  version = "0.9.3.1";
+  sha256 = "1spbgcsq1lkywp19k7ksiy6rsh2n060mxzh33k0ngbxxg566n08i";
+  buildDepends = [
+    blazeHtml blazeMarkup pandoc persistent shakespeare texmath text
+    xssSanitize yesodCore yesodForm
+  ];
+  meta = {
+    homepage = "http://github.com/pbrisbin/yesod-markdown";
+    description = "Tools for using markdown in a yesod application";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix b/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
new file mode 100644
index 00000000000..a6bf924c3c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-newsfeed/default.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, blazeHtml, blazeMarkup, shakespeare, text, time
+, xmlConduit, yesodCore
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-newsfeed";
+  version = "1.4.0.1";
+  sha256 = "02ydkri23vrm7mak2b1ybfhkdgc2dmv9vq3ki2d7sd005sp3zdly";
+  buildDepends = [
+    blazeHtml blazeMarkup shakespeare text time xmlConduit yesodCore
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Helper functions and data types for producing News feeds";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yesod-pagination/default.nix b/pkgs/development/libraries/haskell/yesod-pagination/default.nix
new file mode 100644
index 00000000000..38b89445cb7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-pagination/default.nix
@@ -0,0 +1,24 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, esqueleto, hspec, monadLogger, persistent
+, persistentSqlite, resourcePool, resourcet, shakespeare
+, utf8String, waiTest, yesod, yesodTest
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-pagination";
+  version = "2.0.0";
+  sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1";
+  buildDepends = [ esqueleto yesod ];
+  testDepends = [
+    hspec monadLogger persistent persistentSqlite resourcePool
+    resourcet shakespeare utf8String waiTest yesod yesodTest
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/joelteon/yesod-pagination";
+    description = "Pagination in Yesod";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 64a2bd7730f..845fc1c18ff 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -2,20 +2,20 @@
 
 { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite
 , persistentTemplate, resourcePool, resourcet, text, transformers
-, waiExtra, waiTest, yesodCore
+, waiExtra, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "1.2.3";
-  sha256 = "1kdspz6y32r8kl0qk89hgwi4n6dnxch7wriv829cnwqm0bzjfdpw";
+  version = "1.4.0.1";
+  sha256 = "08648n6b4xhsqbvqh8vpsf3481hvzhrkyqbzs303s6fz683mn0zw";
   buildDepends = [
     blazeBuilder conduit persistent persistentTemplate resourcePool
     resourcet transformers yesodCore
   ];
   testDepends = [
     blazeBuilder conduit hspec persistent persistentSqlite text
-    waiExtra waiTest yesodCore
+    waiExtra yesodCore
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 5ad4a27b66f..60a94cfb20d 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -3,29 +3,29 @@
 { cabal, async, attoparsec, base64Bytestring, blazeBuilder
 , byteable, conduit, conduitExtra, cryptohash, cryptohashConduit
 , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin
-, hspec, httpTypes, HUnit, mimeTypes, resourcet, shakespeareCss
-, systemFileio, systemFilepath, text, transformers, unixCompat
-, unorderedContainers, wai, waiAppStatic, waiExtra, waiTest
-, yesodCore, yesodTest
+, hspec, httpTypes, HUnit, mimeTypes, resourcet, systemFileio
+, systemFilepath, text, transformers, unixCompat
+, unorderedContainers, wai, waiAppStatic, waiExtra, yesodCore
+, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.4";
-  sha256 = "0r5bz1jmgjd7cmvhkp3ahgl610bssvgxxsvb626dvqz2vqc0061z";
+  version = "1.4.0.3";
+  sha256 = "15rwlw76rfh18l3ap73aqmwz4bafmxbr5pchyarll14ps0rjs74g";
   buildDepends = [
     async attoparsec base64Bytestring blazeBuilder byteable conduit
     conduitExtra cryptohash cryptohashConduit cssText dataDefault
     fileEmbed filepath hashable hjsmin httpTypes mimeTypes resourcet
-    shakespeareCss systemFileio systemFilepath text transformers
-    unixCompat unorderedContainers wai waiAppStatic yesodCore
+    systemFileio systemFilepath text transformers unixCompat
+    unorderedContainers wai waiAppStatic yesodCore
   ];
   testDepends = [
     async base64Bytestring byteable conduit conduitExtra cryptohash
     cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec
-    httpTypes HUnit mimeTypes resourcet shakespeareCss systemFileio
-    systemFilepath text transformers unixCompat unorderedContainers wai
-    waiAppStatic waiExtra waiTest yesodCore yesodTest
+    httpTypes HUnit mimeTypes resourcet systemFileio systemFilepath
+    text transformers unixCompat unorderedContainers wai waiAppStatic
+    waiExtra yesodCore yesodTest
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index 9cc7a380f66..50a6369f186 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -1,20 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
-, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit
-, monadControl, network, persistent, text, time, transformers, wai
-, waiExtra, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm
+, caseInsensitive, cookie, hspec, hspecCore, htmlConduit, httpTypes
+, HUnit, monadControl, network, persistent, text, time
+, transformers, wai, waiExtra, xmlConduit, xmlTypes, yesodCore
+, yesodForm
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.5";
-  sha256 = "0qk6qqigrqygczsnfrpg7psfz6gy5rqm9lfbhzaw64n4jklmzw3n";
+  version = "1.4.2";
+  sha256 = "09iia8vligw41ayhp1fp797n783avb0sf89z8midindrhb5plfbl";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
-    cookie hspec htmlConduit httpTypes HUnit monadControl network
-    persistent text time transformers wai waiExtra waiTest xmlConduit
-    xmlTypes yesodCore
+    cookie hspecCore htmlConduit httpTypes HUnit monadControl network
+    persistent text time transformers wai waiExtra xmlConduit xmlTypes
+    yesodCore
   ];
   testDepends = [
     hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 07d4ac958e6..4b5679512a9 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,23 +1,21 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault
-, fastLogger, hamlet, monadControl, monadLogger, networkConduit
-, safe, shakespeare, shakespeareCss, shakespeareJs
-, streamingCommons, text, transformers, unorderedContainers, wai
-, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm
-, yesodPersistent
+, fastLogger, monadControl, monadLogger, safe, semigroups
+, shakespeare, streamingCommons, text, transformers
+, unorderedContainers, wai, waiExtra, waiLogger, warp, yaml
+, yesodAuth, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.6.1";
-  sha256 = "1xiqpbcjxisc4lic7ls03rz184d95vkh4kb3ampwbx463qbj9im2";
+  version = "1.4.1.4";
+  sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
   buildDepends = [
     aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
-    hamlet monadControl monadLogger networkConduit safe shakespeare
-    shakespeareCss shakespeareJs streamingCommons text transformers
-    unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
-    yesodForm yesodPersistent
+    monadControl monadLogger safe semigroups shakespeare
+    streamingCommons text transformers unorderedContainers wai waiExtra
+    waiLogger warp yaml yesodAuth yesodCore yesodForm yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
new file mode 100644
index 00000000000..4685a08511a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix
@@ -0,0 +1,22 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, dataDefault, filepath, mtl, text, transformersBase
+, vector, yi, yiLanguage, yiRope
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yi-fuzzy-open";
+  version = "0.1.0";
+  sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc";
+  buildDepends = [
+    binary dataDefault filepath mtl text transformersBase vector yi
+    yiLanguage yiRope
+  ];
+  meta = {
+    homepage = "https://github.com/yi-editor/yi-fuzzy-open";
+    description = "Fuzzy open plugin for Yi";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yi-language/default.nix b/pkgs/development/libraries/haskell/yi-language/default.nix
new file mode 100644
index 00000000000..ec5070cac99
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yi-language/default.nix
@@ -0,0 +1,28 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, alex, binary, dataDefault, derive, filepath, hashable
+, hspec, lens, ooPrototypes, pointedlist, QuickCheck, regexBase
+, regexTdfa, transformersBase, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yi-language";
+  version = "0.1.1.0";
+  sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379";
+  buildDepends = [
+    binary dataDefault derive hashable lens ooPrototypes pointedlist
+    regexBase regexTdfa transformersBase unorderedContainers
+  ];
+  testDepends = [
+    binary dataDefault derive filepath hashable hspec lens pointedlist
+    QuickCheck regexBase regexTdfa transformersBase unorderedContainers
+  ];
+  buildTools = [ alex ];
+  meta = {
+    homepage = "https://github.com/yi-editor/yi-language";
+    description = "Collection of language-related Yi libraries";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yi-monokai/default.nix b/pkgs/development/libraries/haskell/yi-monokai/default.nix
new file mode 100644
index 00000000000..ddae06b7f22
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yi-monokai/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, yi }:
+
+cabal.mkDerivation (self: {
+  pname = "yi-monokai";
+  version = "0.1.1.2";
+  sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
+  buildDepends = [ yi ];
+  meta = {
+    homepage = "https://github.com/Fuuzetsu/yi-monokai";
+    description = "Monokai colour theme for the Yi text editor";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yi-rope/default.nix b/pkgs/development/libraries/haskell/yi-rope/default.nix
new file mode 100644
index 00000000000..a92f086f3a6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yi-rope/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, binary, charsetdetectAe, dataDefault, deepseq, fingertree
+, hspec, QuickCheck, quickcheckInstances, text, textIcu
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yi-rope";
+  version = "0.7.0.0";
+  sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2";
+  buildDepends = [
+    binary charsetdetectAe dataDefault deepseq fingertree text textIcu
+  ];
+  testDepends = [ hspec QuickCheck quickcheckInstances text ];
+  meta = {
+    description = "A rope data structure used by Yi";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yi-snippet/default.nix b/pkgs/development/libraries/haskell/yi-snippet/default.nix
new file mode 100644
index 00000000000..b1cb7041ff0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yi-snippet/default.nix
@@ -0,0 +1,17 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, yi, yiRope }:
+
+cabal.mkDerivation (self: {
+  pname = "yi-snippet";
+  version = "0.1.0.0";
+  sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d";
+  buildDepends = [ yi yiRope ];
+  meta = {
+    homepage = "https://github.com/yi-editor/yi-snippet";
+    description = "Snippet support for Yi";
+    license = self.stdenv.lib.licenses.gpl2;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index 2dadfcbfd68..ea3991eebe9 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yst";
-  version = "0.4.1";
-  sha256 = "199awgpxn9131a7ijxvvbc4mi1yasnllbpj77k27brx00j87v3nq";
+  version = "0.4.1.1";
+  sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
index 0e2cf67a19f..4b7c333c07c 100644
--- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zeromq4-haskell";
-  version = "0.6";
-  sha256 = "1n8vvlwnmvi2hlqhkmzsqgpbpxnhdcs8jy3rj1srsg729m2aqc8y";
+  version = "0.6.2";
+  sha256 = "07dbsapzc4hqq9sg63v4wyjad13sqh9zsx3ckwc5hg5z6vknpafb";
   buildDepends = [ async exceptions semigroups transformers ];
   testDepends = [
     async QuickCheck tasty tastyHunit tastyQuickcheck
diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
index a7732367710..8369b2a3eb5 100644
--- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zip-archive";
-  version = "0.2.3.4";
-  sha256 = "1c589cpl1jax1r60b92az1800b67zrva3dndhv9hcxidlgyf46gp";
+  version = "0.2.3.5";
+  sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary digest filepath mtl text time zlib ];
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
deleted file mode 100644
index b6760482129..00000000000
--- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.0.0";
-  sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
deleted file mode 100644
index f3669c97c0a..00000000000
--- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.2.0";
-  sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
deleted file mode 100644
index 1bed95bc2e8..00000000000
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.3.1";
-  sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
deleted file mode 100644
index 5260b55a027..00000000000
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.3.3";
-  sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2";
-  extraLibraries = [ zlib ];
-  jailbreak = true;
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
deleted file mode 100644
index 8b13da93ce3..00000000000
--- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "zlib";
-  version = "0.5.4.0";
-  sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1";
-  extraLibraries = [ zlib ];
-  meta = {
-    description = "Compression and decompression in the gzip and zlib formats";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/default.nix
index 28f69ad0a64..dad288c8fd0 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
+++ b/pkgs/development/libraries/haskell/zlib/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib";
-  version = "0.5.4.1";
-  sha256 = "0l550l2qw4gx530h1yjjpdh6rkm59l9l6jbmlm0vx41cqpj6b8yc";
+  version = "0.5.4.2";
+  sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
   extraLibraries = [ zlib ];
   meta = {
     description = "Compression and decompression in the gzip and zlib formats";