summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-04-04 21:43:11 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-04-04 21:43:40 +0200
commiteb2e46aab26600484bfabb3c242bdd069279bdb1 (patch)
tree18ec0523bfcd0967f8eef326756f96dc0075789a /pkgs/development
parent16f45507619b4c4012bb7958fba09eb3bdc5ac87 (diff)
parent22d4472d2744639ccd880f015bb3147cf5222f07 (diff)
downloadnixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar
nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.gz
nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.bz2
nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.lz
nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.xz
nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.zst
nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.zip
Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/arduino/ino/default.nix16
-rw-r--r--pkgs/development/compilers/Agda-executable/default.nix5
-rw-r--r--pkgs/development/compilers/chicken/default.nix18
-rw-r--r--pkgs/development/compilers/edk2/default.nix6
-rw-r--r--pkgs/development/compilers/epic/default.nix5
-rw-r--r--pkgs/development/compilers/gcc/4.7/arm-eabi.patch230
-rw-r--r--pkgs/development/compilers/gcc/4.7/default.nix3
-rw-r--r--pkgs/development/compilers/ghc/6.10.1-binary.nix1
-rw-r--r--pkgs/development/compilers/ghc/6.10.1.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.10.2-binary.nix1
-rw-r--r--pkgs/development/compilers/ghc/6.10.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.10.3.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.10.4.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.11.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.12.1-binary.nix1
-rw-r--r--pkgs/development/compilers/ghc/6.12.1.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.12.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.12.3.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.4.2-binary.nix1
-rw-r--r--pkgs/development/compilers/ghc/6.4.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.6.1.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.8.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/6.8.3.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.0.1.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.0.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.0.3.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.0.4-binary.nix1
-rw-r--r--pkgs/development/compilers/ghc/7.2.1.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.2.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.4.2-binary.nix1
-rw-r--r--pkgs/development/compilers/ghc/7.4.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.6.1.nix2
-rw-r--r--pkgs/development/compilers/ghc/7.6.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/head.nix2
-rw-r--r--pkgs/development/compilers/go/default.nix4
-rw-r--r--pkgs/development/compilers/haxe/default.nix14
-rw-r--r--pkgs/development/compilers/idris/default.nix5
-rw-r--r--pkgs/development/compilers/neko/default.nix4
-rw-r--r--pkgs/development/compilers/tinycc/default.nix151
-rw-r--r--pkgs/development/interpreters/guile/default.nix2
-rw-r--r--pkgs/development/interpreters/guile/eai_system.patch24
-rw-r--r--pkgs/development/interpreters/octave/default.nix6
-rw-r--r--pkgs/development/interpreters/python/3.2/default.nix82
-rw-r--r--pkgs/development/interpreters/python/3.2/setup-hook.sh15
-rw-r--r--pkgs/development/interpreters/python/3.3/default.nix9
-rw-r--r--pkgs/development/interpreters/python/wrapper.nix2
-rw-r--r--pkgs/development/interpreters/racket/default.nix6
-rw-r--r--pkgs/development/interpreters/ruby/generated.nix302
-rw-r--r--pkgs/development/interpreters/ruby/patches.nix29
-rw-r--r--pkgs/development/libraries/aterm/2.5.nix5
-rw-r--r--pkgs/development/libraries/ffmpeg/1.1.nix13
-rw-r--r--pkgs/development/libraries/fftw/default.nix3
-rw-r--r--pkgs/development/libraries/glibc/2.17/common.nix29
-rw-r--r--pkgs/development/libraries/glibc/2.17/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/AC-Vector/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Agda/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/AspectAG/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Boolean/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/Cabal/1.14.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/Chart/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ChasingBottoms/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/ConfigFile/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/CouchDB/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Crypto/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/DAV/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/DSH/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Diff/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/FerryCore/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLFW/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLURaw/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix21
-rw-r--r--pkgs/development/libraries/haskell/Glob/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/GlomeVec/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Graphalyze/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix5
-rw-r--r--pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix5
-rw-r--r--pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix5
-rw-r--r--pkgs/development/libraries/haskell/HDBC/HDBC.nix5
-rw-r--r--pkgs/development/libraries/haskell/HGL/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/HList/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/HSH/default.nix3
-rw-r--r--pkgs/development/libraries/haskell/HStringTemplate/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.0.6.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.0.9.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/HTTP/4000.2.8.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix18
-rw-r--r--pkgs/development/libraries/haskell/HaXml/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/HaskellForMaths/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Hipmunk/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/HsOpenSSL/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/HsSyck/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/IORefCAS/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/IOSpec/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/IfElse/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/JsContracts/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/JuicyPixels/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/List/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/ListLike/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ListZipper/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/MaybeT/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/MemoTrie/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/MissingH/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/MonadPrompt/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/MonadRandom/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/NanoProlog/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/NumInstances/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ObjectName/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/OneTuple/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenAL/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix19
-rw-r--r--pkgs/development/libraries/haskell/OpenGLRaw/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/PSQueue/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Pathfinder/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/QuickCheck/2.6.nix5
-rw-r--r--pkgs/development/libraries/haskell/RSA/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Ranged-sets/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ReadArgs/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/RepLib/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SDL-image/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SDL-mixer/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SDL-ttf/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SDL/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SHA/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SMTPClient/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/SafeSemaphore/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/Shellac/Shellac.nix5
-rw-r--r--pkgs/development/libraries/haskell/StateVar/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Stream/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/TableAlgebra/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Tensor/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/Vec/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/WebBits/1.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/WebBits/2.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/WebBits/2.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/X11-xft/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/X11/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/Zwaluw/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/abstract-deque/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/abstract-par/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/accelerate-cuda/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/accelerate-examples/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/accelerate-io/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/accelerate/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/active/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/aeson/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/alternative-io/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ansi-terminal/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/appar/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/arithmoi/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/arrows/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/asn1-data/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/async/2.0.1.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/async/2.0.1.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/attempt/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/attoparsec-binary/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/attoparsec-conduit/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/attoparsec/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/attoparsec/enumerator.nix5
-rw-r--r--pkgs/development/libraries/haskell/authenticate-oauth/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/authenticate/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/base-compat/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/base-unicode-symbols/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/base16-bytestring/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/base64-bytestring/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/base64-conduit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/base64-string/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/basic-prelude/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/benchpress/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bifunctors/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/bimap/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/binary-shared/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/binary/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bitarray/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bitmap/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bits-atomic/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bktrees/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/blaze-builder/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/blaze-html/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/blaze-markup/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/blaze-svg/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/blaze-textual/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bloomfilter/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bmp/1.2.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/bmp/1.2.4.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/boomerang/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/brainfuck/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bson/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/byteorder/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bytestring-lexing/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/bytestring-mmap/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bytestring-nums/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/bytestring-trie/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/c2hs/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cabal-file-th/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cabal-macosx/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cairo/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/case-insensitive/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/cautious-file/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cereal-conduit/default.nix16
-rw-r--r--pkgs/development/libraries/haskell/cereal/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/certificate/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/cipher-aes/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cipher-rc4/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/circle-packing/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/citeproc-hs/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/classy-prelude/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/clientsession/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/cmdargs/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cmdlib/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/colorize-haskell/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/colour/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/comonad-transformers/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/comonad/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/comonads-fd/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/compact-string-fix/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/concurrent-extra/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/conduit/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/configurator/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/constraints/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/continued-fractions/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/contravariant/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/converge/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/convertible/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cookie/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cprng-aes/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cpu/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/criterion/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/crypto-api/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/crypto-conduit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/crypto-numbers/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/crypto-pubkey/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/crypto-random-api/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/cryptocipher/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cryptohash/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/css-text/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/csv/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/cuda/0.4.1.1.nix (renamed from pkgs/development/libraries/haskell/cuda/default.nix)5
-rw-r--r--pkgs/development/libraries/haskell/cuda/0.5.0.1.nix42
-rw-r--r--pkgs/development/libraries/haskell/curl/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix5
-rw-r--r--pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix1
-rw-r--r--pkgs/development/libraries/haskell/data-accessor/data-accessor.nix5
-rw-r--r--pkgs/development/libraries/haskell/data-binary-ieee754/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/data-default-class/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/data-default-instances-base/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/data-default-instances-containers/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/data-default/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/data-inttrie/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/data-lens-template/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/data-lens/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/data-memocombinators/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/data-reify/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/dataenc/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/date-cache/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/datetime/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/dbus/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/deepseq-th/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/derive/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/derp/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/diagrams/cairo.nix1
-rw-r--r--pkgs/development/libraries/haskell/diagrams/contrib.nix13
-rw-r--r--pkgs/development/libraries/haskell/diagrams/core.nix1
-rw-r--r--pkgs/development/libraries/haskell/diagrams/diagrams.nix1
-rw-r--r--pkgs/development/libraries/haskell/diagrams/lib.nix6
-rw-r--r--pkgs/development/libraries/haskell/diagrams/svg.nix1
-rw-r--r--pkgs/development/libraries/haskell/digest/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/digestive-functors-heist/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/digestive-functors-snap/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/digestive-functors/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/dimensional-tf/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/dimensional/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/directory-tree/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/distributed-process/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/distributed-static/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/distributive/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/dlist/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/dns/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/doctest/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/dotgen/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/double-conversion/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/download-curl/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/download/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/dstring/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/dual-tree/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/dyre/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/edit-distance/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/editline/0.2.1.0.nix15
-rw-r--r--pkgs/development/libraries/haskell/editline/0.2.1.1.nix (renamed from pkgs/development/libraries/haskell/editline/default.nix)2
-rw-r--r--pkgs/development/libraries/haskell/either/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/elerea/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/email-validate/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/encoding/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/entropy/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/enumerator/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/erf/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/errors/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/exception-mtl/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/exception-transformers/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/executable-path/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/explicit-exception/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/failure/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fast-logger/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fclabels/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/feed/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fgl-visualize/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.4.2.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.4.2.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/fgl/5.4.2.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/file-embed/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/file-location/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/filepath/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/filestore/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/filesystem-conduit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/fingertree/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/flexible-defaults/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/force-layout/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/fsnotify/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/gamma/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gd/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gdiff/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/generic-deriving/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/geniplate/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/ghc-core/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-events/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-heap-view/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-mod/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-mtl/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-syb-utils/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-syb/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ghc-vis/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gio/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gitit/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/glade/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/glib/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gloss/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/glpk-hs/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gnuidn/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/gnutls/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/graphviz/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/groupoids/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/gsasl/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/gtk/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/gtksourceview2/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hS3/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/hackage-db/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/hakyll/default.nix34
-rw-r--r--pkgs/development/libraries/haskell/hamlet/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix5
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-server.nix5
-rw-r--r--pkgs/development/libraries/haskell/happstack/happstack-util.nix5
-rw-r--r--pkgs/development/libraries/haskell/hashable/1.1.2.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/hashable/1.2.0.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/hashed-storage/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hashtables/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskeline-class/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-lexer/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-mpi/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-meta/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/hastache/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haxr-th/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/haxr/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/heist/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hexpat/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/highlighting-kate/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hinotify/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hint/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hjsmin/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hledger-lib/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hledger/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hmatrix/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hoauth/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hoogle/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hostname/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hp2any-core/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hp2any-graph/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hs-bibutils/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hscolour/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hslogger-template/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hspec-expectations/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hspec-meta/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/hspec/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/hspread/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hsyslog/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/html-conduit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/html/1.0.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/http-conduit/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/http-date/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/http-reverse-proxy/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/http-types/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/httpd-shed/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hxt-charproperties/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hxt-unicode/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/hxt/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/idna/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/ieee754/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/instant-generics/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/io-choice/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/io-storage/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/iproute/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/irc/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/iteratee/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ivor/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/jpeg/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/json/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/jsonTypes/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/kansas-lava/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/lambdabot-utils/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/lambdabot/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/lambdacube-engine/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix (renamed from pkgs/development/libraries/haskell/language-c-quote/default.nix)5
-rw-r--r--pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix28
-rw-r--r--pkgs/development/libraries/haskell/language-c/0.3.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/language-c/0.4.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/language-haskell-extract/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/language-javascript/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/largeword/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/lazysmallcheck/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/leksah/leksah-server.nix5
-rw-r--r--pkgs/development/libraries/haskell/leksah/process-leksah.nix5
-rw-r--r--pkgs/development/libraries/haskell/lens/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/liblastfm/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/libmpd/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/libxml-sax/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/lifted-base/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/lockfree-queue/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/logfloat/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/logict/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/lrucache/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/ltk/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/maccatcher/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/mainland-pretty/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/markdown-unlit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/math-functions/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/maude/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mime-mail/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mime-types/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/minimorph/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/miniutter/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/mmap/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mmorph/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/monad-control/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/monad-logger/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/monad-loops/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/monad-par-extras/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix (renamed from pkgs/development/libraries/haskell/monad-par/0.3.4.nix)9
-rw-r--r--pkgs/development/libraries/haskell/monad-peel/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/monadcryptorandom/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/monads-tf/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mongoDB/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/monoid-extras/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/mpppc/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mtl/1.1.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/mtl/1.1.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/mtl/2.0.1.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/mtl/2.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/mtl/2.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/mtlparse/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/multiarg/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/multiplate/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/multirec/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/multiset/0.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/multiset/0.2.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/murmur-hash/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/mwc-random/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/nanospec/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/nat/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/nats/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/naturals/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/netlist/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/netwire/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/network-conduit-tls/default.nix21
-rw-r--r--pkgs/development/libraries/haskell/network-conduit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/network-info/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/network-multicast/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/network-transport-tcp/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/network-transport-tests/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/network-transport/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.2.1.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.2.1.7.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.0.13.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.0.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.1.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/network/2.4.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/newtype/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/non-negative/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/numbers/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/numeric-prelude/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/numtype-tf/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/numtype/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/oeis/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/optparse-applicative/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/pandoc-types/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pandoc/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pango/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/parallel-io/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/parallel/1.1.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/parallel/2.2.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/parallel/3.1.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/parallel/3.2.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/parallel/3.2.0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/parseargs/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/parsec/2.1.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/parsec/3.1.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/parsimony/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/path-pieces/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pathtype/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pcre-light/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pem/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/permutation/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/persistent-postgresql/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/persistent-sqlite/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/persistent-template/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/persistent/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pgm/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/polyparse/1.7.nix5
-rw-r--r--pkgs/development/libraries/haskell/polyparse/1.8.nix5
-rw-r--r--pkgs/development/libraries/haskell/pool-conduit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/postgresql-libpq/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/postgresql-simple/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/ppm/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pretty-show/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/primitive/0.4.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/primitive/0.5.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/primitive/0.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/process-extras/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/profunctor-extras/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/profunctors/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/project-template/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/prolog-graph-lib/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/prolog-graph/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/prolog/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/publicsuffixlist/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/punycode/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/pureMD5/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/pwstore-fast/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/quickcheck-io/default.nix14
-rw-r--r--pkgs/development/libraries/haskell/random-fu/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/random-shuffle/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/random-source/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/random/1.0.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/ranges/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/rank1dynamic/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/reactive-banana-wx/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/reactive-banana/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/recaptcha/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/reflection/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-base/0.93.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-base/0.93.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.92.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.93.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-compat/0.95.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-pcre/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.94.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.94.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.94.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.95.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-posix/0.95.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/regex-tdfa/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/regexpr/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/regular/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/remote/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/repa-algorithms/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/repa-examples/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/repa-io/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/repa/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/repr/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/resource-pool/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/resourcet/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/rvar/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/safe/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/scotty/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/semigroupoid-extras/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/semigroupoids/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/semigroups/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/sendfile/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/setenv/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/shake/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/shakespeare-css/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/shakespeare-i18n/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/shakespeare-js/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/shakespeare-text/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/shakespeare/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/shelly/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/show/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/silently/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/simple-reflect/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/simple-sendfile/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/sized-types/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/skein/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/smallcheck/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/snap/core.nix5
-rw-r--r--pkgs/development/libraries/haskell/snap/loader-dynamic.nix1
-rw-r--r--pkgs/development/libraries/haskell/snap/loader-static.nix1
-rw-r--r--pkgs/development/libraries/haskell/snap/server.nix5
-rw-r--r--pkgs/development/libraries/haskell/snap/snap.nix4
-rw-r--r--pkgs/development/libraries/haskell/socks/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/split/0.2.1.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/split/0.2.1.3.nix (renamed from pkgs/development/libraries/haskell/split/0.2.1.2.nix)9
-rw-r--r--pkgs/development/libraries/haskell/srcloc/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/stateref/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/statistics/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/stb-image/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/stm-chans/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/stm-conduit/default.nix22
-rw-r--r--pkgs/development/libraries/haskell/stm/2.1.1.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/stm/2.1.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/stm/2.2.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/stm/2.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/stm/2.4.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/stm/2.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/storable-complex/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/storable-record/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/strict/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/strictConcurrency/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/string-combinators/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/string-qq/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/stringbuilder/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/stringprep/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/stringsearch/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/strptime/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/stylish-haskell/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/svgcairo/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.2.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.6.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.6.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.7.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/0.4.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix5
-rw-r--r--pkgs/development/libraries/haskell/syb/syb-with-class.nix5
-rw-r--r--pkgs/development/libraries/haskell/symbol/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/system-fileio/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/system-filepath/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/tabular/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/tagged/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/tagsoup/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/tagstream-conduit/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/tar/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/temporary/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/terminfo/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/test-framework-hunit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/test-framework-th-prime/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/test-framework-th/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/test-framework/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/texmath/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/text-icu/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.0.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.0.6.nix5
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.1.13.nix5
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.1.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.2.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/text/0.11.2.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/th-extras/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/th-lift/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/th-orphans/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/thespian/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/threadmanager/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/threads/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/time-compat/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/time/1.1.2.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/time/1.4.0.2.nix5
-rw-r--r--pkgs/development/libraries/haskell/tls-extra/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/tls/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/transformers-base/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/transformers-compat/default.nix7
-rw-r--r--pkgs/development/libraries/haskell/transformers/0.2.2.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/transformers/0.3.0.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/tuple/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/type-equality/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/type-level-natural-number/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/unbound/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/unbounded-delays/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/uniplate/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/uniqueid/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/unix-compat/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/unix-process-conduit/default.nix15
-rw-r--r--pkgs/development/libraries/haskell/unix-time/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/unlambda/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/unordered-containers/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/url/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/urlencoded/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/utf8-light/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/utf8-string/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/utility-ht/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/uu-parsinglib/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/uuid/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/uulib/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vacuum-cairo/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vacuum/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vault/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vcs-revision/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/vect/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/vector-algorithms/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vector-space-points/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vector-space/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/vector/0.10.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/vector/0.10.nix5
-rw-r--r--pkgs/development/libraries/haskell/vector/0.9.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/void/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/vty-ui/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/vty/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/wai-app-static/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/wai-extra/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/wai-logger/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/wai-test/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/wai/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/warp/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint-extras/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint-text/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/wl-pprint/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/word8/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wx.nix5
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wxcore.nix5
-rw-r--r--pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix5
-rw-r--r--pkgs/development/libraries/haskell/xdg-basedir/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/xdot/default.nix6
-rw-r--r--pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix5
-rw-r--r--pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix5
-rw-r--r--pkgs/development/libraries/haskell/xhtml/3000.2.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/xml-conduit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/xml-hamlet/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/xml-types/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/xml/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/xmlhtml/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/xss-sanitize/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yaml/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yap/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-auth/default.nix9
-rw-r--r--pkgs/development/libraries/haskell/yesod-core/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/yesod-default/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-form/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-json/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-persistent/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-routes/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-static/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yesod-test/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/yesod/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/yst/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zeromq-haskell/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zeromq3-haskell/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/zip-archive/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zipper/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib-bindings/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib-conduit/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib-enum/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.0.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.2.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.3.1.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.3.3.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.4.0.nix5
-rw-r--r--pkgs/development/libraries/haskell/zlib/0.5.4.1.nix5
-rw-r--r--pkgs/development/libraries/libffi/default.nix4
-rw-r--r--pkgs/development/libraries/libiconv/default.nix6
-rw-r--r--pkgs/development/libraries/libopus/default.nix6
-rw-r--r--pkgs/development/libraries/libvirt/default.nix6
-rw-r--r--pkgs/development/libraries/libxslt/default.nix15
-rw-r--r--pkgs/development/libraries/mesa/default.nix4
-rw-r--r--pkgs/development/libraries/opencolorio/default.nix21
-rw-r--r--pkgs/development/libraries/opencv/default.nix5
-rw-r--r--pkgs/development/libraries/openldap/default.nix11
-rw-r--r--pkgs/development/libraries/podofo/default.nix4
-rw-r--r--pkgs/development/libraries/ti-rpc/default.nix4
-rw-r--r--pkgs/development/libraries/xmlsec/default.nix24
-rw-r--r--pkgs/development/mobile/androidenv/build-app.nix5
-rw-r--r--pkgs/development/mobile/titaniumenv/build-app.nix8
-rw-r--r--pkgs/development/mobile/xcodeenv/build-app.nix7
-rw-r--r--pkgs/development/tools/build-managers/gnumake/default.nix2
-rw-r--r--pkgs/development/tools/build-managers/leiningen/default.nix11
-rw-r--r--pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch (renamed from pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch)0
-rw-r--r--pkgs/development/tools/documentation/doxygen/default.nix4
-rw-r--r--pkgs/development/tools/documentation/haddock/2.10.0.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.11.0.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.12.0.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.13.1.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.4.2.nix5
-rw-r--r--pkgs/development/tools/documentation/haddock/2.9.4.nix5
-rw-r--r--pkgs/development/tools/gnulib/default.nix21
-rw-r--r--pkgs/development/tools/haskell/BNFC-meta/default.nix5
-rw-r--r--pkgs/development/tools/haskell/HaRe/default.nix5
-rw-r--r--pkgs/development/tools/haskell/SourceGraph/default.nix5
-rw-r--r--pkgs/development/tools/haskell/alex-meta/default.nix5
-rw-r--r--pkgs/development/tools/haskell/cabal-ghci/default.nix5
-rw-r--r--pkgs/development/tools/haskell/cabal2ghci/default.nix1
-rw-r--r--pkgs/development/tools/haskell/cabal2nix/default.nix4
-rw-r--r--pkgs/development/tools/haskell/happy-meta/default.nix5
-rw-r--r--pkgs/development/tools/haskell/haskdogs/default.nix5
-rw-r--r--pkgs/development/tools/haskell/hasktags/default.nix5
-rw-r--r--pkgs/development/tools/haskell/hlint/default.nix5
-rw-r--r--pkgs/development/tools/haskell/hslogger/default.nix5
-rw-r--r--pkgs/development/tools/haskell/keter/default.nix28
-rw-r--r--pkgs/development/tools/haskell/packunused/default.nix1
-rw-r--r--pkgs/development/tools/haskell/splot/default.nix1
-rw-r--r--pkgs/development/tools/haskell/threadscope/default.nix5
-rw-r--r--pkgs/development/tools/haskell/timeplot/default.nix1
-rw-r--r--pkgs/development/tools/haskell/uuagc/bootstrap.nix5
-rw-r--r--pkgs/development/tools/haskell/uuagc/cabal.nix5
-rw-r--r--pkgs/development/tools/haskell/uuagc/default.nix9
-rw-r--r--pkgs/development/tools/misc/cpphs/default.nix5
-rw-r--r--pkgs/development/tools/misc/cppi/default.nix4
-rw-r--r--pkgs/development/tools/misc/texinfo/5.1.nix5
-rw-r--r--pkgs/development/tools/ocaml/opam/default.nix6
-rw-r--r--pkgs/development/tools/parsing/alex/2.3.1.nix5
-rw-r--r--pkgs/development/tools/parsing/alex/2.3.2.nix5
-rw-r--r--pkgs/development/tools/parsing/alex/2.3.3.nix5
-rw-r--r--pkgs/development/tools/parsing/alex/2.3.5.nix5
-rw-r--r--pkgs/development/tools/parsing/alex/3.0.1.nix5
-rw-r--r--pkgs/development/tools/parsing/alex/3.0.2.nix5
-rw-r--r--pkgs/development/tools/parsing/happy/1.18.10.nix5
-rw-r--r--pkgs/development/tools/parsing/happy/1.18.4.nix5
-rw-r--r--pkgs/development/tools/parsing/happy/1.18.5.nix5
-rw-r--r--pkgs/development/tools/parsing/happy/1.18.6.nix5
-rw-r--r--pkgs/development/tools/parsing/happy/1.18.8.nix5
-rw-r--r--pkgs/development/tools/parsing/happy/1.18.9.nix5
-rw-r--r--pkgs/development/web/plone/default.nix10090
893 files changed, 6981 insertions, 8515 deletions
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 6b88a8deaea7..100b3aa87f13 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, buildPythonPackage, minicom, avrdude, arduino_core, avrgcclibc }:
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom
+, avrdude, arduino_core, avrgcclibc }:
 
 buildPythonPackage {
   name = "ino-0.3.4";
@@ -10,15 +11,20 @@ buildPythonPackage {
   };
 
   # TODO: add avrgcclibc, it must be rebuild with C++ support
-  propagatedBuildInputs = [ minicom avrdude arduino_core ];
+  propagatedBuildInputs =
+    [ arduino_core avrdude minicom pythonPackages.configobj
+      pythonPackages.jinja2 pythonPackages.pyserial ];
 
   patchPhase = ''
     echo "Patching Arduino distribution path"
-    sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' ino/environment.py
+    sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' \
+        ino/environment.py
+    sed -i -e 's@argparse@@' -e 's@ordereddict@@' \
+        requirements.txt
+    sed -i -e 's@from ordereddict@from collections@' \
+        ino/environment.py ino/utils.py
   '';
  
-  doCheck = false;
-
   meta = {
     description = "Command line toolkit for working with Arduino hardware";
     homepage = http://inotool.org/;
diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix
index f9acff43ef71..6b5e58e77520 100644
--- a/pkgs/development/compilers/Agda-executable/default.nix
+++ b/pkgs/development/compilers/Agda-executable/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Command-line program for type-checking and compiling Agda programs";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
new file mode 100644
index 000000000000..deb93257df73
--- /dev/null
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "chicken-4.8.1";
+
+  meta = {
+    homepage = http://www.call-cc.org/;
+    description = "Chicken Scheme";
+  };
+
+  src = fetchurl {
+    url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz;
+    md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7";
+  };
+
+  buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
+  installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
+}
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 9633967da6a9..949324ba8b1c 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -10,12 +10,12 @@ else
   throw "Unsupported architecture";
 
 edk2 = stdenv.mkDerivation {
-  name = "edk2-2012-03-13";
+  name = "edk2-2013-03-19";
   
   src = fetchsvn {
     url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
-    rev = "13783";
-    sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
+    rev = "14211";
+    sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7";
   };
 
   buildInputs = [ libuuid pythonFull ];
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
index 1767a61a7d19..9060d313be5a 100644
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Compiler for a simple functional language";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/compilers/gcc/4.7/arm-eabi.patch b/pkgs/development/compilers/gcc/4.7/arm-eabi.patch
new file mode 100644
index 000000000000..63b017062b5b
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.7/arm-eabi.patch
@@ -0,0 +1,230 @@
+Index: gcc-4_7-branch/libstdc++-v3/configure.host
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194580)
+@@ -340,7 +340,7 @@
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libjava/configure.ac
+===================================================================
+--- gcc-4_7-branch/libjava/configure.ac	(revision 194579)
++++ gcc-4_7-branch/libjava/configure.ac	(revision 194580)
+@@ -931,7 +931,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libjava/configure
+===================================================================
+--- gcc-4_7-branch/libjava/configure	(revision 194579)
++++ gcc-4_7-branch/libjava/configure	(revision 194580)
+@@ -20542,7 +20542,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libgcc/config.host
+===================================================================
+--- gcc-4_7-branch/libgcc/config.host	(revision 194579)
++++ gcc-4_7-branch/libgcc/config.host	(revision 194580)
+@@ -327,7 +327,7 @@
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+Index: gcc-4_7-branch/gcc/doc/install.texi
+===================================================================
+--- gcc-4_7-branch/gcc/doc/install.texi	(revision 194579)
++++ gcc-4_7-branch/gcc/doc/install.texi	(revision 194580)
+@@ -3222,7 +3222,7 @@
+ @heading @anchor{arm-x-eabi}arm-*-eabi
+ ARM-family processors.  Subtargets that use the ELF object format
+ require GNU binutils 2.13 or newer.  Such subtargets include:
+-@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
++@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
+ and @code{arm-*-rtemseabi}.
+ 
+ @html
+Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194580)
+@@ -1,4 +1,4 @@
+-/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
++/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
+ 
+ void *foo (void)
+ {
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ #include <limits.h>
+ 
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194580)
+@@ -9,10 +9,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ enum E { 
+   a = -312
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // GROUPS passed enums
+   extern "C" int printf (const char *, ...);
+Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194580)
+@@ -3818,7 +3818,7 @@
+ 		}
+ 	    } ""
+ 	}]
+-    } elseif { [istarget arm*-*-linux-gnueabi] } {
++    } elseif { [istarget arm*-*-linux-gnueabi*] } {
+ 	return [check_runtime sync_longlong_runtime {
+ 	    #include <stdlib.h>
+ 	    int main ()
+@@ -3860,7 +3860,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget bfin*-*linux*]
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+@@ -3890,7 +3890,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194580)
+@@ -1,6 +1,6 @@
+ ! { dg-do run }
+ ! { dg-options "-fshort-enums" }
+-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Program to test enumerations when option -fshort-enums is given
+ 
+ program main
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194580)
+@@ -1,7 +1,7 @@
+ ! { dg-do run }
+ ! { dg-additional-sources enum_10.c }
+ ! { dg-options "-fshort-enums -w" }
+-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Make sure short enums are indeed interoperable with the
+ ! corresponding C type.
+ 
+Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194579)
++++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194580)
+@@ -1866,7 +1866,7 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+Index: gcc-4_7-branch/gcc/config.gcc
+===================================================================
+--- gcc-4_7-branch/gcc/config.gcc	(revision 194579)
++++ gcc-4_7-branch/gcc/config.gcc	(revision 194580)
+@@ -855,7 +855,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+ 	    # Define multilib configuration for arm-linux-androideabi.
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 62a86751a712..92411e6687e2 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -54,7 +54,8 @@ let version = "4.7.2";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    patches = [ ]
+    patches = []
+      ++ optional stdenv.isArm [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index 353a4176ea46..dd79ef9c8e75 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -98,5 +98,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix
index b53ce9aced37..ccb9f434230a 100644
--- a/pkgs/development/compilers/ghc/6.10.1.nix
+++ b/pkgs/development/compilers/ghc/6.10.1.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 02f1db354a1e..7effff83c69a 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -97,5 +97,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix
index 2df43a4c7d75..4988734f5809 100644
--- a/pkgs/development/compilers/ghc/6.10.2.nix
+++ b/pkgs/development/compilers/ghc/6.10.2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   passthru = {
diff --git a/pkgs/development/compilers/ghc/6.10.3.nix b/pkgs/development/compilers/ghc/6.10.3.nix
index 2ecf35eedfe9..f6683278e454 100644
--- a/pkgs/development/compilers/ghc/6.10.3.nix
+++ b/pkgs/development/compilers/ghc/6.10.3.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index 53fd1c522168..92afc0f4b88b 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   passthru = {
diff --git a/pkgs/development/compilers/ghc/6.11.nix b/pkgs/development/compilers/ghc/6.11.nix
index 778b819aa703..914403cdd660 100644
--- a/pkgs/development/compilers/ghc/6.11.nix
+++ b/pkgs/development/compilers/ghc/6.11.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     inherit homepage;
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 }
diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix
index 23486b5f4fa5..6f3411da4af6 100644
--- a/pkgs/development/compilers/ghc/6.12.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix
index 78a000de309e..31c763c4505c 100644
--- a/pkgs/development/compilers/ghc/6.12.1.nix
+++ b/pkgs/development/compilers/ghc/6.12.1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/6.12.2.nix b/pkgs/development/compilers/ghc/6.12.2.nix
index 1a48d6cf3183..5db5fc49fc66 100644
--- a/pkgs/development/compilers/ghc/6.12.2.nix
+++ b/pkgs/development/compilers/ghc/6.12.2.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index bc2d8967cd4b..05ceba030b9f 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix
index 1a5bf059e9f5..8e4e6c58a3f9 100644
--- a/pkgs/development/compilers/ghc/6.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix
@@ -62,5 +62,6 @@ stdenv.mkDerivation {
 
   '' else "";
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/6.4.2.nix b/pkgs/development/compilers/ghc/6.4.2.nix
index c526e5d6cb45..e336d4e83b1b 100644
--- a/pkgs/development/compilers/ghc/6.4.2.nix
+++ b/pkgs/development/compilers/ghc/6.4.2.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 }
diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix
index 994ebc286c30..0f91b9d5052c 100644
--- a/pkgs/development/compilers/ghc/6.6.1.nix
+++ b/pkgs/development/compilers/ghc/6.6.1.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   postInstall = ''
diff --git a/pkgs/development/compilers/ghc/6.8.2.nix b/pkgs/development/compilers/ghc/6.8.2.nix
index 2681f325c929..8af158625906 100644
--- a/pkgs/development/compilers/ghc/6.8.2.nix
+++ b/pkgs/development/compilers/ghc/6.8.2.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   configureFlags=[
diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix
index b6900321552c..281ff61b700c 100644
--- a/pkgs/development/compilers/ghc/6.8.3.nix
+++ b/pkgs/development/compilers/ghc/6.8.3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The Glasgow Haskell Compiler";
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   configureFlags=[
diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix
index db696d2b218c..da7e81f5730c 100644
--- a/pkgs/development/compilers/ghc/7.0.1.nix
+++ b/pkgs/development/compilers/ghc/7.0.1.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
   # TODO: requires a comment as to what it does and why it is needed.
diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix
index 426c8725d0ba..6706b99e2034 100644
--- a/pkgs/development/compilers/ghc/7.0.2.nix
+++ b/pkgs/development/compilers/ghc/7.0.2.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix
index ad80dd9e79d9..0b422043ae28 100644
--- a/pkgs/development/compilers/ghc/7.0.3.nix
+++ b/pkgs/development/compilers/ghc/7.0.3.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 0bfc81a17a4e..455d552b91ac 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
 }
diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix
index 3938d608d331..867df5aae6bf 100644
--- a/pkgs/development/compilers/ghc/7.2.1.nix
+++ b/pkgs/development/compilers/ghc/7.2.1.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 0450537ad900..c6ec0cb75c4d 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index e0a8fee4b660..59eb957a45f4 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
         [ $(./main) == "yes" ]
       '';
 
+  meta.license = stdenv.lib.licenses.bsd3;
   meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
 }
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index ea44e49cca3d..51f3f7f9df4b 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix
index 335befb6c125..99c93c7a980a 100644
--- a/pkgs/development/compilers/ghc/7.6.1.nix
+++ b/pkgs/development/compilers/ghc/7.6.1.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix
index fd678d090a27..ac2810c62b26 100644
--- a/pkgs/development/compilers/ghc/7.6.2.nix
+++ b/pkgs/development/compilers/ghc/7.6.2.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 157b25779b3d..8258ac274190 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       stdenv.lib.maintainers.andres
       stdenv.lib.maintainers.simons
     ];
-    platforms = ghc.meta.platforms;
+    inherit (ghc.meta) license platforms;
   };
 
 }
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index 955daa0ad9fc..9e74643e161f 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}:
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
     sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
     sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
 
     #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
     #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 817e4573df24..1b4f237cca5b 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -5,12 +5,22 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml zlib neko];
 
-  src = fetchsvn {
+  srcs = fetchsvn {
     url = "http://haxe.googlecode.com/svn/tags/v2-10";
-    sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679";
+    sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh";
+    ignoreExternals = true;
+  };
+
+  ocamllibs = fetchsvn {
+    url = "http://ocamllibs.googlecode.com/svn/trunk";
+    sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q";
+    rev = 256;
+    ignoreExternals = true;
   };
 
   prePatch = ''
+    cp -r "$ocamllibs" libs
+    chmod -R u+w libs
     sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
   '';
 
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index b5f9446b8a4a..982f43ec2e94 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Functional Programming Language with Dependent Types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index ddeeb51c25e4..0321ae1f60ab 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "neko-${version}";
-  version = "1.8.2";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "http://nekovm.org/_media/neko-${version}.tar.gz";
-    sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w";
+    sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927";
   };
 
   prePatch = with stdenv.lib; let
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index f607edd0f024..11b0b2ea7b27 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,95 +2,62 @@
 
 assert stdenv ? glibc;
 
-let version = "0.9.25"; in
-  stdenv.mkDerivation {
-    name = "tinycc-${version}";
-
-    src = fetchurl {
-      url = "mirror://savannah/tinycc/tcc-${version}.tar.bz2";
-      sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
-    };
-
-    nativeBuildInputs = [ perl texinfo ];
-
-    patches =
-      [ (fetchurl {
-           # Add support for `alloca' on x86-64.
-           url = "http://repo.or.cz/w/tinycc.git/patch/8ea8305199496ba29b6d0da2de07aea4441844aa";
-           sha256 = "0dz1cm9zihk533hszqql4gxpzbp8c4g9dnvkkh9vs4js6fnz1fl2";
-           name = "x86-64-alloca.patch";
-         })
-
-        (fetchurl {
-           # Fix alignment of the return value of `alloca'.
-           url = "http://repo.or.cz/w/tinycc.git/patch/dca2b15df42c1341794dd412917708416da25594";
-           sha256 = "0617a69gnfdmv8pr6dj3szv97v3zh57439dsbklxrnipx2jv6pq7";
-           name = "x86-64-alloca-align.patch";
-         })
-      ];
-
-    postPatch = ''
-      substituteInPlace "texi2pod.pl" \
-        --replace "/usr/bin/perl" "${perl}/bin/perl"
-
-      # To produce executables, `tcc' needs to know where `crt*.o' are.
-      sed -i "tcc.h" \
-        -e's|define CONFIG_TCC_CRT_PREFIX.*$|define CONFIG_TCC_CRT_PREFIX "${stdenv.glibc}/lib"|g'
-
-      sed -i "libtcc.c" \
-        -e's|tcc_add_library_path(s, CONFIG_SYSROOT "/lib");|tcc_add_library_path(s, "${stdenv.glibc}/lib");|g;
-           s|tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/include");|tcc_add_library_path(s, "${stdenv.glibc}/include");|g ;
-           s|tcc_add_sysinclude_path(s, buf);|tcc_add_sysinclude_path(s, buf); tcc_add_sysinclude_path(s, "${stdenv.glibc}/include");|g'
-
-      # Tell it about the loader's location.
-      sed -i "tccelf.c" \
-        -e's|".*/ld-linux\([^"]\+\)"|"${stdenv.glibc}/lib/ld-linux\1"|g'
-    ''; # "
-
-    postInstall = ''
-      makeinfo --force tcc-doc.texi || true
-
-      mkdir -p "$out/share/info"
-      mv tcc-doc.info* "$out/share/info"
-
-      echo 'int main () { printf ("it works!\n"); exit(0); }' | \
-         "$out/bin/tcc" -run -
-    '';
-
-    doCheck = true;
-    checkTarget = "test";
-
-    meta = {
-      description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
-
-      longDescription =
-        '' TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike
-           other C compilers, it is meant to be self-sufficient: you do not
-           need an external assembler or linker because TCC does that for
-           you.
-
-           TCC compiles so fast that even for big projects Makefiles may not
-           be necessary.
-
-           TCC not only supports ANSI C, but also most of the new ISO C99
-           standard and many GNU C extensions.
-
-           TCC can also be used to make C scripts, i.e. pieces of C source
-           that you run as a Perl or Python script.  Compilation is so fast
-           that your script will be as fast as if it was an executable.
-
-           TCC can also automatically generate memory and bound checks while
-           allowing all C pointers operations.  TCC can do these checks even
-           if non patched libraries are used.
-
-           With libtcc, you can use TCC as a backend for dynamic code
-           generation.
-        '';
-
-      homepage = http://www.tinycc.org/;
-      license = "LGPLv2+";
-
-      platforms = stdenv.lib.platforms.unix;
-      maintainers = [ stdenv.lib.maintainers.ludo ];
-    };
-  }
+stdenv.mkDerivation rec {
+  name = "tcc-0.9.26";
+
+  src = fetchurl {
+    url = "mirror://savannah/tinycc/${name}.tar.bz2";
+    sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj";
+  };
+
+  nativeBuildInputs = [ perl texinfo ];
+
+  postPatch = ''
+    substituteInPlace "texi2pod.pl" \
+      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  preConfigure = ''
+    configureFlagsArray+=("--elfinterp=$(cat $NIX_GCC/nix-support/dynamic-linker)")
+    configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
+    configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
+    configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
+  '';
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = {
+    description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
+
+    longDescription =
+      '' TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike
+         other C compilers, it is meant to be self-sufficient: you do not
+         need an external assembler or linker because TCC does that for
+         you.
+
+         TCC compiles so fast that even for big projects Makefiles may not
+         be necessary.
+
+         TCC not only supports ANSI C, but also most of the new ISO C99
+         standard and many GNU C extensions.
+
+         TCC can also be used to make C scripts, i.e. pieces of C source
+         that you run as a Perl or Python script.  Compilation is so fast
+         that your script will be as fast as if it was an executable.
+
+         TCC can also automatically generate memory and bound checks while
+         allowing all C pointers operations.  TCC can do these checks even
+         if non patched libraries are used.
+
+         With libtcc, you can use TCC as a backend for dynamic code
+         generation.
+      '';
+
+    homepage = http://www.tinycc.org/;
+    license = "LGPLv2+";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index d09e995e95c0..45793b25d25b 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -29,7 +29,7 @@
 
   enableParallelBuilding = true;
 
-  patches = [ ./disable-gc-sensitive-tests.patch ] ++
+  patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
   # Explicitly link against libgcc_s, to work around the infamous
diff --git a/pkgs/development/interpreters/guile/eai_system.patch b/pkgs/development/interpreters/guile/eai_system.patch
new file mode 100644
index 000000000000..b0eb7ac44dae
--- /dev/null
+++ b/pkgs/development/interpreters/guile/eai_system.patch
@@ -0,0 +1,24 @@
+Building nixpkgs in non-chroot, NSS modules may fail
+and that will report EAI_SYSTEM in getaddrinfo.
+https://bugzilla.novell.com/show_bug.cgi?id=794696
+
+Index: guile-2.0.7/test-suite/tests/net-db.test
+===================================================================
+--- guile-2.0.7.orig/test-suite/tests/net-db.test
++++ guile-2.0.7/test-suite/tests/net-db.test
+@@ -79,6 +79,7 @@
+                      (and (defined? 'EAI_NODATA)  ; GNU extension
+                           (= errcode EAI_NODATA))
+                      (= errcode EAI_AGAIN)
++                     (= errcode EAI_SYSTEM)
+                      (begin
+                        (format #t "unexpected error code: ~a ~s~%"
+                                errcode (gai-strerror errcode))
+@@ -105,6 +106,7 @@
+             ;; `EAI_NONAME'.)
+             (and (or (= errcode EAI_SERVICE)
+                      (= errcode EAI_NONAME)
++                     (= errcode EAI_SYSTEM)
+                      (and (defined? 'EAI_NODATA)
+                           (= errcode EAI_NODATA)))
+                  (string? (gai-strerror errcode))))))))
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index b545fe8b55f2..73f13c11a7db 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -3,14 +3,14 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
 fftw, fftwSinglePrec, zlib, curl, qrupdate }:
 
 stdenv.mkDerivation rec {
-  name = "octave-3.6.3";
+  name = "octave-3.6.4";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.bz2";
-    sha256 = "11i82vyf514rvdqcgdanw0ppvag8lcm6198rars0dd0w1xahjzg3";
+    sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
+    graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
     fftw fftwSinglePrec qrupdate ];
 
   doCheck = true;
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
deleted file mode 100644
index 8600c5b9c820..000000000000
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv, fetchurl
-, bzip2
-, db4
-, gdbm
-, libX11, xproto
-, ncurses
-, openssl
-, readline
-, sqlite
-, tcl, tk
-, zlib
-}:
-
-assert readline != null -> ncurses != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "3.2";
-  version = "${majorVersion}.3";
-
-  buildInputs = filter (p: p != null) [
-    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
-  ];
-in
-stdenv.mkDerivation {
-  name = "python3-${version}";
-  inherit majorVersion version;
-
-  src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "5648ec81f93870fde2f0aa4ed45c8718692b15ce6fd9ed309bfb827ae12010aa";
-  };
-
-  preConfigure = ''
-    for i in /usr /sw /opt /pkg; do	# improve purity
-      substituteInPlace ./setup.py --replace $i /no-such-path
-    done
-    ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
-
-    configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
-                          LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
-                        )
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  postInstall = ''
-    rm -rf "$out/lib/python${majorVersion}/test"
-  '';
-
-  passthru = {
-    zlibSupport = zlib != null;
-    sqliteSupport = sqlite != null;
-    db4Support = db4 != null;
-    readlineSupport = readline != null;
-    opensslSupport = openssl != null;
-    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
-    libPrefix = "python${majorVersion}m";
-  };
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "http://python.org";
-    description = "a high-level dynamically-typed programming language";
-    longDescription = ''
-      Python is a remarkably powerful dynamic programming language that
-      is used in a wide variety of application domains. Some of its key
-      distinguishing features include: clear, readable syntax; strong
-      introspection capabilities; intuitive object orientation; natural
-      expression of procedural code; full modularity, supporting
-      hierarchical packages; exception-based error handling; and very
-      high level dynamic data types.
-    '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh
deleted file mode 100644
index e6fa34bf54ba..000000000000
--- a/pkgs/development/interpreters/python/3.2/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages
-}
-
-toPythonPath() {
-    local paths="$1"
-    local result=
-    for i in $paths; do
-        p="$i/lib/python3.2/site-packages"
-        result="${result}${result:+:}$p"
-    done
-    echo $result
-}
-
-envHooks=(${envHooks[@]} addPythonPath)
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 45c14dd72a30..fb0464196d8e 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, fetchurl
 , bzip2
 , db4
 , gdbm
@@ -17,10 +17,9 @@ with stdenv.lib;
 
 let
   majorVersion = "3.3";
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.1rc1";
 
   buildInputs = filter (p: p != null) [
-    pkgconfig # ToDo?: system expat, libffi libmpcdec
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
   ];
 in
@@ -29,8 +28,8 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "1mxvyl890br2wk4dn8giw3ihajjsh2ljg59qnas63vx8hll4v689";
+    url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
+    sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 0f2f46cd568d..d2783ffb085e 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
       makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
     done
     ensureDir "$out/share"
-    ln "$python/share/man" "$out/share/man" -s
+    ln -s "$python/share/man" "$out/share/man"
   '';
 
   inherit python;
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 4a6713580da7..d0e4fee33595 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cairo, file, pango, glib, gtk
 , which, libtool, makeWrapper, libjpeg, libpng
-, fontconfig, liberation_ttf } :
+, fontconfig, liberation_ttf, sqlite } :
 
 stdenv.mkDerivation rec {
   pname = "racket";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   # Various racket executables do run-time searches for these.
-  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib";
+  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib";
 
-  buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf ];
+  buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];
 
   preConfigure = ''
     export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH
diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 2f276fc163a6..d4bb7fa4f2d1 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -4,12 +4,12 @@ g: # Get dependencies from patched gems
 {
   aliases = {
     ZenTest = g.ZenTest_4_9_0;
-    actionmailer = g.actionmailer_3_2_12;
-    actionpack = g.actionpack_3_2_12;
-    activemodel = g.activemodel_3_2_12;
-    activerecord = g.activerecord_3_2_12;
-    activeresource = g.activeresource_3_2_12;
-    activesupport = g.activesupport_3_2_12;
+    actionmailer = g.actionmailer_3_2_13;
+    actionpack = g.actionpack_3_2_13;
+    activemodel = g.activemodel_3_2_13;
+    activerecord = g.activerecord_3_2_13;
+    activeresource = g.activeresource_3_2_13;
+    activesupport = g.activesupport_3_2_13;
     addressable = g.addressable_2_3_3;
     arel = g.arel_3_0_2;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
@@ -17,7 +17,7 @@ g: # Get dependencies from patched gems
     aws_sdk = g.aws_sdk_1_8_5;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
     builder = g.builder_3_2_0;
-    buildr = g.buildr_1_4_10;
+    buildr = g.buildr_1_4_11;
     bundler = g.bundler_1_3_4;
     childprocess = g.childprocess_0_3_9;
     chronic = g.chronic_0_9_1;
@@ -28,48 +28,51 @@ g: # Get dependencies from patched gems
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
+    execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_6;
+    faraday = g.faraday_0_8_7;
     faraday_middleware = g.faraday_middleware_0_8_8;
-    ffi = g.ffi_1_4_0;
+    ffi = g.ffi_1_6_0;
     file_tail = g.file_tail_1_0_12;
     foreman = g.foreman_0_62_0;
-    highline = g.highline_1_6_15;
+    highline = g.highline_1_6_16;
     hike = g.hike_1_2_1;
     hoe = g.hoe_3_1_0;
     i18n = g.i18n_0_6_4;
     journey = g.journey_1_0_4;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_4_6_2;
+    jsduck = g.jsduck_4_7_1;
     json = g.json_1_7_7;
     json_pure = g.json_pure_1_7_7;
     libv8 = g.libv8_3_3_10_4;
     macaddr = g.macaddr_1_6_1;
-    mail = g.mail_2_4_4;
+    mail = g.mail_2_5_3;
     mime_types = g.mime_types_1_21;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_6_1;
+    multi_json = g.multi_json_1_7_2;
     multipart_post = g.multipart_post_1_2_0;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_6;
     nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_5_6;
+    nokogiri = g.nokogiri_1_5_9;
     papertrail = g.papertrail_0_9_7;
     papertrail_cli = g.papertrail_cli_0_9_3;
-    parallel = g.parallel_0_6_2;
+    parallel = g.parallel_0_6_3;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_5_2;
     rack_cache = g.rack_cache_1_2;
     rack_protection = g.rack_protection_1_5_0;
     rack_ssl = g.rack_ssl_1_3_3;
     rack_test = g.rack_test_0_6_2;
-    rails = g.rails_3_2_12;
-    railties = g.railties_3_2_12;
-    rake = g.rake_10_0_3;
+    rails = g.rails_3_2_13;
+    railties = g.railties_3_2_13;
+    rake = g.rake_10_0_4;
     rb_fsevent = g.rb_fsevent_0_9_3;
     rdiscount = g.rdiscount_2_0_7_1;
     rdoc = g.rdoc_3_12_2;
     remote_syslog = g.remote_syslog_1_6_13;
+    right_aws = g.right_aws_3_0_5;
+    right_http_connection = g.right_http_connection_1_3_0;
     rjb = g.rjb_1_4_6;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
@@ -85,9 +88,9 @@ g: # Get dependencies from patched gems
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
     therubyracer = g.therubyracer_0_10_2;
-    thin = g.thin_1_5_0;
-    thor = g.thor_0_17_0;
-    tilt = g.tilt_1_3_5;
+    thin = g.thin_1_5_1;
+    thor = g.thor_0_18_0;
+    tilt = g.tilt_1_3_6;
     tins = g.tins_0_7_2;
     treetop = g.treetop_1_4_12;
     tzinfo = g.tzinfo_0_3_37;
@@ -97,7 +100,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
   gems = {
     ZenTest_4_9_0 = {
       basename = ''ZenTest'';
@@ -130,71 +133,71 @@ installed versions.'';
       requiredGems = [  ];
       sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
     };
-    actionmailer_3_2_12 = {
+    actionmailer_3_2_13 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.2.12'';
-      requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ];
-      sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7'';
+      name = ''actionmailer-3.2.13'';
+      requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ];
+      sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06'';
     };
-    actionpack_3_2_12 = {
+    actionpack_3_2_13 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
-      sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk'';
+      name = ''actionpack-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
+      sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w'';
     };
-    activemodel_3_2_12 = {
+    activemodel_3_2_13 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ];
-      sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf'';
+      name = ''activemodel-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ];
+      sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5'';
     };
-    activerecord_3_2_12 = {
+    activerecord_3_2_13 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ];
-      sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
+      name = ''activerecord-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ];
+      sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85'';
     };
-    activeresource_3_2_12 = {
+    activeresource_3_2_13 = {
       basename = ''activeresource'';
       meta = {
         description = ''REST modeling framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
       };
-      name = ''activeresource-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ];
-      sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi'';
+      name = ''activeresource-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ];
+      sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l'';
     };
-    activesupport_3_2_12 = {
+    activesupport_3_2_13 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.2.12'';
-      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
-      sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
+      name = ''activesupport-3.2.13'';
+      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ];
+      sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y'';
     };
     addressable_2_3_3 = {
       basename = ''addressable'';
@@ -270,7 +273,7 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''AWS SDK for Ruby'';
       };
       name = ''aws-sdk-1.8.5'';
-      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
+      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ];
       sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
     };
     bitbucket_backup_0_2_2 = {
@@ -281,7 +284,7 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
       name = ''bitbucket-backup-0.2.2'';
-      requiredGems = [ g.highline_1_6_15 g.json_1_7_7 ];
+      requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ];
       sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
     };
     builder_3_0_4 = {
@@ -332,7 +335,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
     };
-    buildr_1_4_10 = {
+    buildr_1_4_11 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -344,9 +347,9 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.10'';
+      name = ''buildr-1.4.11'';
       requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
-      sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
+      sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4'';
     };
     bundler_1_3_4 = {
       basename = ''bundler'';
@@ -367,7 +370,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
       name = ''childprocess-0.3.9'';
-      requiredGems = [ g.ffi_1_4_0 ];
+      requiredGems = [ g.ffi_1_6_0 ];
       sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
     };
     chronic_0_9_1 = {
@@ -492,6 +495,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
+    execjs_1_4_0 = {
+      basename = ''execjs'';
+      meta = {
+        description = ''Run JavaScript code from Ruby'';
+        homepage = ''https://github.com/sstephenson/execjs'';
+        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
+      };
+      name = ''execjs-1.4.0'';
+      requiredGems = [ g.multi_json_1_7_2 ];
+      sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
+    };
     fakes3_0_1_5 = {
       basename = ''fakes3'';
       meta = {
@@ -499,18 +513,18 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
       name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
+      requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    faraday_0_8_6 = {
+    faraday_0_8_7 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.6'';
+      name = ''faraday-0.8.7'';
       requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy'';
+      sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
     };
     faraday_middleware_0_8_8 = {
       basename = ''faraday_middleware'';
@@ -520,19 +534,19 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Various middleware for Faraday'';
       };
       name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_6 ];
+      requiredGems = [ g.faraday_0_8_7 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
-    ffi_1_4_0 = {
+    ffi_1_6_0 = {
       basename = ''ffi'';
       meta = {
         description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
         longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.4.0'';
+      name = ''ffi-1.6.0'';
       requiredGems = [  ];
-      sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
+      sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v'';
     };
     file_tail_1_0_12 = {
       basename = ''file_tail'';
@@ -553,10 +567,10 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Process manager for applications with multiple components'';
       };
       name = ''foreman-0.62.0'';
-      requiredGems = [ g.thor_0_17_0 ];
+      requiredGems = [ g.thor_0_18_0 ];
       sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
     };
-    highline_1_6_15 = {
+    highline_1_6_16 = {
       basename = ''highline'';
       meta = {
         description = ''HighLine is a high-level command-line IO library.'';
@@ -567,9 +581,9 @@ crank out anything from simple list selection to complete shells with just
 minutes of work.
 '';
       };
-      name = ''highline-1.6.15'';
+      name = ''highline-1.6.16'';
       requiredGems = [  ];
-      sha256 = ''1ilwlgylv92md9dnw6hqhrw8hiwk3f4k8qz6airqjp1rq9r594m1'';
+      sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi'';
     };
     highline_1_6_2 = {
       basename = ''highline'';
@@ -617,6 +631,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.rake_0_9_6 ];
       sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
     };
+    i18n_0_6_1 = {
+      basename = ''i18n'';
+      meta = {
+        description = ''New wave Internationalization support for Ruby'';
+        homepage = ''http://github.com/svenfuchs/i18n'';
+        longDescription = ''New wave Internationalization support for Ruby.'';
+      };
+      name = ''i18n-0.6.1'';
+      requiredGems = [  ];
+      sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
+    };
     i18n_0_6_4 = {
       basename = ''i18n'';
       meta = {
@@ -650,16 +675,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_4_6_2 = {
+    jsduck_4_7_1 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-4.6.2'';
-      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
-      sha256 = ''035w4igfa6yy6234ff4zbiqfjn0bhwqs6k8kji52l7gzgskwmzln'';
+      name = ''jsduck-4.7.1'';
+      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
+      sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv'';
     };
     json_1_7_7 = {
       basename = ''json'';
@@ -716,16 +741,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.systemu_2_5_2 ];
       sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
     };
-    mail_2_4_4 = {
+    mail_2_5_3 = {
       basename = ''mail'';
       meta = {
         description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
         homepage = ''http://github.com/mikel/mail'';
         longDescription = ''A really Ruby Mail handler.'';
       };
-      name = ''mail-2.4.4'';
+      name = ''mail-2.5.3'';
       requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
-      sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
+      sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k'';
     };
     mime_types_1_21 = {
       basename = ''mime_types'';
@@ -770,16 +795,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_6_1 = {
+    multi_json_1_7_2 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
       };
-      name = ''multi_json-1.6.1'';
+      name = ''multi_json-1.7.2'';
       requiredGems = [  ];
-      sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
+      sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -836,7 +861,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    nokogiri_1_5_6 = {
+    nokogiri_1_5_9 = {
       basename = ''nokogiri'';
       meta = {
         description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
@@ -847,9 +872,9 @@ many features is the ability to search documents via XPath or CSS3 selectors.
 XML is like violence - if it doesn’t solve your problems, you are not using
 enough of it.'';
       };
-      name = ''nokogiri-1.5.6'';
+      name = ''nokogiri-1.5.9'';
       requiredGems = [  ];
-      sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
+      sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9'';
     };
     papertrail_0_9_7 = {
       basename = ''papertrail'';
@@ -859,7 +884,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -873,15 +898,15 @@ enough of it.'';
       requiredGems = [ g.papertrail_0_9_7 ];
       sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
     };
-    parallel_0_6_2 = {
+    parallel_0_6_3 = {
       basename = ''parallel'';
       meta = {
         description = ''Run any kind of code in parallel processes'';
-        homepage = ''http://github.com/grosser/parallel'';
+        homepage = ''https://github.com/grosser/parallel'';
       };
-      name = ''parallel-0.6.2'';
+      name = ''parallel-0.6.3'';
       requiredGems = [  ];
-      sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
+      sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n'';
     };
     polyglot_0_3_3 = {
       basename = ''polyglot'';
@@ -981,27 +1006,27 @@ request helpers feature.'';
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_3_2_12 = {
+    rails_3_2_13 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.2.12'';
-      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ];
-      sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
+      name = ''rails-3.2.13'';
+      requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ];
+      sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz'';
     };
-    railties_3_2_12 = {
+    railties_3_2_13 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.2.12'';
-      requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_2 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
-      sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw'';
+      name = ''railties-3.2.13'';
+      requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ];
+      sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
@@ -1025,16 +1050,16 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
     };
-    rake_10_0_3 = {
+    rake_10_0_4 = {
       basename = ''rake'';
       meta = {
         description = ''Ruby based make-like utility.'';
         homepage = ''http://rake.rubyforge.org'';
         longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
       };
-      name = ''rake-10.0.3'';
+      name = ''rake-10.0.4'';
       requiredGems = [  ];
-      sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf'';
+      sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1'';
     };
     rb_fsevent_0_9_3 = {
       basename = ''rb_fsevent'';
@@ -1083,6 +1108,73 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
       sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
     };
+    right_aws_3_0_5 = {
+      basename = ''right_aws'';
+      meta = {
+        description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
+        longDescription = ''== DESCRIPTION:
+
+The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
+These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.
+The RightScale AWS gems comprise:
+
+- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
+  associated EBS (Elastic Block Store)
+- RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
+- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
+- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
+- RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
+- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+
+== FEATURES:
+
+- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
+- Complete error handling: all operations check for errors and report complete
+  error information by raising an AwsError.
+- Persistent HTTP connections with robust network-level retry layer using
+  RightHttpConnection).  This includes socket timeouts and retries.
+- Robust HTTP-level retry layer.  Certain (user-adjustable) HTTP errors returned
+  by Amazon's services are classified as temporary errors.
+  These errors are automaticallly retried using exponentially increasing intervals.
+  The number of retries is user-configurable.
+- Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
+- Uses libxml (if available) for faster response parsing.
+- Support for large S3 list operations.  Buckets and key subfolders containing
+  many (&gt; 1000) keys are listed in entirety.  Operations based on list (like
+  bucket clear) work on arbitrary numbers of keys.
+- Support for streaming GETs from S3, and streaming PUTs to S3 if the data source is a file.
+- Support for single-threaded usage, multithreaded usage, as well as usage with multiple
+  AWS accounts.
+- Support for both first- and second-generation SQS (API versions 2007-05-01
+  and 2008-01-01).  These versions of SQS are not compatible.
+- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
+- Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
+- Test suite (requires AWS account to do "live" testing).
+'';
+      };
+      name = ''right_aws-3.0.5'';
+      requiredGems = [ g.right_http_connection_1_3_0 ];
+      sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k'';
+    };
+    right_http_connection_1_3_0 = {
+      basename = ''right_http_connection'';
+      meta = {
+        description = ''RightScale's robust HTTP/S connection module'';
+        homepage = ''http://rightscale.rubyforge.org/'';
+        longDescription = ''Rightscale::HttpConnection is a robust HTTP/S library.  It implements a retry
+algorithm for low-level network errors.
+
+== FEATURES:
+
+- provides put/get streaming
+- does configurable retries on connect and read timeouts, DNS failures, etc.
+- HTTPS certificate checking
+'';
+      };
+      name = ''right_http_connection-1.3.0'';
+      requiredGems = [  ];
+      sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap'';
+    };
     rjb_1_4_2 = {
       basename = ''rjb'';
       meta = {
@@ -1202,7 +1294,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
       name = ''selenium-webdriver-2.31.0'';
-      requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
       sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
     };
     servolux_0_10_0 = {
@@ -1227,7 +1319,7 @@ interpreters.'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
       name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
     sprockets_2_2_2 = {
@@ -1238,7 +1330,7 @@ interpreters.'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
       name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ];
+      requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ];
       sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
     };
     syslog_protocol_0_9_2 = {
@@ -1274,38 +1366,38 @@ interpreters.'';
       requiredGems = [ g.libv8_3_3_10_4 ];
       sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
     };
-    thin_1_5_0 = {
+    thin_1_5_1 = {
       basename = ''thin'';
       meta = {
         description = ''A thin and fast web server'';
         homepage = ''http://code.macournoyer.com/thin/'';
         longDescription = ''A thin and fast web server'';
       };
-      name = ''thin-1.5.0'';
+      name = ''thin-1.5.1'';
       requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
-      sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
+      sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
     };
-    thor_0_17_0 = {
+    thor_0_18_0 = {
       basename = ''thor'';
       meta = {
         description = ''A scripting framework that replaces rake, sake and rubigen'';
         homepage = ''http://whatisthor.com/'';
         longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
       };
-      name = ''thor-0.17.0'';
+      name = ''thor-0.18.0'';
       requiredGems = [  ];
-      sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
+      sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan'';
     };
-    tilt_1_3_5 = {
+    tilt_1_3_6 = {
       basename = ''tilt'';
       meta = {
         description = ''Generic interface to multiple Ruby template engines'';
         homepage = ''http://github.com/rtomayko/tilt/'';
         longDescription = ''Generic interface to multiple Ruby template engines'';
       };
-      name = ''tilt-1.3.5'';
+      name = ''tilt-1.3.6'';
       requiredGems = [  ];
-      sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd'';
+      sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6'';
     };
     tins_0_7_2 = {
       basename = ''tins'';
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 10b0b2023877..c4da956b57c8 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -1,5 +1,5 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
-, zlib, libuuid, gems, jdk, python }:
+, zlib, libuuid, gems, jdk, python, stdenv }:
 
 let
 
@@ -15,7 +15,32 @@ in
 {
   sup = { buildInputs = [ gems.ncursesw ]; };
 
-  libv8 = { buildInputs = [ python ]; };
+  libv8 = {
+    # This fix is needed to fool scons, which clears the environment by default.
+    # It's ugly, but it works.
+    #
+    # We create a gcc wrapper wrapper, which reexposes the environment variables
+    # that scons hides. Furthermore, they treat warnings as errors causing the
+    # build to fail, due to an unused variable.
+    #
+    # Finally, we must set CC and AR explicitly to allow scons to find the
+    # compiler and archiver
+    
+    preBuild = ''
+      cat > $TMPDIR/g++ <<EOF
+      #! ${stdenv.shell}
+      $(export)
+      
+      g++ \$(echo \$@ | sed 's/-Werror//g')
+      EOF
+      chmod +x $TMPDIR/g++
+      
+      
+      export CXX=$TMPDIR/g++
+      export AR=$(type -p ar)
+    '';
+    buildInputs = [ python ];
+  };
   
   sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
   
diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix
index daaf6fdd584d..f116da12643e 100644
--- a/pkgs/development/libraries/aterm/2.5.nix
+++ b/pkgs/development/libraries/aterm/2.5.nix
@@ -16,14 +16,15 @@ stdenv.mkDerivation {
     # SIZEOF_LONG, SIZEOF_INT and SIZEOF_VOID_P being set.
     ./sizeof.patch
   ];
-  
+
   doCheck = true;
 
-  dontDisableStatic = true; 
+  dontDisableStatic = true;
 
   meta = {
     homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
     license = "LGPL";
     description = "Library for manipulation of term data structures in C";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix
index 100e3456ca43..9266250527e6 100644
--- a/pkgs/development/libraries/ffmpeg/1.1.nix
+++ b/pkgs/development/libraries/ffmpeg/1.1.nix
@@ -6,11 +6,13 @@
 , vpxSupport ? false, libvpx ? null
 , x264Support ? true, x264 ? null
 , xvidSupport ? true, xvidcore ? null
+, opusSupport ? true, libopus ? null
 , vdpauSupport ? true, libvdpau ? null
 , vaapiSupport ? true, libva ? null
 , faacSupport ? false, faac ? null
 , dc1394Support ? false, libdc1394 ? null
 , x11grabSupport ? false, libXext ? null, libXfixes ? null
+, playSupport ? true, SDL ? null
 }:
 
 assert speexSupport -> speex != null;
@@ -19,10 +21,12 @@ assert vorbisSupport -> libvorbis != null;
 assert vpxSupport -> libvpx != null;
 assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
+assert opusSupport -> libopus != null;
 assert vdpauSupport -> libvdpau != null;
 assert vaapiSupport -> libva != null;
 assert faacSupport -> faac != null;
 assert x11grabSupport -> libXext != null && libXfixes != null;
+assert playSupport -> SDL != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-1.1.3";
@@ -39,7 +43,6 @@ stdenv.mkDerivation rec {
     "--enable-gpl"
     "--enable-postproc"
     "--enable-swscale"
-    "--disable-ffplay"
     "--enable-shared"
     "--enable-avresample"
     "--enable-runtime-cpudetect"
@@ -51,10 +54,12 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
     ++ stdenv.lib.optional x264Support "--enable-libx264"
     ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional opusSupport "--enable-libopus"
     ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
-    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
+    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
+    ++ stdenv.lib.optional playSupport "--enable-ffplay";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
     ++ stdenv.lib.optional mp3Support lame
@@ -64,11 +69,13 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional vpxSupport libvpx
     ++ stdenv.lib.optional x264Support x264
     ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional opusSupport libopus
     ++ stdenv.lib.optional vdpauSupport libvdpau
     ++ stdenv.lib.optional vaapiSupport libva
     ++ stdenv.lib.optional faacSupport faac
     ++ stdenv.lib.optional dc1394Support libdc1394
-    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
+    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
+    ++ stdenv.lib.optional playSupport SDL;
 
   enableParallelBuilding = true;
     
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 6b4fbe7df6ce..e096c5fa94f3 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}:
+{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}:
 let
   version = "3.3.2";
   localDefs = builderDefs.passthru.function { 
@@ -12,6 +12,7 @@ let
                         # some distros seem to be shipping both versions within the same package?
                         # why does --enable-float still result in ..3f.so instead of ..3.so?
                    ++ (if singlePrecision then [ "--enable-single" ] else [ ])
+                   ++ (if float then [ "--enable-float" ] else [ ])
 		   ++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
 		   ++ (stdenv.lib.optional pthreads "--enable-threads")
                         # I think all i686 has sse
diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix
index 3006ff490136..413a0d7aae82 100644
--- a/pkgs/development/libraries/glibc/2.17/common.nix
+++ b/pkgs/development/libraries/glibc/2.17/common.nix
@@ -3,7 +3,7 @@
 
 cross:
 
-{ name, fetchurl, stdenv, installLocales ? false
+{ name, fetchurl, fetchgit ? null, stdenv, installLocales ? false
 , gccCross ? null, kernelHeaders ? null
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
@@ -31,15 +31,16 @@ stdenv.mkDerivation ({
 
   enableParallelBuilding = true;
 
-  patches =
+  /* Don't try to apply these patches to the Hurd's snapshot, which is
+     older.  */
+  patches = stdenv.lib.optionals (hurdHeaders == null)
     [ /* Have rpcgen(1) look for cpp(1) in $PATH.  */
       ./rpcgen-path.patch
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
 
-      /* Don't use /etc/ld.so.cache, for non-NixOS systems.  Currently
-         disabled on GNU/Hurd, which uses a more recent libc snapshot. */
+      /* Don't use /etc/ld.so.cache, for non-NixOS systems.  */
       ./dont-use-system-ld-so-cache.patch
 
       /* Without this patch many KDE binaries crash. */
@@ -118,16 +119,26 @@ stdenv.mkDerivation ({
 
 # Remove the `gccCross' attribute so that the *native* glibc store path
 # doesn't depend on whether `gccCross' is null or not.
-// (removeAttrs args [ "gccCross" "fetchurl" ]) //
+// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" ]) //
 
 {
   name = name + "-${version}" +
     stdenv.lib.optionalString (cross != null) "-${cross.config}";
 
-  src = fetchurl {
-    url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-    sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
-  };
+  src =
+    if hurdHeaders != null
+    then fetchgit {
+      # Shamefully the "official" glibc won't build on GNU, so use the one
+      # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
+      # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
+      url = "git://git.sv.gnu.org/hurd/glibc.git";
+      sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
+      rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
+    }
+    else fetchurl {
+      url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
+      sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
+    };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
   preConfigure = ''
diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix
index 0a0752570f32..b6d91c932db8 100644
--- a/pkgs/development/libraries/glibc/2.17/default.nix
+++ b/pkgs/development/libraries/glibc/2.17/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernelHeaders
+{ stdenv, fetchurl, fetchgit ? null, kernelHeaders
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
 , installLocales ? true
@@ -18,8 +18,8 @@ in
       + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
       + stdenv.lib.optionalString debugSymbols "-debug";
 
-    inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
-      gccCross;
+    inherit fetchurl fetchgit stdenv kernelHeaders installLocales
+      profilingLibraries gccCross;
 
     builder = ./builder.sh;
 
@@ -56,7 +56,7 @@ in
 
   (if hurdHeaders != null
    then rec {
-     inherit machHeaders hurdHeaders libpthreadHeaders mig;
+     inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit;
 
      propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ];
 
diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix
index bbcfd4a0c921..e4b78876c57a 100644
--- a/pkgs/development/libraries/haskell/AC-Vector/default.nix
+++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Efficient geometric vectors and transformations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index ea32e6358987..0c3a87a4059e 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "A dependently typed functional programming language and proof assistant";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix
index 6cbd760b4aca..89661b14481b 100644
--- a/pkgs/development/libraries/haskell/AspectAG/default.nix
+++ b/pkgs/development/libraries/haskell/AspectAG/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Attribute Grammars in the form of an EDSL";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 4503c0fec548..2a8fc76b53c1 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -2,12 +2,15 @@
 
 cabal.mkDerivation (self: {
   pname = "Boolean";
-  version = "0.1.2";
-  sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6";
+  version = "0.2";
+  sha256 = "1r8qvsfbfjfp453pdy9ci9w584ad9bm4xv0ynx4b1yny34ag3zr3";
   meta = {
-    description = "Generalized booleans";
+    description = "Generalized booleans and numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
index 09171ab25706..7b666a1cf6e0 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A framework for packaging Haskell software";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
index 2814eae845f2..16facf73f9fc 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A framework for packaging Haskell software";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index a59e4ca7f422..31789974b6bc 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A library for generating 2D Charts and Plots";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
index 48231a1b6d2b..d2ed408c401f 100644
--- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
+++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "For testing partial and infinite values";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 29d417562ccb..bdc86cf1385a 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Configuration file reading & writing";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 4a413e2e7b85..ee584e2ed8fe 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "CouchDB interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index c7d10d0160d8..feb28002355a 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Collects together existing Haskell cryptographic functions into a package";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index e3c6b11e55b1..54106de1e091 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "RFC 4918 WebDAV support";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix
index 409afcd45b07..94fdb79fbcb1 100644
--- a/pkgs/development/libraries/haskell/DSH/default.nix
+++ b/pkgs/development/libraries/haskell/DSH/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Database Supported Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
index 04149400ff8c..134a7fc3f986 100644
--- a/pkgs/development/libraries/haskell/Diff/default.nix
+++ b/pkgs/development/libraries/haskell/Diff/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "O(ND) diff algorithm in haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix
index daef52bec752..e7167baab7d7 100644
--- a/pkgs/development/libraries/haskell/FerryCore/default.nix
+++ b/pkgs/development/libraries/haskell/FerryCore/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Ferry Core Components";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
index f204bcdf6554..cb266ac99ce5 100644
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ b/pkgs/development/libraries/haskell/GLFW/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding for GLFW";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index d719e8179d45..91bd5737cf93 100644
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A raw binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
index 32e45aebeb27..302b1fb8fb9e 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
index 64bc7feaf176..13f513551c4f 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
index 2b9a0fadfc92..955fd51b702b 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
index e5ff3951d3c3..3248631be3e2 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
index d65dfa15c6f3..4e80684cbae9 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL Utility Toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
new file mode 100644
index 000000000000..710f2b2ab844
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix
@@ -0,0 +1,21 @@
+{ 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;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix
index 08ae46179569..922b18d9f83a 100644
--- a/pkgs/development/libraries/haskell/Glob/default.nix
+++ b/pkgs/development/libraries/haskell/Glob/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Globbing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
index d22273f2030b..421e64ee7a24 100644
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Simple 3D vector library";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix
index d61abc7a245d..88563876132e 100644
--- a/pkgs/development/libraries/haskell/Graphalyze/default.nix
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Graph-Theoretic Analysis library";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
index 50994384c966..40091d3e7ba4 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "ODBC driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
index b66ed3ce28f6..a78d46541f74 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "PostgreSQL driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
index 783c4c186e2c..aa983026c915 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Sqlite v3 driver for HDBC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
index a8275c31b858..c39c68d9f76b 100644
--- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix
+++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Haskell Database Connectivity";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HGL/default.nix b/pkgs/development/libraries/haskell/HGL/default.nix
deleted file mode 100644
index 954401b31e3d..000000000000
--- a/pkgs/development/libraries/haskell/HGL/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal, X11 }:
-
-cabal.mkDerivation (self: {
-  pname = "HGL";
-  version = "3.2.0.2";
-  sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz";
-  buildDepends = [ X11 ];
-  meta = {
-    description = "A simple graphics library based on X11 or Win32";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 35b03f77dde6..657e4899b7b2 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Heterogeneous lists";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index f80f74a3dc2b..107e3df979b2 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -1,5 +1,5 @@
 { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
-, regexPosix
+, regexPosix, fetchurl
 }:
 
 cabal.mkDerivation (self: {
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     filepath hslogger MissingH mtl regexBase regexCompat regexPosix
   ];
+  patches = [ (fetchurl { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0fw2ihl4hlncggwf3v4d7aydm3rzgzpcxplfbwq7janysix4q950"; }) ];
   meta = {
     homepage = "http://software.complete.org/hsh";
     description = "Library to mix shell scripting with Haskell programs";
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 3011f3a44466..ee150c3e946d 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HStringTemplate";
-  version = "0.7.0";
-  sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai";
+  version = "0.7.1";
+  sha256 = "0hqc1496xazihlww8j90m1cwzj7cihqbfjdly9s8kjf8d5my64ld";
   buildDepends = [
     blazeBuilder deepseq filepath mtl parsec syb text time utf8String
     void
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "StringTemplate implementation in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
index ac4ac232edf8..69e84d88f881 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
index 0beebbfe2944..1f17f7488855 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
index 31cfdddac79e..405e7672bfb3 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
index 8d4a39526b2a..1a54d1ed8bb5 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
index f3da4a5ccf22..11af0863cf17 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
index e6238a5e738f..b21d853b7146 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
index d9e422f9e895..78ba7772b1ec 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
index 93ba5e949db8..ca17c1869ab8 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
index 1b52261dea08..3ad33fe86c13 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
index 01130de10cd9..ebf561825ce0 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
index e14aad1a015c..ec65d160e866 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
index 2cb9f859f462..9c58da37b503 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
index 8ad518ee1f6d..e0dd6bd2bc17 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
index 9ac01e70865d..2682c0ab4202 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
index 06ac5fa1bbf6..e98d2a785180 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A unit testing framework for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix
new file mode 100644
index 000000000000..cbebb60b1748
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix
@@ -0,0 +1,18 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "HUnit";
+  version = "1.2.5.2";
+  sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
+  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;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
index 55898e9d9d9e..d598c09148f8 100644
--- a/pkgs/development/libraries/haskell/HaXml/default.nix
+++ b/pkgs/development/libraries/haskell/HaXml/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Utilities for manipulating XML documents";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
index 417ded6da54f..0e344a865450 100644
--- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
+++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index fee714491429..1f917fafc3c5 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding for Chipmunk";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index 9eefaaef84a0..2adf5701eb04 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "(Incomplete) OpenSSL binding for Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix
index 56e999d7b83e..f27d1f97f374 100644
--- a/pkgs/development/libraries/haskell/HsSyck/default.nix
+++ b/pkgs/development/libraries/haskell/HsSyck/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Fast, lightweight YAML loader and dumper";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix
index beec7ded7893..7e7c23c0a854 100644
--- a/pkgs/development/libraries/haskell/IORefCAS/default.nix
+++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Atomic compare and swap for IORefs and STRefs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
index 84b5f6fe6107..b01de9175c02 100644
--- a/pkgs/development/libraries/haskell/IOSpec/default.nix
+++ b/pkgs/development/libraries/haskell/IOSpec/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A pure specification of the IO monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix
index 960868e3ab0a..632de1f30e5b 100644
--- a/pkgs/development/libraries/haskell/IfElse/default.nix
+++ b/pkgs/development/libraries/haskell/IfElse/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Anaphoric and miscellaneous useful control-flow";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix
index 713e67fbf608..95a7ab52fd3a 100644
--- a/pkgs/development/libraries/haskell/JsContracts/default.nix
+++ b/pkgs/development/libraries/haskell/JsContracts/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Design-by-contract for JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index c289c0092567..7e377ebc66cd 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix
index 65c90c0824ea..ca221a5a9de8 100644
--- a/pkgs/development/libraries/haskell/List/default.nix
+++ b/pkgs/development/libraries/haskell/List/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "List monad transformer and class";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index 2fa427b1f57e..68d7f25e431b 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Generic support for list-like structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix
index d7307bde5d71..f2c56fdd2ce4 100644
--- a/pkgs/development/libraries/haskell/ListZipper/default.nix
+++ b/pkgs/development/libraries/haskell/ListZipper/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple zipper for lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
index a29997f9de95..348560508622 100644
--- a/pkgs/development/libraries/haskell/MaybeT/default.nix
+++ b/pkgs/development/libraries/haskell/MaybeT/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "MaybeT monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
index f3bd183d1373..195af40d1f03 100644
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Trie-based memo functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 659a1158d0f3..c2b6b067b2f1 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Large utility library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
index 9b044f6dbab5..b9be1488e4e3 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monad-transformer version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 4edd801d08d8..e675ae6b6a1c 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monad-transformer compatible version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
index 6d8e66952e40..daf961f15506 100644
--- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix
+++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "MonadPrompt, implementation & examples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index d8c492f23b61..c276e1eac800 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Random-number generation monad";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
index 490aeb4167b5..4bf301bd66d0 100644
--- a/pkgs/development/libraries/haskell/NanoProlog/default.nix
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Very small interpreter for a Prolog-like language";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix
index 4f06a97002d6..24f056af5cec 100644
--- a/pkgs/development/libraries/haskell/NumInstances/default.nix
+++ b/pkgs/development/libraries/haskell/NumInstances/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Instances of numeric classes for functions and tuples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix
index 27f9b444a711..0be7c3dd22c9 100644
--- a/pkgs/development/libraries/haskell/ObjectName/default.nix
+++ b/pkgs/development/libraries/haskell/ObjectName/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Explicitly handled object names";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix
index 945e12438b58..2ecc841a8a47 100644
--- a/pkgs/development/libraries/haskell/OneTuple/default.nix
+++ b/pkgs/development/libraries/haskell/OneTuple/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Singleton Tuple";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix
index a04aea993fa2..534fa1c8667d 100644
--- a/pkgs/development/libraries/haskell/OpenAL/default.nix
+++ b/pkgs/development/libraries/haskell/OpenAL/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A binding to the OpenAL cross-platform 3D audio API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
index 2e4ac90c79e1..e74fcdca0245 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
index 25133657ccb4..65e3da59367a 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
index 33e9c4d21a0a..cf1bee122afc 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
index c8cfd796afd0..73b5c741bbb2 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
index 318bdf197486..1e56e88de384 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "A binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
new file mode 100644
index 000000000000..7714f08e698f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
@@ -0,0 +1,19 @@
+{ 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;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index a6a45bf5b248..c0d62685e49f 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A raw binding for the OpenGL graphics system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix
index 32497935cdbe..ff3bd0b8fb5f 100644
--- a/pkgs/development/libraries/haskell/PSQueue/default.nix
+++ b/pkgs/development/libraries/haskell/PSQueue/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Priority Search Queue";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix
index 19d7d8abaa54..90df60cc8e6e 100644
--- a/pkgs/development/libraries/haskell/Pathfinder/default.nix
+++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Relational optimiser and code generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
index 3cf80d93336e..a459fd953175 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
index 6ba32ce71c0b..c104a4be27a8 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
index 2f305b8a23ce..828255a9860c 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
index 4e634078a7d8..ac9ac3d2a7de 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
index e2d274dca05c..8eb413d2b31c 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
index b3202cdc4b93..69a1c1dc417a 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
index 24e16a4955f5..98548b938638 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
index 39c97859e657..8a9413989088 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index c5257c5b2620..cdaa5b5136b3 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
index e65752e35b4c..6a6211b6263a 100644
--- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix
+++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Ranged sets for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix
index 12c3e34571e8..1adec3b3d6d9 100644
--- a/pkgs/development/libraries/haskell/ReadArgs/default.nix
+++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Simple command line argument parsing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 15cba0c0b283..d49242256f22 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generic programming library with representation types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix
index 6c61813ac308..e6695f013580 100644
--- a/pkgs/development/libraries/haskell/SDL-image/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-image/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL_image";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
index 8690d7e89163..674282e30a86 100644
--- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL_mixer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
index f1a0489167e5..50b7bcd33105 100644
--- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix
+++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL_ttf";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index 62731657e82a..0d333097b451 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Binding to libSDL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 343412700842..b0c30d93605c 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Implementations of the SHA suite of message digest functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
index 91c128756f42..ea9c60adeabb 100644
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A simple SMTP client library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
index d4cc74902776..b43c22244fe2 100644
--- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
+++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Much safer replacement for QSemN, QSem, and SampleVar";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
index d896eab923d9..8f36e8ebc088 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A framework for creating shell envinronments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix
index 3b27022bea07..95148607b6fe 100644
--- a/pkgs/development/libraries/haskell/StateVar/default.nix
+++ b/pkgs/development/libraries/haskell/StateVar/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "State variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
index a95b30761373..aea9af862d22 100644
--- a/pkgs/development/libraries/haskell/Stream/default.nix
+++ b/pkgs/development/libraries/haskell/Stream/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A library for manipulating infinite lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
index c4960813f3eb..f1c212d7a491 100644
--- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix
+++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Ferry Table Algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix
index d62b42833a3e..3856409819df 100644
--- a/pkgs/development/libraries/haskell/Tensor/default.nix
+++ b/pkgs/development/libraries/haskell/Tensor/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Tensor data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix
index 85fdcfd0b4af..dd305cab560b 100644
--- a/pkgs/development/libraries/haskell/Vec/default.nix
+++ b/pkgs/development/libraries/haskell/Vec/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Fixed-length lists and low-dimensional linear algebra";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
index d69ac78b83d1..18371c57f082 100644
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
index 26f14a087748..cd34f3161f3d 100644
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
+++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix
index 49bcd8ed112a..89161608843e 100644
--- a/pkgs/development/libraries/haskell/WebBits/1.0.nix
+++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix
index 0638ce06ef91..88502db4dfff 100644
--- a/pkgs/development/libraries/haskell/WebBits/2.0.nix
+++ b/pkgs/development/libraries/haskell/WebBits/2.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/WebBits/2.2.nix b/pkgs/development/libraries/haskell/WebBits/2.2.nix
index 4240d7b9ce94..6603117c77e1 100644
--- a/pkgs/development/libraries/haskell/WebBits/2.2.nix
+++ b/pkgs/development/libraries/haskell/WebBits/2.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix
index 1690ec9031e6..d9eee5f5e1c5 100644
--- a/pkgs/development/libraries/haskell/X11-xft/default.nix
+++ b/pkgs/development/libraries/haskell/X11-xft/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index dff5bca4400b..fa1cc44d9909 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -1,9 +1,12 @@
-{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }:
+{ cabal, dataDefault, libX11, libXext, libXinerama, libXrandr
+, libXrender
+}:
 
 cabal.mkDerivation (self: {
   pname = "X11";
-  version = "1.6.0.2";
-  sha256 = "0z1g93k2zbkb9is2zy6pfwp13bv11cvs30b9cz253wjv2liphshw";
+  version = "1.6.1.1";
+  sha256 = "1bkfnxcmf8qia0l3x5n3j4f1zakjwnlq0mhdnbpp6v3q2g37brbw";
+  buildDepends = [ dataDefault ];
   extraLibraries = [
     libX11 libXext libXinerama libXrandr libXrender
   ];
@@ -12,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A binding to the X11 graphics library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
index 1cb214b94b01..125da2a795e1 100644
--- a/pkgs/development/libraries/haskell/Zwaluw/default.nix
+++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Combinators for bidirectional URL routing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
index a6219a4b2a0d..c527d34f738b 100644
--- a/pkgs/development/libraries/haskell/abstract-deque/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Abstract, parameterized interface to mutable Deques";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix
index 033fc242321d..797d42319bb6 100644
--- a/pkgs/development/libraries/haskell/abstract-par/default.nix
+++ b/pkgs/development/libraries/haskell/abstract-par/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Type classes generalizing the functionality of the 'monad-par' library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
index 26f2c0a14c06..22fdb877ff4d 100644
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Accelerate backend for NVIDIA GPUs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix
index f88824c21fed..095d2ff16649 100644
--- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "Examples using the Accelerate library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix
index 1cefda353250..d327d710e3b6 100644
--- a/pkgs/development/libraries/haskell/accelerate-io/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Read and write Accelerate arrays in various formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix
index a2dc4cb2e592..24f09f66d357 100644
--- a/pkgs/development/libraries/haskell/accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "An embedded language for accelerated array processing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 19afa5ab75e6..cadcb223366d 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,16 +4,16 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.3";
-  sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi";
+  version = "0.1.0.4";
+  sha256 = "0f4bgx7l9vx2kywl87zpxpjbfix79lp8chf6xzfpmh4wrbmfgi1s";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace
   ];
-  jailbreak = true;
   meta = {
     description = "Abstractions for animation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 515cec37a995..4f0b55a50792 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Fast JSON parsing and encoding";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix
index 9daf9406742c..4d9c9d44dd61 100644
--- a/pkgs/development/libraries/haskell/alternative-io/default.nix
+++ b/pkgs/development/libraries/haskell/alternative-io/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "IO as Alternative instance (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index 6d598f29ec95..1f13d67d3e8d 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Simple ANSI terminal support, with Windows compatibility";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
index bfccdcffd746..79492bc2eebb 100644
--- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix
index 4c2f5a9ce464..012e771d1816 100644
--- a/pkgs/development/libraries/haskell/appar/default.nix
+++ b/pkgs/development/libraries/haskell/appar/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "A simple applicative parser";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
new file mode 100644
index 000000000000..1f54347986be
--- /dev/null
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, random }:
+
+cabal.mkDerivation (self: {
+  pname = "arithmoi";
+  version = "0.4.0.3";
+  sha256 = "0idn312xzly636h13zmm7cw7ki64bpnniqc97nshqzgp8if5ycrc";
+  buildDepends = [ mtl random ];
+  meta = {
+    homepage = "https://bitbucket.org/dafis/arithmoi";
+    description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix
index 149f5f951e5d..f9ba4b422a25 100644
--- a/pkgs/development/libraries/haskell/arrows/default.nix
+++ b/pkgs/development/libraries/haskell/arrows/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Arrow classes and transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix
index a90e8e769e23..f35f5769a0c5 100644
--- a/pkgs/development/libraries/haskell/asn1-data/default.nix
+++ b/pkgs/development/libraries/haskell/asn1-data/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "ASN1 data reader and writer in RAW, BER and DER forms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
index 1b943208dea4..fc32f366ce42 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Run IO operations asynchronously and wait for their results";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
index 5dd76b4d6e00..ef6ee614053a 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Run IO operations asynchronously and wait for their results";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix
index c000002d4998..2c5fc47ea314 100644
--- a/pkgs/development/libraries/haskell/attempt/default.nix
+++ b/pkgs/development/libraries/haskell/attempt/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Concrete data type for handling extensible exceptions as failures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
index 623ae1040901..bdba04cf14d8 100644
--- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Binary processing extensions to Attoparsec";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 37af5eec0af5..690196c80ffd 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "1.0.0";
-  sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8";
+  version = "1.0.1";
+  sha256 = "14b6ym5sjvg1x82ijydhrjk5445kg0fvwqzqwqld59akbqb6fpg5";
   buildDepends = [ attoparsec conduit text transformers ];
   testDepends = [ attoparsec conduit hspec resourcet text ];
   meta = {
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Consume attoparsec parsers via conduit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix
index c352ce7ca8ec..d7fa58de5d7b 100644
--- a/pkgs/development/libraries/haskell/attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Fast combinator parsing for bytestrings and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
index d52687d80801..880181fa4a1d 100644
--- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Pass input from an enumerator to an Attoparsec parser";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
new file mode 100644
index 000000000000..445cf0a90388
--- /dev/null
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -0,0 +1,22 @@
+{ cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit
+, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes
+, monadControl, random, resourcet, RSA, SHA, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "authenticate-oauth";
+  version = "1.4.0.5";
+  sha256 = "0yic95glkc0j35sdq04z5n2607ch0k64vyi3y0kfji31qzd3d44x";
+  buildDepends = [
+    base64Bytestring blazeBuilder blazeBuilderConduit conduit
+    cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl
+    random resourcet RSA SHA time transformers
+  ];
+  meta = {
+    homepage = "http://github.com/yesodweb/authenticate";
+    description = "Library to authenticate with OAuth for Haskell web applications";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index f0a1969ffbab..a94b6b9ef3ee 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Authentication methods for Haskell web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
index ca208b7c1a34..8e76bfa698da 100644
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ b/pkgs/development/libraries/haskell/base-compat/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A compatibility layer for base";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
index 3eccd0a4ffac..d624213111b5 100644
--- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
+++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Unicode alternatives for common functions and operators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
index 3f81258f4263..5004032997c7 100644
--- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Fast base16 (hex) encoding and decoding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
index 67450dc88874..e043d35ffb1d 100644
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Fast base64 encoding and decoding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix
index 3a2d044de64d..08af81a606d7 100644
--- a/pkgs/development/libraries/haskell/base64-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Base64-encode and decode streams of bytes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix
index 9e0a781039b1..e77d5b96ea79 100644
--- a/pkgs/development/libraries/haskell/base64-string/default.nix
+++ b/pkgs/development/libraries/haskell/base64-string/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Base64 implementation for String's";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
index 04f3842be41b..0d18233ef214 100644
--- a/pkgs/development/libraries/haskell/basic-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "An enhanced core prelude; a common foundation for alternate preludes";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
index c80f04f966db..2cdd3581fba8 100644
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ b/pkgs/development/libraries/haskell/benchpress/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Micro-benchmarking with detailed statistics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
index c659c3bc3bea..ea46422ecae7 100644
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ b/pkgs/development/libraries/haskell/bifunctors/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 bifunctors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
index 98814e75a9d5..2b132f9cad0b 100644
--- a/pkgs/development/libraries/haskell/bimap/default.nix
+++ b/pkgs/development/libraries/haskell/bimap/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Bidirectional mapping between two key types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix
index 6d70e384c380..45d587697c08 100644
--- a/pkgs/development/libraries/haskell/binary-shared/default.nix
+++ b/pkgs/development/libraries/haskell/binary-shared/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Sharing for the binary package";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index 6273a099f739..d7a5edbf58d5 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Binary serialisation for Haskell values using lazy ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix
index edda97480d8c..faf51870ae9b 100644
--- a/pkgs/development/libraries/haskell/bitarray/default.nix
+++ b/pkgs/development/libraries/haskell/bitarray/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Mutable and immutable bit arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix
index b120c8cf9537..53f857102816 100644
--- a/pkgs/development/libraries/haskell/bitmap/default.nix
+++ b/pkgs/development/libraries/haskell/bitmap/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix
index e6add5883aaa..b8dd09f43b84 100644
--- a/pkgs/development/libraries/haskell/bits-atomic/default.nix
+++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Atomic bit operations on memory locations for low-level synchronization";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix
index 70369034eaad..23493e50c19c 100644
--- a/pkgs/development/libraries/haskell/bktrees/default.nix
+++ b/pkgs/development/libraries/haskell/bktrees/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "A set data structure with approximate searching";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 16c352b7a332..bef4668cbc28 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Convert streams of builders to streams of bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index 00176d215bae..5e533a415a29 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Enumeratees for the incremental conversion of builders to bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index aa4eb4c53571..ffd307bf13e6 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -2,14 +2,17 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder";
-  version = "0.3.1.0";
-  sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6";
+  version = "0.3.1.1";
+  sha256 = "1pnw5kjpyxf3mh72cb9a0f1qwpq3a2bkgqp1j3ny8l6nmzw0c9d1";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/meiersi/blaze-builder";
     description = "Efficient buffered output";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index ec21e3fcd84b..2370021da600 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A blazingly fast HTML combinator library for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index 0c544119d5ff..e8272c2c5ad5 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A blazingly fast markup combinator library for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix
index 7b3ec55dc577..caa06482b672 100644
--- a/pkgs/development/libraries/haskell/blaze-svg/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "SVG combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix
index ede82e5c2ed3..b3ab183c57fd 100644
--- a/pkgs/development/libraries/haskell/blaze-textual/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Fast rendering of common datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix
index 7c8c2d348498..9d7f550c4fd4 100644
--- a/pkgs/development/libraries/haskell/bloomfilter/default.nix
+++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Pure and impure Bloom Filter implementations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
index e018ac7a8d28..213afd59c5ae 100644
--- a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Read and write uncompressed BMP image files";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
index a3de1d11830c..8e1685296cac 100644
--- a/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
+++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Read and write uncompressed BMP image files";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index 963448a56e73..a5a1145295b1 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Library for invertible parsing and printing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
index a406d1fa5000..1dd75661ce68 100644
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Brainfuck interpreter";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix
index 6b76aee47a1e..042c212e801e 100644
--- a/pkgs/development/libraries/haskell/bson/default.nix
+++ b/pkgs/development/libraries/haskell/bson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bson";
-  version = "0.2.1";
-  sha256 = "1g5xvkpn5j2yn9figxiv5dindwv6gg90np56k235hy9cwmdicmwq";
+  version = "0.2.2";
+  sha256 = "043lbaj4rrvh4a1yc033np51vi8xlbczflbhyx2bsiryzbi27waf";
   buildDepends = [
     binary cryptohash dataBinaryIeee754 mtl network text time
   ];
@@ -13,11 +13,15 @@ cabal.mkDerivation (self: {
     binary cryptohash dataBinaryIeee754 mtl network QuickCheck
     testFramework testFrameworkQuickcheck2 text time
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/selectel/bson-haskell";
     description = "BSON documents are JSON-like objects with a standard binary encoding";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
index bdbad6f5e635..d3af223418bb 100644
--- a/pkgs/development/libraries/haskell/byteorder/default.nix
+++ b/pkgs/development/libraries/haskell/byteorder/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Exposes the native endianness or byte ordering of the system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
index 2de7eec8eb5a..9d67a1cb3ee0 100644
--- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix
@@ -2,14 +2,17 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-lexing";
-  version = "0.4.0";
-  sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr";
+  version = "0.4.3";
+  sha256 = "0dynfrf8ym01v2dl57422h8r75kdlqh2qzqi9yc0f1bmbfqxap6r";
   buildTools = [ alex ];
   meta = {
     homepage = "http://code.haskell.org/~wren/";
     description = "Parse and produce literals efficiently from strict or lazy bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
index 5f9e322fbf0b..cf68d1e7fa50 100644
--- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "mmap support for strict ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
index e78a64781518..36ef166baaf6 100644
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Parse numeric literals from ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
index 41c31b1fed5c..1dc56c420b67 100644
--- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "An efficient finite map from (byte)strings to values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 6ad4db61cfdc..c0befa37d2a8 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "C->Haskell FFI tool that gives some cross-language type safety";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index 55b4fea36fec..0bdb33ceede7 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Template Haskell expressions for reading fields from a project's cabal file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
index 0f651e1eaae3..ab59d7c50893 100644
--- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Cabal support for creating Mac OSX application bundles";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 59126959bfb5..35b11decc43c 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the Cairo library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix
index 51425084e1c3..06a75132869d 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/default.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "1.0";
-  sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
+  version = "1.0.0.1";
+  sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Case insensitive string comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
index 44ed255bb634..711e6a152596 100644
--- a/pkgs/development/libraries/haskell/cautious-file/default.nix
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
new file mode 100644
index 000000000000..c322ef8b54f4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -0,0 +1,16 @@
+{ cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "cereal-conduit";
+  version = "0.7";
+  sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix";
+  buildDepends = [ cereal conduit transformers ];
+  testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
+  meta = {
+    homepage = "https://github.com/litherum/cereal-conduit";
+    description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
index a28ea11c511e..8e8202d9c5e6 100644
--- a/pkgs/development/libraries/haskell/cereal/default.nix
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "A binary serialization library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index 036e7ddc124c..0adaabb4753d 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "1.3.5";
-  sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
+  version = "1.3.6";
+  sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Certificates and Key Reader/Writer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
index 60669590c2f9..9cb92640ee45 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
index bf1920d434df..7e91e25209ee 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
index c1dc7076c77d..0c1f8d709c3b 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
index 97e5556bacd5..3621b1fac1b8 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
index cfe95ab8e1e3..08b0477039d9 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A library for writing CGI programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index ca2f36159292..53aa634aa72e 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.1.7";
-  sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng";
+  version = "0.1.8";
+  sha256 = "171mj9abm0x9bg6mf225mhb25i7xh4v5la5866llb1qrrpvsk1xf";
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2
   ];
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Fast AES cipher implementation with advanced mode of operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
index 7d3cacdd67a9..1563efa125b8 100644
--- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Fast RC4 cipher implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix
new file mode 100644
index 000000000000..a8ca3c699cc4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/circle-packing/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "circle-packing";
+  version = "0.1.0.2";
+  sha256 = "182fadwlf6j3jhlfjskaddaickgcb07wlb7fh42yip2680gh9k1j";
+  meta = {
+    description = "Simple heuristic for packing discs of varying radii in a circle";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 2c68fd24d1fa..b55e20d91c54 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A Citation Style Language implementation in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index c04b4dfc25e1..c3e4619c72fa 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "conduit instances for classy-prelude";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index 4d0f5441e414..9c830545f763 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.5.3";
-  sha256 = "0xlhdxkxvrzj9y8wdl2f1pz94zz2gfa9vfbia9prhr7skirxvsad";
+  version = "0.5.4";
+  sha256 = "1p30f1inp0kj2dsvqnxaplxl83kd8bv41jmszvbdbf3vijjpk6kr";
   buildDepends = [
     basicPrelude hashable liftedBase systemFilepath text transformers
     unorderedContainers vector
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "A typeclass-based Prelude";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index edbb079eec42..83cf8e57a682 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.8.1";
-  sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd";
+  version = "0.9";
+  sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
   buildDepends = [
     base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
     tagged
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Securely store session data in a client-side cookie";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 6780d02e674e..f9053fa31748 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Command line argument processing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix
index 0a71649f0e91..7b29ba580046 100644
--- a/pkgs/development/libraries/haskell/cmdlib/default.nix
+++ b/pkgs/development/libraries/haskell/cmdlib/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "a library for command line parsing & online help";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
index fa2b98801233..702ddd0b9ec6 100644
--- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Highligt Haskell source";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix
index 06bcc8ed9819..7f4fde5ef970 100644
--- a/pkgs/development/libraries/haskell/colour/default.nix
+++ b/pkgs/development/libraries/haskell/colour/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A model for human colour/color perception";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
index 3a56b37edf9b..0d754ec4308c 100644
--- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Comonad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index b37ffdf596e1..61d0823141d2 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -1,14 +1,16 @@
-{ cabal, semigroups, transformers }:
+{ cabal, doctest, filepath, semigroups, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "3.0.1.1";
-  sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2";
+  version = "3.0.2";
+  sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay";
   buildDepends = [ semigroups transformers ];
+  testDepends = [ doctest filepath ];
   meta = {
     homepage = "http://github.com/ekmett/comonad/";
     description = "Haskell 98 compatible comonads";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
index 5921d8b07d39..f09d488fa6c2 100644
--- a/pkgs/development/libraries/haskell/comonads-fd/default.nix
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Comonad transformers using functional dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
index fb0b6a1f1cba..416826298bb4 100644
--- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix
+++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
index db380f03b5bd..0a36b3e9b736 100644
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Extra concurrency primitives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 8614b24bacca..1a5ef7b4f702 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,13 +1,13 @@
-{ cabal, doctest, hspec, liftedBase, monadControl, QuickCheck
-, resourcet, text, transformers, transformersBase, void
+{ cabal, doctest, hspec, liftedBase, mmorph, monadControl
+, QuickCheck, resourcet, text, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.3";
-  sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07";
+  version = "1.0.4.2";
+  sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159";
   buildDepends = [
-    liftedBase monadControl resourcet text transformers
+    liftedBase mmorph monadControl resourcet text transformers
     transformersBase void
   ];
   testDepends = [
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Streaming data processing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
index 775c2e5027f8..558a8935c04f 100644
--- a/pkgs/development/libraries/haskell/configurator/default.nix
+++ b/pkgs/development/libraries/haskell/configurator/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Configuration management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix
index 0fe2cb8864a6..86690db7162c 100644
--- a/pkgs/development/libraries/haskell/constraints/default.nix
+++ b/pkgs/development/libraries/haskell/constraints/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Constraint manipulation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix
index 095d0a179846..26b683c19696 100644
--- a/pkgs/development/libraries/haskell/continued-fractions/default.nix
+++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Continued fractions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index 2c967d26085a..e09043519a86 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 contravariant functors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix
index 50d95cb88511..6c1282852851 100644
--- a/pkgs/development/libraries/haskell/converge/default.nix
+++ b/pkgs/development/libraries/haskell/converge/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Limit operations for converging sequences";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index 8a79e50527d8..a3fa0208e2d0 100644
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Typeclasses and instances for converting between types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index b7dae5d4a9b1..06cdf62e53cc 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "HTTP cookie parsing and rendering";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 4f2aa58b7d29..2d8989437fb8 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix
index dc27553c2a3b..3187036539e0 100644
--- a/pkgs/development/libraries/haskell/cpu/default.nix
+++ b/pkgs/development/libraries/haskell/cpu/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Cpu information and properties helpers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 004f74cd7e7f..5a722ea4fabe 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Robust, reliable performance measurement and analysis";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index dbfc60c189c7..ed840b8ba3e0 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A generic interface for cryptographic operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
index 2b967a5b5649..efea0bb0d8a1 100644
--- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Conduit interface for cryptographic operations (from crypto-api)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
index af6985cd9ede..99665c22df2e 100644
--- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Cryptographic numbers: functions and algorithms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index 72ba3d20b021..81cfdac0151d 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Generic cryptography Public keys algorithm types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
index b095b1ea5f4e..dc0885518776 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Public Key cryptography";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
index 7c3b10a38386..c3b10cbe329e 100644
--- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-random-api/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Simple random generators API for cryptography related code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index dba34752611e..12392e439250 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Symmetrical block and stream ciphers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 81b361a24779..77a1ecd9ff4e 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.8.3";
-  sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
+  version = "0.8.4";
+  sha256 = "0h58apxcrvpkyj3s2c7l68g7biv80snkn53g6jya1s687xff8fmn";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "collection of crypto hashes, fast, pure and practical";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix
index f59a80b2b65a..64dadbb4e4ca 100644
--- a/pkgs/development/libraries/haskell/css-text/default.nix
+++ b/pkgs/development/libraries/haskell/css-text/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "CSS parser and renderer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix
index f56a9b89423c..ae149be79dac 100644
--- a/pkgs/development/libraries/haskell/csv/default.nix
+++ b/pkgs/development/libraries/haskell/csv/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "CSV loader and dumper";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix
index f03e1907ec08..00b6ae2a406c 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix
@@ -35,6 +35,9 @@ cabal.mkDerivation (self: {
     description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/cuda/0.5.0.1.nix b/pkgs/development/libraries/haskell/cuda/0.5.0.1.nix
new file mode 100644
index 000000000000..0d9a594ff5c3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cuda/0.5.0.1.nix
@@ -0,0 +1,42 @@
+{ cabal, c2hs, cudatoolkit, nvidia_x11 }:
+
+cabal.mkDerivation (self: {
+  pname = "cuda";
+  version = "0.5.0.1";
+  sha256 = "0gxkf97c4cm9d7kk0izgz3m44ycys1lcl4bq828c6l1wim1xz28b";
+  buildTools = [ c2hs ];
+  extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
+  doCheck = false;
+  # Perhaps this should be the default in cabal.nix ...
+  #
+  # The cudatoolkit provides both 64 and 32-bit versions of the
+  # library. GHC's linker fails if the wrong version is found first.
+  # We solve this by eliminating lib64 from the path on 32-bit
+  # platforms and putting lib64 first on 64-bit platforms.
+  libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib";
+  configurePhase = ''
+    for i in Setup.hs Setup.lhs; do
+      test -f $i && ghc --make $i
+    done
+    for p in $extraBuildInputs $propagatedNativeBuildInputs; do
+      if [ -d "$p/include" ]; then
+        extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
+      fi
+      for d in $libPaths; do
+        if [ -d "$p/$d" ]; then
+          extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
+        fi
+      done
+    done
+    ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags
+  '';
+  meta = {
+    description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.none;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix
index a530044ca6ed..3842707c613b 100644
--- a/pkgs/development/libraries/haskell/curl/default.nix
+++ b/pkgs/development/libraries/haskell/curl/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Haskell binding to libcurl";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
index 41bd23470124..9f0e1c11c851 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Utilities for accessing and manipulating fields of records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
index 83712b858c25..078234c19c42 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Use Accessor to access state in transformers State monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 7c1de10b20b0..29038616a8bf 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Utilities for accessing and manipulating fields of records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
index 5066a83c5f60..b91dc6d05233 100644
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Parser/Serialiser for IEEE-754 floating-point values";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix
new file mode 100644
index 000000000000..8f99c0143cd5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-class/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-class";
+  version = "0.0.1";
+  sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
+  meta = {
+    description = "A class for types with a default value";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
new file mode 100644
index 000000000000..b8b8494550c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-base";
+  version = "0.0.1";
+  sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
+  buildDepends = [ dataDefaultClass ];
+  meta = {
+    description = "Default instances for types in base";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
new file mode 100644
index 000000000000..98590fa795b0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-containers";
+  version = "0.0.1";
+  sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
+  buildDepends = [ dataDefaultClass ];
+  meta = {
+    description = "Default instances for types in containers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
new file mode 100644
index 000000000000..1fa64003f954
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass, dlist }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-dlist";
+  version = "0.0.1";
+  sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
+  buildDepends = [ dataDefaultClass dlist ];
+  meta = {
+    description = "Default instances for types in dlist";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
new file mode 100644
index 000000000000..e8647898d9dd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix
@@ -0,0 +1,14 @@
+{ cabal, dataDefaultClass }:
+
+cabal.mkDerivation (self: {
+  pname = "data-default-instances-old-locale";
+  version = "0.0.1";
+  sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
+  buildDepends = [ dataDefaultClass ];
+  meta = {
+    description = "Default instances for types in old-locale";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix
index 4fb21ed5f551..31e3f7423103 100644
--- a/pkgs/development/libraries/haskell/data-default/default.nix
+++ b/pkgs/development/libraries/haskell/data-default/default.nix
@@ -1,14 +1,24 @@
-{ cabal, dlist }:
+{ cabal, dataDefaultClass, dataDefaultInstancesBase
+, dataDefaultInstancesContainers, dataDefaultInstancesDlist
+, dataDefaultInstancesOldLocale
+}:
 
 cabal.mkDerivation (self: {
   pname = "data-default";
-  version = "0.5.1";
-  sha256 = "05zp9bcxm4lcdqniwckq0zi014iqcnqbrk5wh54dyy83h97z6mpv";
-  buildDepends = [ dlist ];
+  version = "0.5.3";
+  sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
+  buildDepends = [
+    dataDefaultClass dataDefaultInstancesBase
+    dataDefaultInstancesContainers dataDefaultInstancesDlist
+    dataDefaultInstancesOldLocale
+  ];
   meta = {
     description = "A class for types with a default value";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
index ecb0748df6a9..a9eaf5471865 100644
--- a/pkgs/development/libraries/haskell/data-inttrie/default.nix
+++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A lazy, infinite trie of integers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
index 7ba9e3f9da74..208f021e8af4 100644
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Utilities for Data.Lens";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
index e4cff67f3761..8e3a8b40751d 100644
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Lenses";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
index 2b3adde1d728..5c4c3cbeaf00 100644
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Combinators for building memo tables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix
index 6599d25f68eb..2618ef6a6906 100644
--- a/pkgs/development/libraries/haskell/data-reify/default.nix
+++ b/pkgs/development/libraries/haskell/data-reify/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Reify a recursive data structure into an explicit graph";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 9c4de4a1b84d..fa9287e6f075 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Data encoding library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix
index a460dcbdafc5..b672e797fa06 100644
--- a/pkgs/development/libraries/haskell/date-cache/default.nix
+++ b/pkgs/development/libraries/haskell/date-cache/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Date cacher";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
index faf0b40b94d1..72f3d1c937f3 100644
--- a/pkgs/development/libraries/haskell/datetime/default.nix
+++ b/pkgs/development/libraries/haskell/datetime/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Utilities to make Data.Time.* easier to use.";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index 16cb2c7ca033..26306eccfcb6 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "A client library for the D-Bus IPC system";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
index 228fcd28c785..b65ddb5e786e 100644
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Template Haskell based deriver for optimised NFData instances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
index c13abe9e31c9..2c61618cd081 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Fully evaluate data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
index 99db69e612aa..4af1d5bff9c7 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
index f4ef61cbbffc..35fca66fa869 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
index 78f9273e46a2..bf6d93de2835 100644
--- a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
+++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Deep evaluation of data structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 906c51fc0722..c3aa09d9550e 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A program and library to derive instances for data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix
index ca702b60356c..6b8de51e1d7f 100644
--- a/pkgs/development/libraries/haskell/derp/default.nix
+++ b/pkgs/development/libraries/haskell/derp/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Derivative Parsing";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bc2abf5c16d5..4a55eeaac65a 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Cairo backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 3ecfe2db8527..12c72e12665b 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -1,14 +1,16 @@
-{ cabal, colour, dataDefault, diagramsLib, forceLayout, HUnit, lens
-, mtl, QuickCheck, testFramework, testFrameworkHunit
+{ cabal, arithmoi, circlePacking, colour, dataDefault, diagramsCore
+, diagramsLib, forceLayout, HUnit, lens, MonadRandom, mtl
+, QuickCheck, split, testFramework, testFrameworkHunit
 , testFrameworkQuickcheck2, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.0.3";
-  sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5";
+  version = "0.6.1";
+  sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
   buildDepends = [
-    colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
+    arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
+    forceLayout lens MonadRandom mtl split vectorSpace
   ];
   testDepends = [
     diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
@@ -19,5 +21,6 @@ cabal.mkDerivation (self: {
     description = "Collection of user contributions to diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index ebea3fd60908..985a69dce135 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Core libraries for diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 293cdab1f9ef..01561f426c52 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Embedded domain-specific language for declarative vector graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 1bd77db85803..ae466ad26234 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -4,17 +4,17 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.6.0.1";
-  sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
+  version = "0.6.0.2";
+  sha256 = "0jxpbggwgbjnl2yx7y0zcjs2fls7y1wm33wllq5j9snkiz1n81hb";
   buildDepends = [
     active colour dataDefault diagramsCore monoidExtras newtype
     NumInstances semigroups vectorSpace
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 561f32118c22..f6fd22ecd99c 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "SVG backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
index c315c0813eb9..a341726bf537 100644
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ b/pkgs/development/libraries/haskell/digest/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 48853c136550..9e0cbbc6bdc3 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Heist frontend for the digestive-functors library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
index f23ee6d06910..03f34b31b618 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Snap backend for the digestive-functors library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
index 0b956680a84f..bf11f9675bcd 100644
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "A practical formlet library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index 70995ecb3ce7..1ed368d24a1f 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Statically checked physical dimensions, implemented using type families";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 329722abe8e9..d36f351fcf60 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Statically checked physical dimensions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
index 5c8b357593e4..848ad5631252 100644
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ b/pkgs/development/libraries/haskell/directory-tree/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A simple directory-like tree datatype, with useful IO functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
index aaca850c0d7a..b2b58825469d 100644
--- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Simple zero-configuration backend for Cloud Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
index d23a5ef0228d..be5d9fbfe6d4 100644
--- a/pkgs/development/libraries/haskell/distributed-process/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process/default.nix
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     description = "Cloud Haskell: Erlang-style concurrency in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix
index 9147b724ba22..e682ec474aae 100644
--- a/pkgs/development/libraries/haskell/distributed-static/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-static/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Compositional, type-safe, polymorphic static values and closures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index d40952024ef2..55a9fc41ed0b 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Distributive functors -- Dual to Traversable";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index 1a7fc56efd5f..a88b38650c7d 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Differences lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 0854f39efcef..e8d0284487af 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "DNS library in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index ce418a8d053f..d83fa8729c1c 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "doctest";
-  version = "0.9.5";
-  sha256 = "073q56gyhkb7r4f94b9nx341dkmgapy8gig7f668jkghv2zci5ws";
+  version = "0.9.6";
+  sha256 = "0gw13pm4hg69v60swsv6w4iwzgdj5f4pkcyfmgzfp1dx399p6hyl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ deepseq filepath ghcPaths syb transformers ];
@@ -13,12 +13,12 @@ cabal.mkDerivation (self: {
     baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
     silently stringbuilder syb transformers
   ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/sol/doctest-haskell#readme";
     description = "Test interactive Haskell examples";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix
index a7fe5b791f0d..06a3e6a09fe5 100644
--- a/pkgs/development/libraries/haskell/dotgen/default.nix
+++ b/pkgs/development/libraries/haskell/dotgen/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A simple interface for building .dot graph files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix
index cad61e52ee0c..5bd90719ac44 100644
--- a/pkgs/development/libraries/haskell/double-conversion/default.nix
+++ b/pkgs/development/libraries/haskell/double-conversion/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Fast conversion between double precision floating point and text";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
index 935004a6bb0f..dd7fb892fdea 100644
--- a/pkgs/development/libraries/haskell/download-curl/default.nix
+++ b/pkgs/development/libraries/haskell/download-curl/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "High-level file download based on URLs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix
index 06c34bf9acb0..c0895ac2938e 100644
--- a/pkgs/development/libraries/haskell/download/default.nix
+++ b/pkgs/development/libraries/haskell/download/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "High-level file download based on URLs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
index 4b5dd2b38883..6b37b0a30998 100644
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Difference strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index ebca3b5a3be6..54f1da653161 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.1.0.1";
-  sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
+  version = "0.1.0.2";
+  sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
   buildDepends = [ monoidExtras newtype semigroups ];
-  jailbreak = true;
   meta = {
     description = "Rose trees with cached and accumulating monoidal annotations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix
index 8b3d2cab677a..0c9623b11a5c 100644
--- a/pkgs/development/libraries/haskell/dyre/default.nix
+++ b/pkgs/development/libraries/haskell/dyre/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "Dynamic reconfiguration in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix
index 22f5953b7e04..cc3183b8bda7 100644
--- a/pkgs/development/libraries/haskell/edit-distance/default.nix
+++ b/pkgs/development/libraries/haskell/edit-distance/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
new file mode 100644
index 000000000000..7d92bcb027ae
--- /dev/null
+++ b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
@@ -0,0 +1,15 @@
+{ 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;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
index 309847a28e4f..af6ca841c7a3 100644
--- a/pkgs/development/libraries/haskell/editline/default.nix
+++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to the editline library (libedit)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 4730af585697..b75793435b36 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "An either monad transformer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix
index 8ba4687d3e3b..784977000299 100644
--- a/pkgs/development/libraries/haskell/elerea/default.nix
+++ b/pkgs/development/libraries/haskell/elerea/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "A minimalistic FRP library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix
index 3ba059261794..a3bfd8cbafc7 100644
--- a/pkgs/development/libraries/haskell/email-validate/default.nix
+++ b/pkgs/development/libraries/haskell/email-validate/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Validating an email address string against RFC 5322";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
index 1b7ef1bcd1dc..73ba94bcad9d 100644
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ b/pkgs/development/libraries/haskell/encoding/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "A library for various character encodings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index 004d7492c51f..e877124b9635 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A platform independent entropy source";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 5b44c9efc62a..27a85b1df97f 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Reliable, high-performance processing with left-fold enumerators";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix
index 1a6331bcd6f1..25d64b3faafc 100644
--- a/pkgs/development/libraries/haskell/erf/default.nix
+++ b/pkgs/development/libraries/haskell/erf/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "The error function, erf, and related functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 7ed890c513c5..7fdae9135013 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simplified error-handling";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
index 2c64598d1d01..b340591c33ac 100644
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Exception monad transformer instances for mtl2 classes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix
index a4d0cfd247a1..c8a9849cad1a 100644
--- a/pkgs/development/libraries/haskell/exception-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Type classes and monads for unchecked extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix
index 5c69969c20d2..5faf06230f62 100644
--- a/pkgs/development/libraries/haskell/executable-path/default.nix
+++ b/pkgs/development/libraries/haskell/executable-path/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Finding out the full path of the executable";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 0f2385a004ff..151ce5b785c8 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Exceptions which are explicit in the type signature";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index 0eca0eb78eec..8a928931e3e7 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
index 946a808ddc52..329bb2a42c48 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index 577f7d4657a5..d349a1f17e36 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
index 2ca255d29997..f217db39bc61 100644
--- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
+++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Extensible exceptions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
index bc2821e3e8c5..3e60885352ea 100644
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A simple type class for success/failure computations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index c9544b2c1f69..8843062fc258 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A fast logging system";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index 79ea3160df22..7c64e9a2511b 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,13 +2,16 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.4.3";
-  sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap";
+  version = "1.1.5";
+  sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index d15906e0be51..8ad5c4318f7d 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
index 279f25eaca20..9938d181d88f 100644
--- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix
+++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Convert FGL graphs to dot (graphviz) files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
index c367b74f6a3f..7299daddb14c 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Martin Erwig's Functional Graph Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
index 8691d10c684e..7417a32745c5 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Martin Erwig's Functional Graph Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
index 6a7aa22cef10..7b6aa799944b 100644
--- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Martin Erwig's Functional Graph Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index 145d3c1c203d..efb8e9d7894f 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Use Template Haskell to embed file contents directly";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix
index 8a28d0b27fb1..e9806cfb1fba 100644
--- a/pkgs/development/libraries/haskell/file-location/default.nix
+++ b/pkgs/development/libraries/haskell/file-location/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "common functions that show file location information";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
index 0cd65bb1905e..3409079210ba 100644
--- a/pkgs/development/libraries/haskell/filepath/default.nix
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Library for manipulating FilePaths in a cross platform way";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 5e93300b23cb..137846f85f6f 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -4,19 +4,18 @@
 
 cabal.mkDerivation (self: {
   pname = "filestore";
-  version = "0.6";
-  sha256 = "1bmsqxrkiqw791h0xwasry3jm56rjsyvl9l5r78209bhiv5v6xk0";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Diff filepath HUnit mtl parsec split time utf8String xml
-  ];
-  jailbreak = true;
+  version = "0.6.0.1";
+  sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf";
+  buildDepends = [ Diff filepath parsec split time utf8String xml ];
+  testDepends = [ Diff filepath HUnit mtl time ];
   doCheck = false;
   meta = {
     description = "Interface for versioning file stores";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
index 46ae27fc0901..a44134344808 100644
--- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Use system-filepath data types with conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix
index 299b2e926dbd..ea3d9b6fbdf7 100644
--- a/pkgs/development/libraries/haskell/fingertree/default.nix
+++ b/pkgs/development/libraries/haskell/fingertree/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Generic finger-tree structure, with example instances";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
index 7be21dbbf347..2a94174f5ed0 100644
--- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix
+++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generate default function implementations for complex type classes";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 025ed14869f8..e46f582c024b 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index cfc80c4d547a..e740f7f819aa 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Cross platform library for file creation, modification, and deletion notification";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
index 8fbdb57d48bf..2853fbca7685 100644
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ b/pkgs/development/libraries/haskell/gamma/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Gamma function and related functions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix
index 27423ce4ecd4..44c15b23d4ba 100644
--- a/pkgs/development/libraries/haskell/gd/default.nix
+++ b/pkgs/development/libraries/haskell/gd/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell binding to a subset of the GD graphics library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix
index e14857aaa5b7..929b717f552b 100644
--- a/pkgs/development/libraries/haskell/gdiff/default.nix
+++ b/pkgs/development/libraries/haskell/gdiff/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Generic diff and patch";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index c071aba7decd..c5a62b967aa0 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,12 +2,15 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.4.0";
-  sha256 = "15av3l4m4qn5by41rkpdvp1kyp3fi9ixvy76wmyj20c46kjbmra7";
+  version = "1.5.0";
+  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
index eff79afa416c..508075044eca 100644
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ b/pkgs/development/libraries/haskell/geniplate/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Use template Haskell to generate Uniplate-like functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
index 8c2f481122bc..18110f3c0f76 100644
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-core/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Display GHC's core and assembly output in a pager";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 5b7decf9416b..f4c7bfbb264d 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Library and tool for parsing .eventlog files from GHC";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 6e0cd15c248a..6213734881d8 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 3e86d440d5d3..a8224a85745e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.12.2";
-  sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9";
+  version = "1.12.4";
+  sha256 = "1f4pdwimzc2i7bb7ccpbl8pn18ygnqd65xw1z5cmhlswasbdab14";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -25,6 +25,7 @@ cabal.mkDerivation (self: {
       ensureDir "$out/share/emacs"
       mv $pname-$version emacs/site-lisp
     '';
+  doCheck = false;
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell programming on Emacs/Vim";
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index ea2495f6586a..2db4ea5817cd 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
index 6f5f14585074..aef62af9e163 100644
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate utilities for the GHC API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
index 21a2f0f00eb9..d0a766940fe8 100644
--- a/pkgs/development/libraries/haskell/ghc-syb/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Data and Typeable instances for the GHC API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 3fd1230073e7..7d3d47f1a036 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Live visualization of data structures in GHCi";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index e9d295798b63..082032f75a3a 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the GIO";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 1c7dfdd10e10..d241442e616a 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.3";
-  sha256 = "1hz4ddym2vn01nd22gb995dya48fzc7nsmsqywdc8hjczmn93qyg";
+  version = "0.10.3.1";
+  sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "Wiki using happstack, git or darcs, and pandoc";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
index 7c49b956aa98..f1bae4ad9fe0 100644
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the glade library";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 29d2f92d7bac..a9c3023c41b5 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the GLIB library for Gtk2Hs";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index ededea21fcc1..a4af25459a06 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Painless 2D vector graphics, animations and simulations";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix
index fbbe7d31c2a5..2ac665472596 100644
--- a/pkgs/development/libraries/haskell/glpk-hs/default.nix
+++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Comprehensive GLPK linear programming bindings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix
index 6ae78cf49b6a..27d7860be66c 100644
--- a/pkgs/development/libraries/haskell/gnuidn/default.nix
+++ b/pkgs/development/libraries/haskell/gnuidn/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for GNU IDN";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix
index 72f98677ce66..6aa16600707a 100644
--- a/pkgs/development/libraries/haskell/gnutls/default.nix
+++ b/pkgs/development/libraries/haskell/gnutls/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for GNU libgnutls";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 77245ec8c91b..134f05afb49a 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Bindings to Graphviz for graph visualisation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix
index 4c085c0ae23b..471c5586fe93 100644
--- a/pkgs/development/libraries/haskell/groupoids/default.nix
+++ b/pkgs/development/libraries/haskell/groupoids/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 Groupoids";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix
index 5a654cdd11de..aa727cb9412e 100644
--- a/pkgs/development/libraries/haskell/gsasl/default.nix
+++ b/pkgs/development/libraries/haskell/gsasl/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for GNU libgsasl";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index ed5244d72629..e817312f9f61 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the Gtk+ graphical user interface library";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 677c6c15214b..be1f53937e1b 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Tools to build the Gtk2Hs suite of User Interface libraries";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
index 756e1a1df978..bb7680b34077 100644
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the GtkSourceView library";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix
index 9c4c9681b5f0..da16347a8ddf 100644
--- a/pkgs/development/libraries/haskell/hS3/default.nix
+++ b/pkgs/development/libraries/haskell/hS3/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hS3";
-  version = "0.5.6";
-  sha256 = "1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc";
+  version = "0.5.7";
+  sha256 = "1p5p6vwazqi5kpi3i0msbgcdf6flp25b2v1an6lvj7y8dx1pk6f2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Interface to Amazon's Simple Storage Service (S3)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index 82175abb17e1..f3d029a5ea72 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -1,10 +1,10 @@
-{ cabal, Cabal, filepath, tar }:
+{ cabal, Cabal, filepath, tar, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.4";
-  sha256 = "12z1ak21xc9v373j956gz8l4ryj0582lgbl9ykp8q46n9b8sxfph";
-  buildDepends = [ Cabal filepath tar ];
+  version = "1.5";
+  sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv";
+  buildDepends = [ Cabal filepath tar utf8String ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";
     description = "provide access to the Hackage database via Data.Map";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 35204f853a35..ce81a4c68320 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -1,26 +1,29 @@
 { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs
-, cryptohash, deepseq, filepath, httpConduit, httpTypes, HUnit
-, lrucache, mtl, pandoc, parsec, QuickCheck, random, regexBase
-, regexTdfa, snapCore, snapServer, tagsoup, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, time
+, cryptohash, dataDefault, deepseq, filepath, httpConduit
+, httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck
+, random, regexBase, regexTdfa, snapCore, snapServer, tagsoup
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.2.1.2";
-  sha256 = "0b2jmi9hi5l72lkyjn2w3gwn52zvnvv7c10x5329hp000gzmwbvi";
+  version = "4.2.2.0";
+  sha256 = "0kz8v2ip0hmvqnrxgv44g2863z1dql88razl7aa3fw01q56ihz0y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
-    filepath httpConduit httpTypes lrucache mtl pandoc parsec random
-    regexBase regexTdfa snapCore snapServer tagsoup text time
+    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
+    dataDefault deepseq filepath httpConduit httpTypes lrucache mtl
+    pandoc parsec random regexBase regexTdfa snapCore snapServer
+    tagsoup text time
   ];
   testDepends = [
-    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
-    filepath httpConduit httpTypes HUnit lrucache mtl pandoc parsec
-    QuickCheck random regexBase regexTdfa snapCore snapServer tagsoup
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 text time
+    binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
+    dataDefault deepseq filepath httpConduit httpTypes HUnit lrucache
+    mtl pandoc parsec QuickCheck random regexBase regexTdfa snapCore
+    snapServer tagsoup testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
   meta = {
@@ -28,6 +31,9 @@ cabal.mkDerivation (self: {
     description = "A static website compiler library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 7b61aee26dfa..22acb85788d6 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.6.3";
-  sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss";
+  version = "1.1.7";
+  sha256 = "0vx2z8zvlr3860cypa3lkd8q51k6gngw65jqcbik3bxfbjj2qcv3";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Haml-like template files that are compile-time checked";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index fad611798e9d..64bf08ef5336 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Support for Hamlet HTML templates in Happstack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 0185e4e6ce92..3ea0262a6f4c 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Web related tools and services";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index 8dfac311a9a5..63e6c47b5b32 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Web framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
index ffb3f98e8b33..cc261a552355 100644
--- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
+++ b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A class for types that can be converted to a hash value";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix
index 0547fd67b1f7..d7d89ee86122 100644
--- a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix
+++ b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A class for types that can be converted to a hash value";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index 77a4251259d3..88e5839363e7 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Hashed file storage support code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index ae62c051ec5e..14407a038b82 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Mutable hash tables in the ST monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix
index 76080574fcc8..acf6a6c0d4fa 100644
--- a/pkgs/development/libraries/haskell/haskeline-class/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Class interface for working with Haskeline";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix
index 9863293c41de..9dff76cfe47e 100644
--- a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix
+++ b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A command-line interface for user input, written in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
index 3d51d396c7f5..c804e328500d 100644
--- a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
+++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A command-line interface for user input, written in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
index 9aa1bdea9514..90c4a599bc4c 100644
--- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "A fully compliant Haskell 98 lexer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
index add910b61936..bcd1e22037c0 100644
--- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-mpi/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Distributed parallel programming in Haskell using MPI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
index 1918260cc62f..bad9ab911759 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
index 5521e037b4eb..280fa347d897 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index 7b6ccb696338..84df55723959 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parse source to template-haskell abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index 6729cbef2aa6..0bec73765444 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index 1895a655d92f..949efadea96a 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Support for manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index 1dbbbec550a4..dd62d57a02ab 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Support for manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 15d32de346df..a98c3b3ed372 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Haskell implementation of Mustache templates";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix
index b319857bac3d..83917cf88919 100644
--- a/pkgs/development/libraries/haskell/haxr-th/default.nix
+++ b/pkgs/development/libraries/haskell/haxr-th/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Automatic deriving of XML-RPC structs for Haskell records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 1283d3a4a59e..deedba1673dc 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "XML-RPC client and server library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 45ff3fea7f0f..ff1c893cd0e7 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "An Haskell template system supporting both HTML5 and XML";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
index 5a656bc19c78..f1c6f8785262 100644
--- a/pkgs/development/libraries/haskell/hexpat/default.nix
+++ b/pkgs/development/libraries/haskell/hexpat/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "XML parser/formatter based on expat";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 9d6185dc5266..e137f58c11c6 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Syntax highlighting";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index de1c0e127597..1c6a0bfc7d45 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell binding to inotify";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 8cf1accca9c7..4a9c835e1fb7 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Runtime Haskell interpreter (GHC API wrapper)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 9551581dadf6..7bfe5a8fa957 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Haskell implementation of a javascript minifier";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index b5d9d7abbaac..f0edce802339 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Core data types, parsers and utilities for the hledger accounting tool";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 4099b1896a58..8de78340b1ca 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "The main command-line interface for the hledger accounting tool";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 2542e2005865..d22bd1b186c2 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.guibert
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix
index c568b292c3c1..d2ff9c480800 100644
--- a/pkgs/development/libraries/haskell/hoauth/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell implementation of OAuth 1.0a protocol.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 1e722a186dc4..306ee1437ba6 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -19,6 +19,9 @@ cabal.mkDerivation (self: {
     description = "Haskell API Search";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix
index 75886f8daadf..69653ca2699f 100644
--- a/pkgs/development/libraries/haskell/hostname/default.nix
+++ b/pkgs/development/libraries/haskell/hostname/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "A very simple package providing a cross-platform means of determining the hostname";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
index 96ac397da79c..f77d0ea677fe 100644
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Heap profiling helper library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
index 83369ac008b7..e1494f50693d 100644
--- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
index 3a1ed14785ba..0674ed31659a 100644
--- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix
+++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings to bibutils, the bibliography conversion utilities";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix
index d8bc08b4b33c..63b615607230 100644
--- a/pkgs/development/libraries/haskell/hscolour/default.nix
+++ b/pkgs/development/libraries/haskell/hscolour/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Colourise Haskell code";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix
index be78bea938cf..e7f75fb74d3e 100644
--- a/pkgs/development/libraries/haskell/hslogger-template/default.nix
+++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Automatic generation of hslogger functions";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
index 8c9885d4378f..52defb43e4cb 100644
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-expectations";
-  version = "0.3.0.3";
-  sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74";
+  version = "0.3.2";
+  sha256 = "0962wlngqck0wc7mcby9bzci1s8d9a91vsm39rnab5wifhc2c6xi";
   buildDepends = [ HUnit ];
   testDepends = [ hspec HUnit markdownUnlit silently ];
   doCheck = false;
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Catchy combinators for HUnit";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index c86db3bf0d72..706bba15def7 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -1,16 +1,16 @@
-{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit
-, QuickCheck, setenv, silently, time, transformers
+{ cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit
+, QuickCheck, quickcheckIo, random, setenv, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.4.4";
-  sha256 = "1p1miiaa38rd92bz695znlwd6wyvs8zpp2idyw5pkzvhqi8w10a1";
+  version = "1.5.2";
+  sha256 = "1kzlppbp8ralkpi89qrfdm5yrr72b9iq4nrvmblyjrb67h9412q0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
-    silently time transformers
+    ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
+    quickcheckIo random setenv time transformers
   ];
   doCheck = false;
   meta = {
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "A version of Hspec which is used to test Hspec itself";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 949874bfa910..bd517ababa67 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -1,26 +1,29 @@
-{ cabal, ansiTerminal, doctest, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, setenv, silently
-, time, transformers
+{ cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths
+, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
+, random, setenv, silently, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.4";
-  sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r";
+  version = "1.5.2";
+  sha256 = "1bndznbq7qyqr4j4mnsxf3dabmjyzah0bsiyynrc00ay1pf033l8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
-    silently time transformers
+    ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
+    quickcheckIo random setenv time transformers
   ];
   testDepends = [
-    ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta
-    HUnit QuickCheck setenv silently time transformers
+    ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations
+    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
+    transformers
   ];
+  doCheck = self.stdenv.system == "x86_64-linux";
   meta = {
     homepage = "http://hspec.github.com/";
     description = "Behavior-Driven Development for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
index dbd1a4a0923b..c1ee264ea84a 100644
--- a/pkgs/development/libraries/haskell/hspread/default.nix
+++ b/pkgs/development/libraries/haskell/hspread/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A client library for the spread toolkit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix
index e26a9d9e02a3..3f4754256599 100644
--- a/pkgs/development/libraries/haskell/hsyslog/default.nix
+++ b/pkgs/development/libraries/haskell/hsyslog/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "FFI interface to syslog(3) from POSIX.1-2001.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
index eaf1754b6223..7745c125e11b 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Parse HTML documents using xml-conduit datatypes";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
index de8dc75a5faa..f420bad2959c 100644
--- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix
+++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "HTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 715d5ce7dba2..3c0e1b3a2025 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.2.1";
-  sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i";
+  version = "1.9.2.2";
+  sha256 = "16njcgdnzs2la5xvs1pqs3zcjyzqlk3yfis89h9x7qg2w8hq8pxf";
   buildDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive certificate conduit cookie cprngAes dataDefault
@@ -32,6 +32,9 @@ cabal.mkDerivation (self: {
     description = "HTTP client package with conduit interface and HTTPS support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index 3571c160f6b7..adbabc0734b3 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "HTTP Date parser/formatter";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 39091256ec0f..8378a3dd9216 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.1.3";
-  sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn";
+  version = "0.1.1.4";
+  sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd";
   buildDepends = [
     blazeBuilder caseInsensitive classyPrelude conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network
@@ -22,5 +22,6 @@ cabal.mkDerivation (self: {
     description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index c4c064fbf811..9cc9d3859d63 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Generic HTTP types for Haskell (for both client and server code)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index d1d3f28b0496..e56a95437dbe 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A simple web-server with an interact style API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
index 86605ae55a56..9e2b9a21bb38 100644
--- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Character properties and classes for XML and Unicode";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
index 879ff0affdc7..61465a789058 100644
--- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A regular expression library for W3C XML Schema regular expressions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
index 731c63b5378b..6584a69b4bae 100644
--- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 35783c7762ef..53f7af3e52ad 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A collection of tools for processing XML with Haskell";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix
index 1d5bc92bf6f1..2ca926ffae7f 100644
--- a/pkgs/development/libraries/haskell/idna/default.nix
+++ b/pkgs/development/libraries/haskell/idna/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Implements IDNA (RFC 3490)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix
index 6eb5f262516f..3a731c626231 100644
--- a/pkgs/development/libraries/haskell/ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/ieee754/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Utilities for dealing with IEEE floating point numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index 61e580b6293d..4725ca37fca1 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generic programming library with a sum of products view";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
index cdf269b0d3c3..e085cebcef55 100644
--- a/pkgs/development/libraries/haskell/io-choice/default.nix
+++ b/pkgs/development/libraries/haskell/io-choice/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Choice for IO and lifted IO";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix
index 32e60325acc9..55b88ac1d36a 100644
--- a/pkgs/development/libraries/haskell/io-storage/default.nix
+++ b/pkgs/development/libraries/haskell/io-storage/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A key-value store in the IO monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
index 045bb64035c4..e5092ccb1ace 100644
--- a/pkgs/development/libraries/haskell/iproute/default.nix
+++ b/pkgs/development/libraries/haskell/iproute/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "IP Routing Table";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index 89d277d1f406..8bfcde01282e 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A small library for parsing IRC messages";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index ee9026bae493..fa906583afcf 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Iteratee-based I/O";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix
index d062ec298690..a7fc6b7e6e11 100644
--- a/pkgs/development/libraries/haskell/ivor/default.nix
+++ b/pkgs/development/libraries/haskell/ivor/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Theorem proving library based on dependent type theory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix
index c93aa0411d40..872f2fb394f7 100644
--- a/pkgs/development/libraries/haskell/jpeg/default.nix
+++ b/pkgs/development/libraries/haskell/jpeg/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A library for decoding JPEG files written in pure Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
index 9a56f412fe2b..3e2f2cca387f 100644
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Support for serialising Haskell to and from JSON";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix
index dd6c3eb058f2..44be8624a41a 100644
--- a/pkgs/development/libraries/haskell/jsonTypes/default.nix
+++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Basic types for representing JSON";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix
index 6ae0447b1fe6..489d4e9cdb3f 100644
--- a/pkgs/development/libraries/haskell/kansas-lava/default.nix
+++ b/pkgs/development/libraries/haskell/kansas-lava/default.nix
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
     description = "Kansas Lava is a hardware simulator and VHDL generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
index 51db50a75b76..2a8813d72a5f 100644
--- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Utility libraries for the advanced IRC bot, Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
index 926c5acafbab..68269106e5d4 100644
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Lambdabot is a development tool and advanced IRC bot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
index f3c9a8af4eab..6d7f756c6866 100644
--- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
+++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "3D rendering engine written entirely in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix
index fc8c15edf570..7e96fd6c6a55 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "C/CUDA/OpenCL quasiquoting library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix b/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix
new file mode 100644
index 000000000000..1ce3ceaac825
--- /dev/null
+++ b/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix
@@ -0,0 +1,28 @@
+{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
+, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol
+, testFramework, testFrameworkHunit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "language-c-quote";
+  version = "0.7.1";
+  sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z";
+  buildDepends = [
+    exceptionMtl exceptionTransformers filepath haskellSrcMeta
+    mainlandPretty mtl srcloc syb symbol
+  ];
+  testDepends = [
+    HUnit srcloc symbol testFramework testFrameworkHunit
+  ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
index 154bc68c3c5c..aa9cb12412f0 100644
--- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
+++ b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Analysis and generation of C code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/0.4.2.nix
index 5b638ea9dab4..71e514ddbc11 100644
--- a/pkgs/development/libraries/haskell/language-c/0.4.2.nix
+++ b/pkgs/development/libraries/haskell/language-c/0.4.2.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Analysis and generation of C code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
index a77040a5578c..d81d4a818e20 100644
--- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
+++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Module to automatically extract functions from the local code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 4571b869e3bd..2ecf3490af66 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Parser for JavaScript";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index aa3cd5fcdf60..a38099b761b9 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
index f409d99987d9..5881baf7430b 100644
--- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A library for demand-driven testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
index 1a907a384f1f..07804ef1b7d1 100644
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Metadata collection for leksah";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
index b8f0ed37d4cb..75059e705124 100644
--- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix
+++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Process libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 84a66d019dcc..ef0b46b236d9 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.8.7.3";
-  sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09";
+  version = "3.9.0.2";
+  sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers contravariant
     distributive filepath genericDeriving hashable
@@ -31,5 +31,6 @@ cabal.mkDerivation (self: {
     description = "Lenses, Folds and Traversals";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index 3222f4607e7f..0ecf0e37ca2c 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -1,17 +1,22 @@
-{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
-, pureMD5, text
+{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit
+, httpTypes, HUnit, network, pureMD5, testFramework
+, testFrameworkHunit, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.1.1.0";
-  sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
+  version = "0.1.1.2";
+  sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9";
   buildDepends = [
     aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
   ];
+  testDepends = [
+    aeson attoparsec HUnit testFramework testFrameworkHunit text
+  ];
   meta = {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index 7402d6f31db3..64a4906fa597 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "An MPD client library";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
index b41ca8dfa543..de30698e2e7e 100644
--- a/pkgs/development/libraries/haskell/libxml-sax/default.nix
+++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "libxml-sax";
-  version = "0.7.3";
-  sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r";
+  version = "0.7.4";
+  sha256 = "1vbxrmxxb6a58hd6dd81kz8fh198jkvwv4gxzbbfw44170946c0z";
   buildDepends = [ text xmlTypes ];
   extraLibraries = [ libxml2 ];
   pkgconfigDepends = [ libxml2 ];
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Bindings for the libXML2 SAX interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 1d675e88d874..bd3dd5032453 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.0.2";
-  sha256 = "19xzparj0k5h4wx71gvbd7l653fak1p57za236sncmar8cps5pdx";
+  version = "0.2.0.3";
+  sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "lifted IO operations from the base library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
index 7efe6b25b391..b8aeeaa2b73a 100644
--- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix
+++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Michael and Scott lock-free queues";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix
index 3088004d0a88..5f438fb40601 100644
--- a/pkgs/development/libraries/haskell/logfloat/default.nix
+++ b/pkgs/development/libraries/haskell/logfloat/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Log-domain floating point numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 0a03ed45fee6..129a7d7c9004 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A backtracking logic-programming monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
index 2d494f4a8969..a43b5f0fadec 100644
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ b/pkgs/development/libraries/haskell/lrucache/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "a simple, pure LRU cache";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix
index 7960395eb098..2983313e0cce 100644
--- a/pkgs/development/libraries/haskell/ltk/default.nix
+++ b/pkgs/development/libraries/haskell/ltk/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Leksah tool kit";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix
index 6109f33f82fe..03731a91d87a 100644
--- a/pkgs/development/libraries/haskell/maccatcher/default.nix
+++ b/pkgs/development/libraries/haskell/maccatcher/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Obtain the host MAC address on *NIX and Windows";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 30681bd340bc..21110ffdbe79 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Pretty printing designed for printing source code";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
index 06c1b9e2fcae..617d6caf2c9a 100644
--- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix
+++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Literate Haskell support for Markdown";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix
index 2e29269a9fdf..f5046748a0b2 100644
--- a/pkgs/development/libraries/haskell/math-functions/default.nix
+++ b/pkgs/development/libraries/haskell/math-functions/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Special functions and Chebyshev polynomials";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
index 84f0d83a9242..f03b771b8fda 100644
--- a/pkgs/development/libraries/haskell/maude/default.nix
+++ b/pkgs/development/libraries/haskell/maude/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "An interface to the Maude rewriting system";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
index 590290e76c34..3153bb6f6086 100644
--- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
+++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index d24bf5719bde..f9c1b69706a4 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Compose MIME email messages";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix
index 5dd5f65c9e74..18056986cb0f 100644
--- a/pkgs/development/libraries/haskell/mime-types/default.nix
+++ b/pkgs/development/libraries/haskell/mime-types/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Basic mime-type handling types and functions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix
index 06dcfaa11390..b036d638caec 100644
--- a/pkgs/development/libraries/haskell/minimorph/default.nix
+++ b/pkgs/development/libraries/haskell/minimorph/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "English spelling functions with an emphasis on simplicity";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix
index 22018087226e..6cfbf687e5a6 100644
--- a/pkgs/development/libraries/haskell/miniutter/default.nix
+++ b/pkgs/development/libraries/haskell/miniutter/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Simple English clause creation from arbitrary words";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix
index 4d0b9fcabeb7..f810186a62bb 100644
--- a/pkgs/development/libraries/haskell/mmap/default.nix
+++ b/pkgs/development/libraries/haskell/mmap/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Memory mapped files for POSIX and Windows";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
new file mode 100644
index 000000000000..0d8e61530495
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mmorph";
+  version = "1.0.0";
+  sha256 = "10r8frcn6ar56n1vxy8rkys8j52f8xkqan8qxqanka1150k6khqk";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Monad morphisms";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 1cdf917cf8fb..aa794357b9f8 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Lift control operations, like exception catching, through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index c06809c261dc..d57d6e5ee1cf 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "A class of monads which can log messages";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
index ef7d6c27173b..fb6ead581c62 100644
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic loops";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
index fb8773372212..b651575e0a6e 100644
--- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Combinators and extra features for Par monads";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
index 8692d6267cbe..6430ec3c7606 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A library for parallel programming based on a monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
index 342bea47f6b1..6ded217c4d7e 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4";
-  sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k";
+  version = "0.3.4.1";
+  sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "A library for parallel programming based on a monad";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
index 39f911dae938..afa31d1a0d5f 100644
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ b/pkgs/development/libraries/haskell/monad-peel/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Lift control operations like exception catching through monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index df63e3ec6591..4daba276730a 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A monad for using CryptoRandomGen";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
index f51fd8c840ae..652b561de84e 100644
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ b/pkgs/development/libraries/haskell/monads-tf/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monad classes, using type families";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index 83b04869e68c..caa30fe6fca0 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a67017298a83..96f254d077e3 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.2.2.2";
-  sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
+  version = "0.2.2.3";
+  sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
   buildDepends = [ semigroups ];
-  jailbreak = true;
   meta = {
     description = "Various extra monoid-related definitions and utilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix
index 543578211718..d5cb3e9769f4 100644
--- a/pkgs/development/libraries/haskell/mpppc/default.nix
+++ b/pkgs/development/libraries/haskell/mpppc/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Multi-dimensional parametric pretty-printer with color";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
index fc8fdaef7525..d609fc75cd78 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Monad transformer library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
index d7e6029a4edc..05e84b90dd07 100644
--- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Monad transformer library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
index 3c91b65efa04..dc2ddedc121e 100644
--- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monad classes, using functional dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix
index b9298325c207..427411d41088 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monad classes, using functional dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix
index c10f526acf21..5048a4b99686 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.1.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monad classes, using functional dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix
index 37be70cebcb1..349fea712eba 100644
--- a/pkgs/development/libraries/haskell/mtlparse/default.nix
+++ b/pkgs/development/libraries/haskell/mtlparse/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "parse library using mtl package";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index 0a2495a07e9d..72936e1873c3 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,14 +2,17 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.10.0.0";
-  sha256 = "09clgin66i2m0b3ws7di9p15cy9bd144as832xpx4li6cfbg16ip";
+  version = "0.12.0.2";
+  sha256 = "0f90dsa5ya55lrc0x0ziz01fjvaq85q4f8zsfci1w1rgxa9m7naa";
   buildDepends = [ explicitException utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";
     description = "Combinators to build command line parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
index 14310f50ef6f..a586b89982c0 100644
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ b/pkgs/development/libraries/haskell/multiplate/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Lightweight generic library for mutually recursive data types";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index a7d7459b4558..98cab8421de4 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generic programming for families of recursive datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.1.nix b/pkgs/development/libraries/haskell/multiset/0.2.1.nix
index 9f85317505c9..eb5df93d5bca 100644
--- a/pkgs/development/libraries/haskell/multiset/0.2.1.nix
+++ b/pkgs/development/libraries/haskell/multiset/0.2.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "The Data.MultiSet container type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.2.nix b/pkgs/development/libraries/haskell/multiset/0.2.2.nix
index 16fcf155747d..4ca3e4fb19f0 100644
--- a/pkgs/development/libraries/haskell/multiset/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/multiset/0.2.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "The Data.MultiSet container type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
index 0c4058eb1119..8d4c59b959e5 100644
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "MurmurHash2 implementation for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix
index 3e9be2c5e587..bccde70459aa 100644
--- a/pkgs/development/libraries/haskell/mwc-random/default.nix
+++ b/pkgs/development/libraries/haskell/mwc-random/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Fast, high quality pseudo random number generation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix
index b7f498a35c83..bd3f7d7edd51 100644
--- a/pkgs/development/libraries/haskell/nanospec/default.nix
+++ b/pkgs/development/libraries/haskell/nanospec/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A lightweight implementation of a subset of Hspec's API";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix
index 3ad4240e2892..b8fb5f9e4efc 100644
--- a/pkgs/development/libraries/haskell/nat/default.nix
+++ b/pkgs/development/libraries/haskell/nat/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Lazy binary natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
index 02f5c289836e..f48a64221009 100644
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ b/pkgs/development/libraries/haskell/nats/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix
index 787ac70ffa96..e08c05ac6325 100644
--- a/pkgs/development/libraries/haskell/naturals/default.nix
+++ b/pkgs/development/libraries/haskell/naturals/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Constructors and related functions for natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
index ff9ed1ac0bfa..47e3b62138aa 100644
--- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
+++ b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Convert a Netlist AST to VHDL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix
index 57550dcb3d86..91f7042509b9 100644
--- a/pkgs/development/libraries/haskell/netlist/default.nix
+++ b/pkgs/development/libraries/haskell/netlist/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Netlist AST";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix
new file mode 100644
index 000000000000..fbc143fbfaf3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/netwire/default.nix
@@ -0,0 +1,19 @@
+{ cabal, bifunctors, deepseq, liftedBase, monadControl, mtl
+, profunctors, random, semigroups, tagged, time, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "netwire";
+  version = "4.0.7";
+  sha256 = "035jz7j19c7n4za9xi8vj6yl9m2b2v6d53mp711gf8609wv0cx0c";
+  buildDepends = [
+    bifunctors deepseq liftedBase monadControl mtl profunctors random
+    semigroups tagged time vectorSpace
+  ];
+  meta = {
+    description = "Flexible wire arrows for FRP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
new file mode 100644
index 000000000000..483271fe9598
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -0,0 +1,21 @@
+{ cabal, aeson, certificate, conduit, cryptoApi, cryptoRandomApi
+, network, networkConduit, pem, systemFileio, systemFilepath, tls
+, tlsExtra, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "network-conduit-tls";
+  version = "1.0.0.2";
+  sha256 = "1vzhalz6hxal73rxm6f2l9m7j34mldamz16wrb6ay67wg6giq55z";
+  buildDepends = [
+    aeson certificate conduit cryptoApi cryptoRandomApi network
+    networkConduit pem systemFileio systemFilepath tls tlsExtra
+    transformers
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/conduit";
+    description = "Create TLS-aware network code with conduits";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 032592f974ba..80d9fc05bd82 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Stream socket data using conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix
index c1bfea43bde6..f15a94082a16 100644
--- a/pkgs/development/libraries/haskell/network-info/default.nix
+++ b/pkgs/development/libraries/haskell/network-info/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Access the local computer's basic network configuration";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
index 3a461a51f53b..089a34638341 100644
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ b/pkgs/development/libraries/haskell/network-multicast/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Simple multicast library";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
index 304017d3d240..e58bf679fdc5 100644
--- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
+++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Client library for the XMPP protocol";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
index 840712e34160..47718bc3468e 100644
--- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "TCP instantiation of Network.Transport";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
index 7aedea7995b7..c709f7b853c5 100644
--- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Unit tests for Network.Transport implementations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix
index eaa41944a6bd..86656974aa89 100644
--- a/pkgs/development/libraries/haskell/network-transport/default.nix
+++ b/pkgs/development/libraries/haskell/network-transport/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Network abstraction layer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
index 68c7937497c4..7d99df9ee1c8 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Networking-related facilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
index f66d81f79f45..ba33bc36643b 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Networking-related facilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
index 557dea081fdb..107d4f50f353 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
index a1a9a36d7382..9d2642a487d2 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix
index 9434d83d7f01..bf9330eb256a 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix
index dc0c1811e591..7cd500521dfd 100644
--- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
index 6f245cf18400..a4b2f8ac8e93 100644
--- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Low-level networking interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix
index 40354c9472ce..a08ff33c0e48 100644
--- a/pkgs/development/libraries/haskell/newtype/default.nix
+++ b/pkgs/development/libraries/haskell/newtype/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "A typeclass and set of functions for working with newtypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix
index a50710791dbc..934bb76dcd42 100644
--- a/pkgs/development/libraries/haskell/non-negative/default.nix
+++ b/pkgs/development/libraries/haskell/non-negative/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Non-negative numbers";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
index 81a3e866dc01..72b3ac1c7d5d 100644
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Various number types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index 1cb6ab49bcd6..329317f6834d 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "An experimental alternative hierarchy of numeric type classes";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
index 76f57daca385..d7e88e882cd8 100644
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Type-level (low cardinality) integers, implemented using type families";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index be90f003f7fb..b55e0c50b4b3 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Type-level (low cardinality) integers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index c8b9e984eb1c..6d16100ccc12 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Interface to the Online Encyclopedia of Integer Sequences";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index 46f530b8cd4f..21aba33a004f 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Utilities and combinators for parsing command line options";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index d4f49791d306..ce7888cd4b7f 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Types for representing a structured document";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 184e3fd9536d..f81fb4e56d9e 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.11";
-  sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh";
+  version = "1.11.1";
+  sha256 = "0b23vrgkm1csykx1zrldkg5ka816j6m7a5fhs4cxffalifq91c7b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -24,7 +24,6 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 text
   ];
   configureFlags = "-fblaze_html_0_5";
-  patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal";
   doCheck = false;
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index bbd935eb043f..d11b33e2096b 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the Pango text rendering engine";
     license = self.stdenv.lib.licenses.lgpl21;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
index 56c1a1306964..9d0c82f1aed1 100644
--- a/pkgs/development/libraries/haskell/parallel-io/default.nix
+++ b/pkgs/development/libraries/haskell/parallel-io/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Combinators for executing IO actions in parallel on a thread pool";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
index 5212e6b2847a..2977a60964cf 100644
--- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
index 9fb661fd481f..185e86b02e89 100644
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
index 83283c2317b0..37d537185cb6 100644
--- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
index 365ed1968419..81d37e3a2b0c 100644
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
index e089c8dce8ea..ee8265950b76 100644
--- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
+++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Parallel programming library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix
index 4287015115c8..197376d608b0 100644
--- a/pkgs/development/libraries/haskell/parseargs/default.nix
+++ b/pkgs/development/libraries/haskell/parseargs/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Command-line argument parsing library for Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
index 17c046a06e1d..155e4f09007c 100644
--- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
index 62c5b67b0e9a..e740ca91dba2 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
index ecbdbb3aef0a..95ef6219dbb7 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix
index b9b10f2e5b0d..5f6521e45833 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix
index 4245fcf7f40b..55bc7f74d297 100644
--- a/pkgs/development/libraries/haskell/parsimony/default.nix
+++ b/pkgs/development/libraries/haskell/parsimony/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Monadic parser combinators derived from Parsec";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
index 14b9f8d70813..83a8c2d3faff 100644
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Components of paths";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
index f0be81e64ae3..00d33238c428 100644
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ b/pkgs/development/libraries/haskell/pathtype/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Type-safe replacement for System.FilePath etc";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index 71e0ddadb59c..3336b8f1c8a4 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
index 16b47a9c8ae0..35f8ae70cfe3 100644
--- a/pkgs/development/libraries/haskell/pem/default.nix
+++ b/pkgs/development/libraries/haskell/pem/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Privacy Enhanced Mail (PEM) format reader and writer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
index 4f38dfcaa12f..6e7f44727536 100644
--- a/pkgs/development/libraries/haskell/permutation/default.nix
+++ b/pkgs/development/libraries/haskell/permutation/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A library for permutations and combinations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 52c74af4d4d9..885ad70f63fa 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -10,11 +10,15 @@ cabal.mkDerivation (self: {
     aeson conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Backend for the persistent library using postgresql";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index 947f75342d45..86bbe4e27883 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Backend for the persistent library using sqlite3";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 8cdc7caafc9b..926b4fa4cb60 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.1.2.5";
-  sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj";
+  version = "1.1.3.1";
+  sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p";
   buildDepends = [ aeson monadControl persistent text transformers ];
   testDepends = [ aeson hspec persistent QuickCheck text ];
   meta = {
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Type-safe, non-relational, multi-backend persistence";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 036deebae20d..8ca0febfd840 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Type-safe, multi-backend data serialization";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix
index b1be8dd6d035..c101ec60a36d 100644
--- a/pkgs/development/libraries/haskell/pgm/default.nix
+++ b/pkgs/development/libraries/haskell/pgm/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Pure Haskell implementation of PGM image format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/polyparse/1.7.nix b/pkgs/development/libraries/haskell/polyparse/1.7.nix
index 23a0af761c13..b27dc9cc6952 100644
--- a/pkgs/development/libraries/haskell/polyparse/1.7.nix
+++ b/pkgs/development/libraries/haskell/polyparse/1.7.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A variety of alternative parser combinator libraries";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/polyparse/1.8.nix b/pkgs/development/libraries/haskell/polyparse/1.8.nix
index 24425c6b5e65..a0ee0e199bb9 100644
--- a/pkgs/development/libraries/haskell/polyparse/1.8.nix
+++ b/pkgs/development/libraries/haskell/polyparse/1.8.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A variety of alternative parser combinator libraries";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix
index 08c035f18268..bec8f7882f11 100644
--- a/pkgs/development/libraries/haskell/pool-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Resource pool allocations via ResourceT";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index 90a92019f0e1..bba70d7139b5 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "low-level binding to libpq";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 81a5f67c45b9..9c30ad00e5c2 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Mid-Level PostgreSQL client library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix
index c55fc0226e9c..df204fa2482f 100644
--- a/pkgs/development/libraries/haskell/ppm/default.nix
+++ b/pkgs/development/libraries/haskell/ppm/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "a tiny PPM image generator";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
index 5fedd0aca292..6d76aeb9bf6f 100644
--- a/pkgs/development/libraries/haskell/pretty-show/default.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Tools for working with derived `Show` instances and generic inspection of values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.4.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix
index 9daef669c577..ab8dc18ad0ae 100644
--- a/pkgs/development/libraries/haskell/primitive/0.4.1.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.4.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Wrappers for primitive operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
index af6778ccd141..680904992835 100644
--- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Primitive memory-related operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.nix b/pkgs/development/libraries/haskell/primitive/0.5.nix
index d09359aaeb92..2a7ce3532d40 100644
--- a/pkgs/development/libraries/haskell/primitive/0.5.nix
+++ b/pkgs/development/libraries/haskell/primitive/0.5.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Primitive memory-related operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix
index 1d9cb4f80620..f1baf67bec72 100644
--- a/pkgs/development/libraries/haskell/process-extras/default.nix
+++ b/pkgs/development/libraries/haskell/process-extras/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Process extras";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index df16898ddd3e..b7b1e209ae9c 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -15,5 +15,6 @@ cabal.mkDerivation (self: {
     description = "Profunctor extras";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
index e2194bf90597..f141959dcf1a 100644
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ b/pkgs/development/libraries/haskell/profunctors/default.nix
@@ -2,13 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "3.3";
-  sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj";
+  version = "3.3.0.1";
+  sha256 = "16d7xg929r4smmmcgi54bz7rsjxs6psksrdvzl4336sjpp3dw5h2";
   buildDepends = [ comonad tagged ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";
     description = "Haskell 98 Profunctors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
index fa60370f1f5e..2b225d6a87dc 100644
--- a/pkgs/development/libraries/haskell/project-template/default.nix
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Specify Haskell project templates and generate files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
index 98b65bb59f02..c4923836bb26 100644
--- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generating images of resolution trees for Prolog queries";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix
index 8016095a4020..446a430ed7c0 100644
--- a/pkgs/development/libraries/haskell/prolog-graph/default.nix
+++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A command line tool to visualize query resolution in Prolog";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix
index b1e6e1d4e303..253903d3e3fe 100644
--- a/pkgs/development/libraries/haskell/prolog/default.nix
+++ b/pkgs/development/libraries/haskell/prolog/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A Prolog interpreter written in Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
index a091b62b3b16..e42d0a2bc789 100644
--- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
+++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Is a given string a domain suffix?";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix
index a4ad760d8ffe..fabc39123d07 100644
--- a/pkgs/development/libraries/haskell/punycode/default.nix
+++ b/pkgs/development/libraries/haskell/punycode/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Encode unicode strings to ascii forms according to RFC 3492";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
index 8e66b2c3c037..e6d0a3f4d80c 100644
--- a/pkgs/development/libraries/haskell/pureMD5/default.nix
+++ b/pkgs/development/libraries/haskell/pureMD5/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index d75823d6025e..4d50729604e0 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Secure password storage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
new file mode 100644
index 000000000000..985223678cbc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix
@@ -0,0 +1,14 @@
+{ cabal, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "quickcheck-io";
+  version = "0.1.0";
+  sha256 = "167ds7c7p1lcfsylxhq2sr0jxbviyim1n42dhyr0s0b6hazw8cjs";
+  buildDepends = [ HUnit QuickCheck ];
+  meta = {
+    description = "Use HUnit assertions as QuickCheck properties";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 8dd228ad3db3..37ed0f7ab974 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Random number generation";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix
index 1104091ae57f..9c9dedde25d9 100644
--- a/pkgs/development/libraries/haskell/random-shuffle/default.nix
+++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Random shuffle implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix
index acc0285a59a4..707477609b64 100644
--- a/pkgs/development/libraries/haskell/random-source/default.nix
+++ b/pkgs/development/libraries/haskell/random-source/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Generic basis for random number generators";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
index 1f4901a4d91d..a4feee31d023 100644
--- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix
+++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "random number library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix
index 2182e6410b53..0ba350270505 100644
--- a/pkgs/development/libraries/haskell/ranges/default.nix
+++ b/pkgs/development/libraries/haskell/ranges/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Ranges and various functions on them";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
index 8694d2399b2b..d30375f46e83 100644
--- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix
+++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
index ee408fea4805..0fbd9d74d19c 100644
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Examples for the reactive-banana library, using wxHaskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 8d62f67a1281..682943e80f14 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.bluescreen303
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
index 37fb26208f48..60747bbda68b 100644
--- a/pkgs/development/libraries/haskell/recaptcha/default.nix
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Functions for using the reCAPTCHA service in web applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
index 1819b3d217df..d18f711cab32 100644
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ b/pkgs/development/libraries/haskell/reflection/default.nix
@@ -2,13 +2,14 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.1.7";
-  sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z";
+  version = "1.2.0.1";
+  sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";
     description = "Reifies arbitrary terms into types that can be reflected back into terms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
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
index e94a233d9f16..09e4906da011 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
index 5a49d2b6407c..8fbc2f9e84d0 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
index 1dc559e63702..50f039a3d27a 100644
--- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index 623db0cc48b9..ed88e247e5b7 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
index 8b9e666d6aee..3db0f5d40656 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
index df3a7abf13f0..3a28e505a82d 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
index 52c28d8b800b..138702e1d416 100644
--- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix
index 2b7f53e4572a..a34d90fa9847 100644
--- a/pkgs/development/libraries/haskell/regex-pcre/default.nix
+++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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
index f1f6a89dc3d9..961aab9e2f77 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
index 662d8236c45a..223c9baedcdd 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
index 11e02b398b5c..9a570d4ca20d 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
index 42ee42ba7ef7..e78c7fe2584d 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
index 58106bc8b741..ca6358baeedb 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
index 6d7fac51658e..22e1dca23ba0 100644
--- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
index 67073790d25b..82fa24016bc5 100644
--- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Replaces/Enhances Text.Regex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix
index c5389a7b6636..538b980b4383 100644
--- a/pkgs/development/libraries/haskell/regexpr/default.nix
+++ b/pkgs/development/libraries/haskell/regexpr/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "regular expression like Perl/Ruby in Haskell";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 8a3e740491cb..bee3cf33d1ae 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Generic programming library for regular datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix
index 3e160130ea8f..75c94bea23be 100644
--- a/pkgs/development/libraries/haskell/remote/default.nix
+++ b/pkgs/development/libraries/haskell/remote/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Cloud Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index acf9dc712f35..b81a37f8ee5f 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Algorithms using the Repa array library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index bea9d9f7f043..03941f57316e 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Examples using the Repa array library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 046fafca43a7..23e8b2b761ef 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Read and write Repa arrays in various formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 4eb21c5661a5..63f3eaa982e7 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "High performance, regular, shape polymorphic parallel arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
index c44735eda00b..951288c04aae 100644
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Render overloaded expressions to their textual representation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index 77bc91051937..c8c28f0e7749 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A high-performance striped resource pooling implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index f0dde62ef979..2421b64b374c 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -1,13 +1,13 @@
-{ cabal, hspec, liftedBase, monadControl, mtl, transformers
+{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, transformers
 , transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.5";
-  sha256 = "1i2n0y4ridlzi2fn319f8jg1whb10gajgyvbz0rx2mwxj15bbgni";
+  version = "0.4.7";
+  sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8";
   buildDepends = [
-    liftedBase monadControl mtl transformers transformersBase
+    liftedBase mmorph monadControl mtl transformers transformersBase
   ];
   testDepends = [ hspec liftedBase transformers ];
   meta = {
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Deterministic allocation and freeing of scarce resources";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index 6f2ed95ab636..c6435cfc8df0 100644
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Random Variables";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index 6c16af12107d..067b7c4cf67d 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Library for safe (pattern match free) functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
new file mode 100644
index 000000000000..7de31bcf6567
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -0,0 +1,20 @@
+{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
+, httpTypes, mtl, regexCompat, resourcet, text, wai, waiExtra, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "scotty";
+  version = "0.4.6";
+  sha256 = "0g83kgqr1p03z7dks6x00id2gz95kkw00wmwp5vyz4zvx1mmmvk8";
+  buildDepends = [
+    aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
+    mtl regexCompat resourcet text wai waiExtra warp
+  ];
+  meta = {
+    homepage = "https://github.com/ku-fpg/scotty";
+    description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
index 263adb42f253..26949f5004d7 100644
--- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Semigroupoids requiring Haskell extensions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 4f1367dd559d..dcbb09b5613f 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 semigroupoids: Category sans id";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index ea0f2813b55f..dbdce2eabe51 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Haskell 98 semigroups";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index dc1f24757af2..0cc3a64ccc8f 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A portable sendfile library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
index b19728820aad..02df359df868 100644
--- a/pkgs/development/libraries/haskell/setenv/default.nix
+++ b/pkgs/development/libraries/haskell/setenv/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A cross-platform library for setting environment variables";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index dd4f985e6183..e2b46cfcbc52 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.9.1";
-  sha256 = "19jpnf7794ii1v0rfafmcrs71flwz6hmz72ng529ll12iy64xwkv";
+  version = "0.10.2";
+  sha256 = "0045dz46iacrihqlsdg00zmnkrma5swnmy2bp4h91fx0829lki9n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Build system library, like Make, but more accurate dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 56174254c219..486b8a1cc271 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Stick your haskell variables into css at compile time";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 1150ead03941..a624bb140d15 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A type-based approach to internationalization";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 7f00530a7f94..c187854be064 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Stick your haskell variables into javascript/coffeescript at compile time";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index d4cc135cc62a..d5551d0ef8cd 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Interpolation with quasi-quotation: put variables strings";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index d38002eebdaa..4b8a29b6abff 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A toolkit for making compile-time interpolated templates";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 1e9e1f8c6ccb..9c167eb126be 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "shell-like (systems) programming in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
index 411684e4953c..7eed37f5a40d 100644
--- a/pkgs/development/libraries/haskell/show/default.nix
+++ b/pkgs/development/libraries/haskell/show/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "'Show' instances for Lambdabot";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix
index fcd7a0a872a5..87a3ac1d4633 100644
--- a/pkgs/development/libraries/haskell/silently/default.nix
+++ b/pkgs/development/libraries/haskell/silently/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Prevent or capture writing to stdout and other handles";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix
index 7a7f40c6d833..af6a6a6e6943 100644
--- a/pkgs/development/libraries/haskell/simple-reflect/default.nix
+++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Simple reflection of expressions containing variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 9e8f638c65cf..f1d245f9358e 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Cross platform library for the sendfile system call";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix
index 672b2c090ef2..99cb87b7c046 100644
--- a/pkgs/development/libraries/haskell/sized-types/default.nix
+++ b/pkgs/development/libraries/haskell/sized-types/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Sized types in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 7fdb7e3a1dcc..ec71d27db02c 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.12";
-  sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a";
+  version = "1.0.0";
+  sha256 = "03r9kqbvv6z1d8ivdwrxvac5bnd29w116pbixyrcrbx0sg1wwpfa";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   meta = {
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index 6d82e7e5132d..ff710b0ea07d 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A property-based testing library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index a20ec8e7ca5a..7aa6cfae73e9 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework (core interfaces and types)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
index abe4d4cc074b..85a39546e45f 100644
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework: dynamic loader";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix
index e75ae50d6c87..09402c1a5502 100644
--- a/pkgs/development/libraries/haskell/snap/loader-static.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-static.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Snap: A Haskell Web Framework: static loader";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index c11dfe4f398f..7bd2ca8fdbe9 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index b87cde894472..8462b85caf99 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -20,10 +20,14 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
+  patchPhase = ''
+    sed -i -e 's|lens .*>= 3.7.6.*$|lens|' snap.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix
index 34e4bf978a4f..485b912c2a88 100644
--- a/pkgs/development/libraries/haskell/socks/default.nix
+++ b/pkgs/development/libraries/haskell/socks/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Socks proxy (version 5) implementation";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
index 0fb28b53ac94..c9f9ecad73cf 100644
--- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Combinator library for splitting lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.3.nix
index e98e36fe6558..ebadd0f9ba30 100644
--- a/pkgs/development/libraries/haskell/split/0.2.1.2.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.3.nix
@@ -2,13 +2,16 @@
 
 cabal.mkDerivation (self: {
   pname = "split";
-  version = "0.2.1.2";
-  sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi";
+  version = "0.2.1.3";
+  sha256 = "1s3aga7asxz495bx7i72a6fkdlz1zv20rrrqg1avj7b1sjn3gy9w";
   testDepends = [ QuickCheck ];
   meta = {
     description = "Combinator library for splitting lists";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index f652ed001e40..eef8a1505cfc 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Data types for managing source code locations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix
index bc3913f6726d..b14fd6ebadeb 100644
--- a/pkgs/development/libraries/haskell/stateref/default.nix
+++ b/pkgs/development/libraries/haskell/stateref/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Abstraction for things that work like IORef";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index f53e7a341d6e..40f9214ad33d 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "A library of statistical types, data, and functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix
index 1b1f1ba705bf..1521763f2bfe 100644
--- a/pkgs/development/libraries/haskell/stb-image/default.nix
+++ b/pkgs/development/libraries/haskell/stb-image/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
new file mode 100644
index 000000000000..07bc40d42d68
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@@ -0,0 +1,15 @@
+{ cabal, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-chans";
+  version = "1.3.1";
+  sha256 = "15agd0d3r3zmya72hpi9pkmzqw7mj6l84946dhds0hsb6d12r6qj";
+  buildDepends = [ stm ];
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Additional types of channels for STM";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
new file mode 100644
index 000000000000..5cfc61d064ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -0,0 +1,22 @@
+{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "stm-conduit";
+  version = "1.0.0";
+  sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
+  buildDepends = [ conduit resourcet stm stmChans transformers ];
+  testDepends = [
+    conduit HUnit QuickCheck stm stmChans testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 transformers
+  ];
+  meta = {
+    homepage = "https://github.com/wowus/stm-conduit";
+    description = "Introduces conduits to channels, and promotes using conduits concurrently";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
index fe308211ebb5..6184a324181f 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
index 492fb6e3557f..8615f10be80f 100644
--- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
index fc33a979adff..1174a9740e5b 100644
--- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix
index 4057b1f7fb3c..7057ede7052e 100644
--- a/pkgs/development/libraries/haskell/stm/2.3.nix
+++ b/pkgs/development/libraries/haskell/stm/2.3.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix
index a3fa76e4a519..d75f133d896a 100644
--- a/pkgs/development/libraries/haskell/stm/2.4.2.nix
+++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix
index a949474cef12..13d3653ff653 100644
--- a/pkgs/development/libraries/haskell/stm/2.4.nix
+++ b/pkgs/development/libraries/haskell/stm/2.4.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Software Transactional Memory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix
index 4450308a9107..dc36d53f046a 100644
--- a/pkgs/development/libraries/haskell/storable-complex/default.nix
+++ b/pkgs/development/libraries/haskell/storable-complex/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Storable instance for Complex";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 455d860ba5e9..caf8e218b181 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Elegant definition of Storable instances for records";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix
index 61b34efbe451..99239884b0a3 100644
--- a/pkgs/development/libraries/haskell/strict/default.nix
+++ b/pkgs/development/libraries/haskell/strict/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Strict data types and String IO";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
index 915fad7006a4..083f3e06d5b7 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Strict concurrency abstractions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
index bfc38fb07e89..75c31a3971f9 100644
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Polymorphic functions to build and combine stringlike values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix
index 78fe1c3930f7..eb5d7303cdd3 100644
--- a/pkgs/development/libraries/haskell/string-qq/default.nix
+++ b/pkgs/development/libraries/haskell/string-qq/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix
index efe0956afc0f..ddb219cc3075 100644
--- a/pkgs/development/libraries/haskell/stringbuilder/default.nix
+++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "A writer monad for multi-line string literals";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix
index f1654751f753..b37be3680cb7 100644
--- a/pkgs/development/libraries/haskell/stringprep/default.nix
+++ b/pkgs/development/libraries/haskell/stringprep/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Implements the \"StringPrep\" algorithm";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix
index f8032f8cde41..dc3bdd6a2c35 100644
--- a/pkgs/development/libraries/haskell/stringsearch/default.nix
+++ b/pkgs/development/libraries/haskell/stringsearch/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Fast searching, splitting and replacing of ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix
index c092f0c0d15b..9e50b646e3b7 100644
--- a/pkgs/development/libraries/haskell/strptime/default.nix
+++ b/pkgs/development/libraries/haskell/strptime/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 1d2cea756ffb..87d79b6e0610 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "Haskell code prettifier";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
index e7aafd37264e..08c812f74241 100644
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ b/pkgs/development/libraries/haskell/svgcairo/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Binding to the libsvg-cairo library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix
index b03cb947d27d..070279fadfde 100644
--- a/pkgs/development/libraries/haskell/syb/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix
index 7caf5908a2dc..01cc80c883dd 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
index 7638ab3332f2..04e5b7e1b0e7 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
index a37e238ff710..70f1b01db0ac 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix
index 44a16e0bf5ca..5063009b93af 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.7.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix
index 4b999a94416d..ddf16ad41e55 100644
--- a/pkgs/development/libraries/haskell/syb/0.3.nix
+++ b/pkgs/development/libraries/haskell/syb/0.3.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix
index 7408d0ac5375..f6ca59529659 100644
--- a/pkgs/development/libraries/haskell/syb/0.4.0.nix
+++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
index 0cf40a87d417..2f3167ff6280 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate With Class Text instance";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index c6a85e27df15..81a5529e9cae 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Scrap Your Boilerplate With Class";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
index d82a19688782..2b91c145e8b0 100644
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ b/pkgs/development/libraries/haskell/symbol/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A 'Symbol' type for fast symbol comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index f61dedb7b8c5..1f78cd4c5115 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Consistent filesystem interaction across GHC versions";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index 851b28baafea..f845ca852669 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "High-level, byte-based file and directory path manipulations";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
index 32ede2f660b3..bde48cd3d5e0 100644
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ b/pkgs/development/libraries/haskell/tabular/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Two-dimensional data tables with rendering functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index e435671fe227..6c4c4d70cacd 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,13 +2,16 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.4.4";
-  sha256 = "0bc88q33pyz4sx429awhxmnjzvmsg7vwwsqi2w7yf8lrmz5ph08x";
+  version = "0.4.5";
+  sha256 = "1ipj7ff2ya3r3w39clcrxs766hm568lj2kb2kd3npg87jj05wgv0";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 3258267f0120..4fbea6c0cc20 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
index 1b290bd310ba..089593c5da34 100644
--- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "streamlined html tag parser";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
index 04257960a64c..4a10c2ff0410 100644
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ b/pkgs/development/libraries/haskell/tar/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Reading, writing and manipulating \".tar\" archive files.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
index df93cae198a0..f24b9e1b162f 100644
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ b/pkgs/development/libraries/haskell/temporary/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix
index 24221912025a..cb08aabfdeee 100644
--- a/pkgs/development/libraries/haskell/terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/terminfo/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings to the terminfo library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
index 011d791643cc..a4bbc52b1b64 100644
--- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "HUnit support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
index cabc0fe1d0a4..7133c9a144ea 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "QuickCheck support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index b944c1e104cc..ac70e3d2aff7 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "QuickCheck2 support for the test-framework package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
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 ebcd608eb6a6..e7d9ade6d401 100644
--- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Template Haskell for test framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
index f70e522a2ce4..31f293ac9e2f 100644
--- a/pkgs/development/libraries/haskell/test-framework-th/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
index b9f335e1a5af..fb9f4f7fd4ca 100644
--- a/pkgs/development/libraries/haskell/test-framework/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Framework for running and organising tests, with HUnit and QuickCheck support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 581cede2e879..a8b1c8090b10 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Conversion of LaTeX math formulas to MathML or OMML";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix
index 16115809f5b1..ba467ce6d134 100644
--- a/pkgs/development/libraries/haskell/text-icu/default.nix
+++ b/pkgs/development/libraries/haskell/text-icu/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to the ICU library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
index 59644d057201..e64be4197df3 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix
index 04fd250dfe9f..6bc6baf36ce4 100644
--- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix
index 71d0c28e48d7..41569875a9eb 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix
index 03c2d90ff8da..79804b49b2a1 100644
--- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix
index ab784807bfa2..a2a737b01990 100644
--- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix
index afa0e7eb5d3d..9bdf7fc97caa 100644
--- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix
+++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "An efficient packed Unicode text type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix
index 3475ccb804a0..e8df62c6190f 100644
--- a/pkgs/development/libraries/haskell/th-extras/default.nix
+++ b/pkgs/development/libraries/haskell/th-extras/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A grab bag of functions for use with Template Haskell";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index b8a118b56a65..aa7b5224de61 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Derive Template Haskell's Lift class for datatypes";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index da14adfe339b..6b6a971bf688 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Orphan instances for TH datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix
index aa848e4aa087..d4108f0a012e 100644
--- a/pkgs/development/libraries/haskell/thespian/default.nix
+++ b/pkgs/development/libraries/haskell/thespian/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Lightweight Erlang-style actors for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
index dc058844247d..4517a5f45126 100644
--- a/pkgs/development/libraries/haskell/threadmanager/default.nix
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Simple thread management";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
index d802790da9d7..ad02cca08de6 100644
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ b/pkgs/development/libraries/haskell/threads/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "Fork threads and wait for their result";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix
index fa7c3ff41855..50535015a215 100644
--- a/pkgs/development/libraries/haskell/time-compat/default.nix
+++ b/pkgs/development/libraries/haskell/time-compat/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Compatibility with old-time for the time package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
index 56072676b67b..7ced3956a8a3 100644
--- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix
+++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.0.2.nix
index 62232d1aa5a7..2c6f0ae55947 100644
--- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix
+++ b/pkgs/development/libraries/haskell/time/1.4.0.2.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A time library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index c9ab989ed76d..163852c312ec 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "TLS extra default values and helpers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 72e0976ceaff..c900975e8740 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "TLS/SSL protocol native implementation (Server and Client)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
index e323905f81b6..951458eb4eb1 100644
--- a/pkgs/development/libraries/haskell/transformers-base/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-base/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Lift computations from the bottom of a transformer stack";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index d36ace0eb299..0eb34b9444c4 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -2,14 +2,15 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-compat";
-  version = "0.1";
-  sha256 = "100xw00h2l6iipg6lq5bbncpil3bl6w3frak99klpi8gn6ihd8ah";
+  version = "0.1.1.1";
+  sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij";
   buildDepends = [ transformers ];
   noHaddock = true;
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "Lenses, Folds and Traversals";
+    description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
index 6d2e374687fc..f38605c17ad3 100644
--- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Concrete functor and monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
index ec1b85248d9c..50675d901ec0 100644
--- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Concrete functor and monad transformers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix
index 90441f31867c..fa06558fc0dd 100644
--- a/pkgs/development/libraries/haskell/tuple/default.nix
+++ b/pkgs/development/libraries/haskell/tuple/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Various functions on tuples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix
index 2cc98f00bb56..979fdc57a3be 100644
--- a/pkgs/development/libraries/haskell/type-equality/default.nix
+++ b/pkgs/development/libraries/haskell/type-equality/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Type equality, coercion/cast and other operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
index 8dff0ffd58fc..80af1951f586 100644
--- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
+++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Simple, Haskell 2010-compatible type level natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index a90381202e1a..1db17d844e75 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generic support for programming with names and binders";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
index ccccf9d95d38..ea4e66a95fae 100644
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Unbounded thread delays and timeouts";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix
index 8519ff451b2e..a5fef1484ff6 100644
--- a/pkgs/development/libraries/haskell/uniplate/default.nix
+++ b/pkgs/development/libraries/haskell/uniplate/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Help writing simple, concise and fast generic operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix
index 399ac02e3ce2..d717bd27871a 100644
--- a/pkgs/development/libraries/haskell/uniqueid/default.nix
+++ b/pkgs/development/libraries/haskell/uniqueid/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Splittable Unique Identifier Supply";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index 582764204818..35097601783a 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -2,13 +2,16 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-compat";
-  version = "0.4.1.0";
-  sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi";
+  version = "0.4.1.1";
+  sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf";
   meta = {
     homepage = "http://github.com/jystic/unix-compat";
     description = "Portable POSIX-compatibility layer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
new file mode 100644
index 000000000000..6ee4304ac174
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -0,0 +1,15 @@
+{ cabal, conduit, hspec, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "unix-process-conduit";
+  version = "0.2.0.2";
+  sha256 = "1n9ja7dlxhsxyglfzk397xdgvdny766y1isrb5d065srxprsj2g6";
+  buildDepends = [ conduit transformers ];
+  testDepends = [ conduit hspec transformers ];
+  meta = {
+    homepage = "https://github.com/snoyberg/conduit";
+    description = "Run processes on Unix systems, with a conduit interface";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index ddb24e46f4de..3d3fbdeca45c 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -2,12 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.1.5";
-  sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg";
+  version = "0.1.6";
+  sha256 = "0l8k42n67qwc1ljxw2ksmdnj630q1ql0im0j1z7yv9kak9pmqfy6";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
index 474bb1a8b092..2344e4606932 100644
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Unlambda interpreter";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix
index 288e559ce980..4c3fbbc2e52b 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/default.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Efficient hashing-based container types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
index 5353895815d9..e4726ef011d6 100644
--- a/pkgs/development/libraries/haskell/url/default.nix
+++ b/pkgs/development/libraries/haskell/url/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "A library for working with URLs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
index 05bd2ab09bbd..bb2ec05db0bc 100644
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ b/pkgs/development/libraries/haskell/urlencoded/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Generate or process x-www-urlencoded data";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix
index 42591158cd7c..59ebfe3b5e6f 100644
--- a/pkgs/development/libraries/haskell/utf8-light/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-light/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "Unicode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index e627c77bda2b..0928ae0347b1 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Support for reading and writing UTF8 Strings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index c921b4198ed2..49d1af13977e 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index d9477f4233da..31c504139bbe 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,14 +2,17 @@
 
 cabal.mkDerivation (self: {
   pname = "uu-parsinglib";
-  version = "2.7.4.2";
-  sha256 = "10ddm6x9km3lzs9ahqpsl9krvslsn9glimwzq4hspgsp6izd1dmq";
+  version = "2.7.4.3";
+  sha256 = "0q907gfxia7i63wc1p0zfmp102f5xpanhrq5pa259mp1nwqq6lyg";
   buildDepends = [ ListLike time ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
     description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix
index ed7e23f6c219..b8c72a4251e9 100644
--- a/pkgs/development/libraries/haskell/uuid/default.nix
+++ b/pkgs/development/libraries/haskell/uuid/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuid";
-  version = "1.2.9";
-  sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi";
+  version = "1.2.10";
+  sha256 = "17njmmh190pg9bpb8iaw2kniyn7z7j70mzdmxr9h29kydl1xmky6";
   buildDepends = [ binary cryptohash maccatcher random time ];
   testDepends = [
     criterion deepseq HUnit mersenneRandomPure64 QuickCheck random
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 2521c44bec6e..9b1660404ee2 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Haskell Utrecht Tools Library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
index 5ab1d4f85464..ccabd8cc7fa2 100644
--- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 8506e5805022..8be1ffee5287 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Graph representation of the GHC heap";
     license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 6039e7424772..6aed9be5799c 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "a persistent store for values of arbitrary types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix
index a1cd2783931f..1b34c7b55782 100644
--- a/pkgs/development/libraries/haskell/vcs-revision/default.nix
+++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "Facilities for accessing the version control revision of the current directory";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix
index 2d81a0131766..636ea7d0259b 100644
--- a/pkgs/development/libraries/haskell/vect/default.nix
+++ b/pkgs/development/libraries/haskell/vect/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A low-dimensional linear algebra library, tailored to computer graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index dc8c9dd35bae..d933d7e009f5 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient algorithms for vector arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
index 1debf3f0f713..37a131a32443 100644
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -2,12 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space-points";
-  version = "0.1.2.0";
-  sha256 = "19azl6g14rsxs0qbik6x637qw9jv4xl01w65xd0xh7833mypmj6d";
+  version = "0.1.2.1";
+  sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66";
   buildDepends = [ newtype vectorSpace ];
   meta = {
     description = "A type for points, as distinct from vectors";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index c6d440a5d471..7d59f7874aa0 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Vector & affine spaces, linear maps, and derivatives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
index 7acc89d6a91c..66173051e8ab 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/0.10.nix b/pkgs/development/libraries/haskell/vector/0.10.nix
index 8fac71eed4b3..9d9fd8c71caf 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix
index 63add64226d6..c5c06fe93e5c 100644
--- a/pkgs/development/libraries/haskell/vector/0.9.1.nix
+++ b/pkgs/development/libraries/haskell/vector/0.9.1.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Efficient Arrays";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 91b641c5f9ac..59220ee3c1ce 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -1,15 +1,18 @@
-{ cabal, semigroups }:
+{ cabal, hashable, semigroups }:
 
 cabal.mkDerivation (self: {
   pname = "void";
-  version = "0.5.12";
-  sha256 = "03fqcap94saj7mx3y4pvvfj4z8dy6rsk2kvhgbnk2wvz5xm7xvci";
-  buildDepends = [ semigroups ];
+  version = "0.6";
+  sha256 = "0g1dja7qcp2d9a4m8j1f4ddyvbl003znyk7yn5w5qiiqr1pacs1n";
+  buildDepends = [ hashable semigroups ];
   meta = {
     homepage = "http://github.com/ekmett/void";
     description = "A Haskell 98 logically uninhabited data type";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index 5d0c9ffd91a8..aac778973be2 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -11,10 +11,12 @@ cabal.mkDerivation (self: {
   buildDepends = [
     filepath mtl QuickCheck random regexBase stm text time vector vty
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://jtdaugherty.github.com/vty-ui/";
     description = "An interactive terminal user interface library for Vty";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 3121399b3a90..e2b223df58b5 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "A simple terminal UI library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 7feed2df4bc4..10e9073dcf34 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "WAI application for static serving";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 7e331d69da09..ec1bd1d3b683 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.3.1";
-  sha256 = "0ss58s5m8yp326q0651znifbfl6kpimyhm479wx8r3zx3ndl47q9";
+  version = "1.3.3.2";
+  sha256 = "0kw1v68a8dxpxg87r2vjah6n5906mw6cnyy2xx0jbk95qx5g5z8y";
   buildDepends = [
     ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
     conduit dataDefault dateCache fastLogger httpTypes network
@@ -24,6 +24,9 @@ cabal.mkDerivation (self: {
     description = "Provides some basic WAI handlers and middleware";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index 16f02f877462..a6c534937bab 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A logging system for WAI";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 9995cd6b9770..388c238944c9 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -1,19 +1,21 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, cookie, httpTypes, HUnit, text, transformers, wai
+, conduit, cookie, httpTypes, HUnit, network, text, transformers
+, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.0.4";
-  sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0";
+  version = "1.3.0.5";
+  sha256 = "0v0x1sk7q36xy8syinc96y1jsyjvw6756cich4hxq86l2jfbgccw";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
-    httpTypes HUnit text transformers wai
+    httpTypes HUnit network text transformers wai
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/web-application-interface";
     description = "Unit test framework (built on HUnit) for WAI applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index deb1090dd4ab..7594474c0719 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Web Application Interface";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index d924d4f38b07..043a9a925bf0 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.7.4";
-  sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx";
+  version = "1.3.8";
+  sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpTypes liftedBase network networkConduit simpleSendfile
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     description = "A fast, light-weight web server for WAI applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
index 77670b4f117e..93f151dcabfb 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A free monad based on the Wadler/Leijen pretty printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
index d2bd35eebd41..57baeee387c5 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
@@ -14,5 +14,6 @@ cabal.mkDerivation (self: {
     description = "A color pretty printer with terminfo support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
index 083f269255a0..d13768d5e220 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "A Wadler/Leijen Pretty Printer for Text values";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix
index 9849d4fab0e5..5cfea69b266d 100644
--- a/pkgs/development/libraries/haskell/wl-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint/default.nix
@@ -8,5 +8,6 @@ cabal.mkDerivation (self: {
     description = "The Wadler/Leijen Pretty Printer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix
index e8abded24381..0b63bed127fa 100644
--- a/pkgs/development/libraries/haskell/word8/default.nix
+++ b/pkgs/development/libraries/haskell/word8/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Word8 library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index dc030f68059a..44bb4f411a27 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "wxHaskell";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index 98032d91c8e4..a8186f517eab 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "wxHaskell core";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index a1caaef1bc9e..7ad6a04c01ce 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "helper tool for building wxHaskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix
index 3a12faf07c9e..a62b52242f79 100644
--- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix
+++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "A basic implementation of the XDG Base Directory specification";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index d1702862f422..2875861676ad 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -5,10 +5,14 @@ cabal.mkDerivation (self: {
   version = "0.2.3";
   sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy";
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
+  jailbreak = true;
   meta = {
     description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
index 605339d0811f..3c369103486a 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
index 3a72cb8fba0b..33527b9affd4 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
index 05e13b4a7b33..c5a374eb2d0c 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
index 66196c806acc..2078c317123f 100644
--- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
+++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "An XHTML combinator library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index b586a6336bca..a1192955540b 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
     description = "Pure-Haskell utilities for dealing with XML with the conduit package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
index 9c85223d654b..bc6b7b2537ff 100644
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
     description = "Hamlet-style quasiquoter for XML content";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix
index 48bd32b7c897..d123a4db7329 100644
--- a/pkgs/development/libraries/haskell/xml-types/default.nix
+++ b/pkgs/development/libraries/haskell/xml-types/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Basic types for representing XML";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index dc2e7dc70bd4..126ab9b1f087 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -2,14 +2,17 @@
 
 cabal.mkDerivation (self: {
   pname = "xml";
-  version = "1.3.12";
-  sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai";
+  version = "1.3.13";
+  sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
   buildDepends = [ text ];
   meta = {
     homepage = "http://code.galois.com";
     description = "A simple XML library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index 66c1f645267a..d550e4725908 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "XML parser and renderer with HTML 5 quirks mode";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
index 89bdab65b17d..b21caa38afb3 100644
--- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix
+++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "sanitize untrusted HTML to prevent XSS attacks";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 2c2f39451e6b..8a3beafb8e47 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
     description = "Support for parsing and rendering YAML documents";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index ab162988c958..62dc82b10685 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
     description = "yet another prelude - a simplistic refactoring with algebraic classes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 8456aa39a8eb..61fa603530f6 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.1.5.3";
-  sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82";
+  version = "1.1.6";
+  sha256 = "0g6ik3qvjnpyfbr2fciz53l62q44zi7ipil8v7hy56808n5y6i4i";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
     httpConduit httpTypes liftedBase mimeMail network persistent
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Authentication for Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index a25916316de8..8f9a9ed1a71a 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.1.8.2";
-  sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz";
+  version = "1.1.8.3";
+  sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr";
   buildDepends = [
     aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
     clientsession conduit cookie failure fastLogger hamlet httpTypes
@@ -23,11 +23,15 @@ cabal.mkDerivation (self: {
     blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random
     shakespeareCss shakespeareJs text transformers wai waiTest
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index b0e720ff4879..8fac7f9e2b87 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Default config and main functions for your yesod application";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index adf11916b90d..6719fa20a934 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     description = "Form handling support for Yesod Web Framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index b395645557b5..3506ca89f15a 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Generate content for Yesod using the aeson package";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index e69bc2a51275..bb4b686c4566 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Some helpers for using Persistent from Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 0ebfeb92bf10..ee68874cbfcd 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Efficient routing for Yesod";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index a7e90de2990a..59c2167dc5e1 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -22,6 +22,9 @@ cabal.mkDerivation (self: {
     description = "Static file serving subsite for Yesod Web Framework";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index 8b32b48af873..27f700932eb5 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
     description = "integration testing for WAI/Yesod Applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 9998790ea739..1a956f84ca9b 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -32,6 +32,9 @@ cabal.mkDerivation (self: {
     description = "Creation of type-safe, RESTful web applications";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index d194b1970c8d..157eaeaaa2c4 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "Builds a static website from templates and data in YAML or CSV files";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
index 20d414ac6b14..030cbe13b0a0 100644
--- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "Bindings to ZeroMQ 2.1.x";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 82dae54839ff..9d92f264930e 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to ZeroMQ 3.x";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index 38290c8cd544..53ebf3709d82 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Library for creating and modifying zip archives";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
index 5ff1da422efa..0995ec4d0c42 100644
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ b/pkgs/development/libraries/haskell/zipper/default.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Generic zipper for families of recursive datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index f69be8ae99e2..97d829119082 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Low-level bindings to the zlib package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index b283c496a299..bb67c04489cb 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Streaming compression/decompression via conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index f799194c0f69..e6c118ff3e1f 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Enumerator interface for zlib compression";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
index 28f109e8c364..60f81e7f9846 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
index 6a917af1fe7a..5ec59a9690f3 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
index f13b9f7b1d48..f4355c0a9549 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
index bba9e1a13fe4..2835605529e0 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
index abeed295e035..4d1166db2501 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
index c1fa7d78d0a9..3f6c85f1cd6e 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Compression and decompression in the gzip and zlib formats";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 83f88e1819f9..27c3e9f66f33 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation (rec {
-  name = "libffi-3.0.9";
+  name = "libffi-3.0.13";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
-    sha256 = "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq";
+    sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index bffc72e005cb..c13af5354299 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
   # will actually use.
   configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ];
 
+  crossAttrs = {
+    # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
+    dontStrip = true;
+    dontCrossStrip = true;
+  };
+
   meta = {
     description = "GNU libiconv, an iconv(3) implementation";
 
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index d4c90ee33fbe..d08ae8ef72a9 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fixedPoint ? false }:
 
 stdenv.mkDerivation rec {
-  name = "libopus-1.0.1";
+  name = "libopus-1.0.2";
   
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz";
-    sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0";
+    url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
+    sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
   };
 
   configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index ce714fd59ffc..6a6b693cbbe0 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -3,14 +3,14 @@
 , libtasn1, ebtables, libgcrypt, yajl
 }:
 
-let version = "1.0.2"; in
+let version = "1.0.3"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0yf104r1377pg0kmx6sshmh8v5z0bdvv6266y5gbcn46yx92g34v";
+    sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn";
   };
 
   buildInputs =
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      substituteInPlace $out/etc/rc.d/init.d/libvirt-guests \
+      substituteInPlace $out/libexec/libvirt-guests.sh \
         --replace "$out/bin" "${gettext}/bin"
     '';
 
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index d3b7769754e9..ed56ffaff736 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libxml2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "libxslt-1.1.27";
 
   src = fetchurl {
@@ -22,4 +22,15 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
-}
+} // (if !stdenv.isFreeBSD then {} else {
+  buildInputs = [];
+
+  configureFlags = [
+    "--with-libxml-prefix=${libxml2}"
+    "--without-python"
+    "--without-crypto"
+    "--without-debug"
+    "--without-mem-debug"
+    "--without-debugger"
+  ];
+}))
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a3945d776566..d2cf15b81a8b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -2,7 +2,7 @@
 , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
 , libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false
 , python, libxml2Python, autoconf, automake, libtool, llvm, writeText
-, wayland }:
+, libffi, wayland }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   buildInputs = [
     autoconf automake libtool intltool expat libxml2Python udev llvm
     libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt
-    wayland
+    libffi wayland
   ];
 
   nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
new file mode 100644
index 000000000000..513b340e132a
--- /dev/null
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ocio-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.8.zip";
+    sha256 = "1l70bf40dz2znm9rh3r6xs9d6kp719y1djayb7dc89khfqqbx2di";
+  };
+
+  buildInputs = [ cmake unzip ];
+
+  meta = with stdenv.lib; {
+    homepage = http://opencolorio.org;
+    description = "A color management framework for visual effects and animation";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 09a36247348d..291ca560c03d 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
-, pkgconfig, gstreamer, xineLib, glib }:
+, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }:
 
 let v = "2.4.3"; in
 
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "16zmyr383x9ka81mp6h2s9hlfzd383njddf3x1rswkldjy2ykyzq";
   };
 
-  buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];
+  buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer
+    python27 python27Packages.numpy ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 5c9fedb7fc55..1d5a09613408 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,14 +1,19 @@
 {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.31";
+  name = "openldap-2.4.34";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
-    sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6";
+    sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza";
   };
 
-  buildInputs = [openssl cyrus_sasl db4 groff];
+  buildInputs = [ openssl cyrus_sasl db4 groff ];
+
+  configureFlags =
+    [ "--enable-overlays"
+    ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
+      ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
 
   dontPatchELF = 1; # !!!
 
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 6b79482c330e..243a792f6b9c 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -2,10 +2,10 @@
 openssl, libpng, lua5}:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.1";
+  name = "podofo-0.9.2";
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv";
+    sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
   };
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index e3fd2bc34ff4..431b87739783 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.2.2";
+  name = "libtirpc-0.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
+    sha256 = "0g4jd8da0kfxz5lv1x5v7f3mfxw53cck8g2zz4llrjmlj42flaag";
   };
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
new file mode 100644
index 000000000000..afb23e4de354
--- /dev/null
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }:
+
+let
+  version = "1.2.19";
+in
+stdenv.mkDerivation rec {
+  name = "xmlsec-${version}";
+
+  src = fetchurl {
+    url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
+    sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g";
+  };
+
+  buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.aleksey.com/xmlsec;
+    description = "XML Security Library in C based on libxml2";
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 3f8af65f3bd8..8b770ede0fc7 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -13,7 +13,8 @@ let
   androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; };
 in
 stdenv.mkDerivation {
-  inherit name src;
+  name = stdenv.lib.replaceChars [" "] [""] name;
+  inherit src;
   
   ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
 
@@ -39,6 +40,6 @@ stdenv.mkDerivation {
     mv bin/*-${if release then "release" else "debug"}.apk $out
     
     mkdir -p $out/nix-support
-    echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products
+    echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
   '';
 }
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 8fe9846c15af..0d35e6c3c2a6 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -110,13 +110,17 @@ stdenv.mkDerivation {
         if target == "android" then
           ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
         else if target == "iphone" && release then
-           "cp -av build/iphone/build/* $out"
+           ''
+             cp -av build/iphone/build/* $out
+             mkdir -p $out/nix-support
+             echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
+           ''
         else if target == "iphone" then ""
         else throw "Target: ${target} is not supported!"}
     
     ${if target == "android" then ''
         mkdir -p $out/nix-support
-        echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
+        echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
     '' else ""}
   '';
   
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index 535ec0992c13..ac6bbc7f282d 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -44,7 +44,8 @@ let
   deleteKeychain = "security delete-keychain $keychainName";
 in
 stdenv.mkDerivation {
-  inherit name src;
+  name = stdenv.lib.replaceChars [" "] [""] name;
+  inherit src;
   buildInputs = [ xcodewrapper ];
   buildPhase = ''
     ${stdenv.lib.optionalString release ''
@@ -79,11 +80,11 @@ stdenv.mkDerivation {
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''
         # Produce an IPA file
-        xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
+        xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa"
         
         # Add IPA to Hydra build products
         mkdir -p $out/nix-support
-        echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products
+        echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
       ''}
       
       # Delete our temp keychain
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 731664f99132..4f3c7defa488 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   /* On Darwin, there are 3 test failures that haven't been investigated
      yet.  */
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
 
   patches =
     [
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 35c340ae0f95..bf1a275046ec 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.0.0";
+  version = "2.1.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0malymlswxwgh8amkw37qjb8n34ylw3chgbdxgxkq34rkvhv60hb";
+    sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
   };
 
   jarsrc = fetchurl {
-    url = "https://leiningen.s3.amazonaws.com/downloads/leiningen-2.0.0-standalone.jar";
-    sha256 = "10jvk19mr5dcl5a9kzna9zslh77v3ixi8awhrhxi30dn1yj3r7ck";
+    url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
+    sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
   };
 
-  patches = ./lein_2.0.0.patch;
+  patches = ./lein_2.1.2.patch;
 
   inherit rlwrap clojure;
 
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.unix;
+    maintainer = with stdenv.lib.maintainers; [the-kenny];
   };
 }
diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch
index 23f6b6247764..23f6b6247764 100644
--- a/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch
+++ b/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 047da44a7937..4f2ef6df8498 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
-  name = "doxygen-1.8.1";
+  name = "doxygen-1.8.3.1";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "0qmprax8d5fwx6sc7x9l06ilh2ffgvm6xs0rh54k3v5q5879r7mg";
+    sha256 = "0m9bwxg9g2h5fp9as0l0rmibm9ing39nssfrn3608v0v21l9yx0c";
   };
 
   patches = [ ./tmake.patch ];
diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix
index cfda3b66704a..f65df4b5ad05 100644
--- a/pkgs/development/tools/documentation/haddock/2.10.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A documentation-generation tool for Haskell libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix
index 968efe2260b0..a294680607d2 100644
--- a/pkgs/development/tools/documentation/haddock/2.11.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A documentation-generation tool for Haskell libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix
index 12907a64d214..a618b546f00c 100644
--- a/pkgs/development/tools/documentation/haddock/2.12.0.nix
+++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A documentation-generation tool for Haskell libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix
index e53ab715992e..a932e6ce1e21 100644
--- a/pkgs/development/tools/documentation/haddock/2.13.1.nix
+++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
     description = "A documentation-generation tool for Haskell libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix
index 811ffd2855da..88c6e045e531 100644
--- a/pkgs/development/tools/documentation/haddock/2.4.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "A documentation-generation tool for Haskell libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix
index 8a57dd851c2d..c9e7b810866a 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.4.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "A documentation-generation tool for Haskell libraries";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
new file mode 100644
index 000000000000..f416a7a113e3
--- /dev/null
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "gnulib-0.0-7899-g34f8464";
+
+  src = fetchgit {
+    url = "http://git.savannah.gnu.org/r/gnulib.git";
+    rev = "34f84640cd015eee3d9aed3b1eddf6f361576890";
+    sha256 = "9267827d6b3f0eb97957eae7851afd4e5ac8aa714a83e3be52e7b660cc27851d";
+  };
+
+  buildPhase = ":";
+
+  installPhase = "mkdir -p $out; mv * $out/";
+
+  meta = {
+    homepage = "http://www.gnu.org/software/gnulib/";
+    description = "central location for code to be shared among GNU packages";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix
index d39544342b3a..94758e3eff4a 100644
--- a/pkgs/development/tools/haskell/BNFC-meta/default.nix
+++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index 88f5d0baee67..cd36d5f58e9c 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "the Haskell Refactorer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
index 17d191064816..78cb968ff050 100644
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Static code analysis using graph-theoretic techniques";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix
index 5bb298e739ad..4487715cdc51 100644
--- a/pkgs/development/tools/haskell/alex-meta/default.nix
+++ b/pkgs/development/tools/haskell/alex-meta/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Quasi-quoter for Alex lexers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
index 4676850fd938..c48a6d6a61db 100644
--- a/pkgs/development/tools/haskell/cabal-ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Set up ghci with options taken from a .cabal file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix
index 881328d875b6..3ec96e3fb2ae 100644
--- a/pkgs/development/tools/haskell/cabal2ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix
@@ -16,5 +16,6 @@ cabal.mkDerivation (self: {
     description = "A tool to generate .ghci file from .cabal";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 22dde229a2b9..31cbb94c7292 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.47";
-  sha256 = "1ba0ny610ibynwvzqnk5h2461sdkmza5jqrizqxvhp9wknn50fc6";
+  version = "1.48";
+  sha256 = "0175bprjisjzs0y1xga1xqcy5jx6xlbrvsw6095j12xvyrvzrggr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index a3d885c60084..f00708bb55f1 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
     description = "Quasi-quoter for Happy parsers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix
index d67fb302d31b..2e158abaf898 100644
--- a/pkgs/development/tools/haskell/haskdogs/default.nix
+++ b/pkgs/development/tools/haskell/haskdogs/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Generate ctags file for haskell project directory and it's deps";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
index f1e1f639e80d..d3c373ae4df7 100644
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index c914e9c82253..83dc4d72929e 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     description = "Source code suggestions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index 4443637def47..efbf48322b34 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Versatile logging framework";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
new file mode 100644
index 000000000000..f9d09abcc3fe
--- /dev/null
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -0,0 +1,28 @@
+{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit
+, dataDefault, filepath, hinotify, httpConduit, httpReverseProxy
+, httpTypes, mtl, network, networkConduit, networkConduitTls
+, random, regexTdfa, systemFileio, systemFilepath, tar, text, time
+, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic
+, yaml, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "keter";
+  version = "0.3.6.1";
+  sha256 = "0jww64q74kx5h69mnv9wgc4kx0nlb06r7lf651gjkai8mf9dkqf2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec blazeBuilder caseInsensitive conduit dataDefault
+    filepath hinotify httpConduit httpReverseProxy httpTypes mtl
+    network networkConduit networkConduitTls random regexTdfa
+    systemFileio systemFilepath tar text time transformers unixCompat
+    unixProcessConduit wai waiAppStatic yaml zlib
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "Web application deployment manager, focusing on Haskell web frameworks";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix
index 814c2774cb27..41b77e22b46c 100644
--- a/pkgs/development/tools/haskell/packunused/default.nix
+++ b/pkgs/development/tools/haskell/packunused/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Tool for detecting redundant Cabal package dependencies";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 4bd47b8decd4..8bcd07dc2afb 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -17,5 +17,6 @@ cabal.mkDerivation (self: {
     description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index 4928c40e1291..f2b3d9d17cf4 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
     description = "A graphical tool for profiling parallel Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index d95c8cea03f3..9025d5d97aa0 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "A tool for visualizing time series from log files";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
index d24d22f350ad..749fbb6978d9 100644
--- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix
+++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Attribute Grammar System of Universiteit Utrecht";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index ea981ad423b0..6de37716579b 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
     description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 4e3214ee1df0..0cf3904f6d4f 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.42.2";
-  sha256 = "1l7w3gimcx079giw5ri4qfr1xfi1wfj93v29r8hvs8q8a6ffjifn";
+  version = "0.9.42.3";
+  sha256 = "0rn0wqccg2v4akh3wj16s5y60fscdfjpvrpsmvbc2vfq2v33y53n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
     description = "Attribute Grammar System of Universiteit Utrecht";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 2e419f67eb05..3406c708851e 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     description = "A liberalised re-implementation of cpp, the C pre-processor";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix
index 0ae8b8c76c5f..f9246df9e567 100644
--- a/pkgs/development/tools/misc/cppi/default.nix
+++ b/pkgs/development/tools/misc/cppi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "cppi-1.16";
+  name = "cppi-1.18";
 
   src = fetchurl {
     url = "mirror://gnu/cppi/${name}.tar.xz";
-    sha256 = "16i4j80wam7p189xc9i2ijrcgjn684296rym6ja3nlqv8rv90lm8";
+    sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j";
   };
 
   doCheck = true;
diff --git a/pkgs/development/tools/misc/texinfo/5.1.nix b/pkgs/development/tools/misc/texinfo/5.1.nix
index 807a3388b4b5..cca368f619a6 100644
--- a/pkgs/development/tools/misc/texinfo/5.1.nix
+++ b/pkgs/development/tools/misc/texinfo/5.1.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses perl ];
 
+  preInstall = ''
+    installFlags="TEXMF=$out/texmf";
+    installTargets="install install-tex";
+  '';
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 0a0dd4e6fe22..c36d0004992a 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -27,13 +27,13 @@ let
       sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81";
     };
     opam = fetchurl {
-      url = "https://github.com/OCamlPro/opam/archive/0.9.5.zip";
-      sha256 = "2ec706330a3283b4d057abc562c6078351988d0ae98ad507fe51cae598b43afd";
+      url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip";
+      sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda";
     };
   };
 in
 stdenv.mkDerivation rec {
-  name = "opam-0.9.5";
+  name = "opam-1.0.0";
 
   buildInputs = [unzip curl ncurses ocaml];
 
diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix
index 7dc17cd4153a..92db61e08a20 100644
--- a/pkgs/development/tools/parsing/alex/2.3.1.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.1.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix
index 5d10dbd69951..2ec395d463f2 100644
--- a/pkgs/development/tools/parsing/alex/2.3.2.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.2.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix
index bbe413d478ff..920c5fd9cc28 100644
--- a/pkgs/development/tools/parsing/alex/2.3.3.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.3.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix
index 3fb843e69557..3635b2487877 100644
--- a/pkgs/development/tools/parsing/alex/2.3.5.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.5.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix
index cdcaead86356..a32de50e61eb 100644
--- a/pkgs/development/tools/parsing/alex/3.0.1.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.1.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix
index 9011db12c7dd..85087bfc9a47 100644
--- a/pkgs/development/tools/parsing/alex/3.0.2.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.2.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
     description = "Alex is a tool for generating lexical analysers in Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix
index d342d3381c82..52c4775267c2 100644
--- a/pkgs/development/tools/parsing/happy/1.18.10.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.10.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Happy is a parser generator for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix
index 401c4d1475ce..cc5c60a3d43b 100644
--- a/pkgs/development/tools/parsing/happy/1.18.4.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.4.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Happy is a parser generator for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix
index d64d8983e9cb..41532651c995 100644
--- a/pkgs/development/tools/parsing/happy/1.18.5.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.5.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Happy is a parser generator for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix
index fdc483fe5714..60b8d253659e 100644
--- a/pkgs/development/tools/parsing/happy/1.18.6.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.6.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Happy is a parser generator for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
index decc992809a2..b1ba0b165dd7 100644
--- a/pkgs/development/tools/parsing/happy/1.18.8.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.8.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Happy is a parser generator for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix
index b1f752ae35f5..cb47eaa8bdb2 100644
--- a/pkgs/development/tools/parsing/happy/1.18.9.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.9.nix
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
     description = "Happy is a parser generator for Haskell";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/web/plone/default.nix b/pkgs/development/web/plone/default.nix
index b53254d29686..bd2b8063ea87 100644
--- a/pkgs/development/web/plone/default.nix
+++ b/pkgs/development/web/plone/default.nix
@@ -1,10151 +1,5701 @@
+# DO NOT EDIT THIS FILE!
+#
+# Nix expressions autogenerated with:
+#   bin/pypi2nix-nplone43rc1Packages-dPlone-dmailinglogger-dzc.recipe.egg-dplone.recipe.zope2instance-dPillow-isetuptools-eplone/43rc1.json-pplone/43rc1.txt-oplone/43rc1.nix
 
-{ pkgs, python, buildPythonPackage }:
+{ pkgs, python, pythonPackages }:
 
-let plone42Packages = python.modules // rec {
+let plone43rc1Packages = python.modules // rec {
   inherit python;
+  inherit (pythonPackages) setuptools buildPythonPackage;
   inherit (pkgs) fetchurl stdenv;
 
-
-
-  accesscontrol = buildPythonPackage rec {
-    name = "AccessControl-2.13.11";
-
+  plone_app_portlets = buildPythonPackage rec {
+    name = "plone.app.portlets-2.4.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/AccessControl/${name}.zip";
-      md5 = "7e622d99fb17914b4708d26f245cb696";
+      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.2.zip";
+      md5 = "712f14bb916d63e53fc06c76c02986dc";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  acquisition = buildPythonPackage rec {
-    name = "Acquisition-2.13.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/A/Acquisition/${name}.zip";
-      md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  archetypes_kss = buildPythonPackage rec {
-    name = "archetypes.kss-1.7.2";
-
+  zope2 = buildPythonPackage rec {
+    name = "Zope2-2.13.19";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.kss/${name}.zip";
-      md5 = "a8502140123b74f1b7ed4f36d3e56ff3";
+      url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.19.zip";
+      md5 = "26fee311aace7c12e406543ea91eb42a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  archetypes_querywidget = buildPythonPackage rec {
-    name = "archetypes.querywidget-1.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/${name}.zip";
-      md5 = "cbe134f2806191fd35066bbb7c85bfcc";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  archetypes_referencebrowserwidget = buildPythonPackage rec {
-    name = "archetypes.referencebrowserwidget-2.4.16";
-
+  products_btreefolder2 = buildPythonPackage rec {
+    name = "Products.BTreeFolder2-2.13.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/${name}.zip";
-      md5 = "7dd3b0d4e188828701a291449c7495f4";
+      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
+      md5 = "f57c85673036af7ccd34c3fa251f6bb2";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  archetypes_schemaextender = buildPythonPackage rec {
-    name = "archetypes.schemaextender-2.1.2";
-
+  products_pythonscripts = buildPythonPackage rec {
+    name = "Products.PythonScripts-2.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/${name}.zip";
-      md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
+      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
+      md5 = "04c86f2c45a29a162297a80dac61d14f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  argparse = buildPythonPackage rec {
-    name = "argparse-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip";
-      md5 = "087399b73047fa5a6482037411ddc968";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  borg_localrole = buildPythonPackage rec {
-    name = "borg.localrole-3.0.2";
-
+  zopeundo = buildPythonPackage rec {
+    name = "ZopeUndo-2.12.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/borg.localrole/${name}.zip";
-      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
+      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
+      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  buildout_dumppickedversions = buildPythonPackage rec {
-    name = "buildout.dumppickedversions-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/b/buildout.dumppickedversions/${name}.tar.gz";
-      md5 = "e81cffff329aaaaf8dd0d1c6bd63c8b0";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  clientform = buildPythonPackage rec {
-    name = "ClientForm-0.2.10";
-
+  datetime = buildPythonPackage rec {
+    name = "DateTime-3.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/C/ClientForm/${name}.zip";
-      md5 = "33826886848f89c67a5c8a30b931bd97";
+      url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.2.zip";
+      md5 = "d2dce6ce3b8d93bc65713e40b5d89ae0";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface pytz ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_monkeypatcher = buildPythonPackage rec {
-    name = "collective.monkeypatcher-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/${name}.zip";
-      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  collective_recipe_omelette = buildPythonPackage rec {
-    name = "collective.recipe.omelette-0.15";
-
+  plone_session = buildPythonPackage rec {
+    name = "plone.session-3.5.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.recipe.omelette/${name}.zip";
-      md5 = "088bcf60754bead215573ce114207939";
+      url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
+      md5 = "f95872454735abc8f27c3dcbc9434c11";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_testcaselayer = buildPythonPackage rec {
-    name = "collective.testcaselayer-1.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.testcaselayer/${name}.zip";
-      md5 = "fd8387d6b6ebd8645ec92f5f1e512450";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  collective_xmltestreport = buildPythonPackage rec {
-    name = "collective.xmltestreport-1.2.2";
-
+  zope_container = buildPythonPackage rec {
+    name = "zope.container-3.11.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.xmltestreport/${name}.tar.gz";
-      md5 = "f247d47a019b44694660d785f70c05b3";
+      url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
+      md5 = "fc66d85a17b8ffb701091c9328983dcc";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  collective_z3cform_datagridfield = buildPythonPackage rec {
-    name = "collective.z3cform.datagridfield-0.11";
-
+  plone_folder = buildPythonPackage rec {
+    name = "plone.folder-1.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/${name}.zip";
-      md5 = "c9210337b91305314864da42c12d04c2";
+      url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip";
+      md5 = "1674ff18b7a9452d0c2063cf11c679b7";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_component zope_interface plone_memoize zope_container setuptools zope_annotation ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  collective_z3cform_datagridfield_demo = buildPythonPackage rec {
-    name = "collective.z3cform.datagridfield-demo-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/collective.z3cform.datagridfield-0.11.zip";
-      md5 = "c9210337b91305314864da42c12d04c2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  collective_z3cform_datetimewidget = buildPythonPackage rec {
-    name = "collective.z3cform.datetimewidget-1.2.2";
-
+  products_plonepas = buildPythonPackage rec {
+    name = "Products.PlonePAS-4.1.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/${name}.zip";
-      md5 = "89daf27c7f0f235f9c001f0ee50d76e5";
+      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip";
+      md5 = "32db1808c3ad42e82542b65eb95c3c71";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  coverage = buildPythonPackage rec {
-    name = "coverage-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
-      md5 = "28c43d41b13f8987ea14d7b1d4a4e3ec";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  datetime = buildPythonPackage rec {
-    name = "DateTime-2.12.7";
-
+  plone_app_locales = buildPythonPackage rec {
+    name = "plone.app.locales-4.2.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DateTime/${name}.zip";
-      md5 = "72a8bcf80b52211ae7fdfe36c693d70c";
+      url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.2.5.zip";
+      md5 = "baf48a0a5278a18fa1c2848d3470464f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  diazo = buildPythonPackage rec {
-    name = "diazo-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/diazo/${name}.zip";
-      md5 = "d3c2b017af521db4c86fb360c86e0bc8";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  documenttemplate = buildPythonPackage rec {
-    name = "DocumentTemplate-2.13.2";
-
+  zope_sequencesort = buildPythonPackage rec {
+    name = "zope.sequencesort-3.4.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/${name}.zip";
-      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
+      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
+      md5 = "cfc35fc426a47f5c0ee43c416224b864";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  docutils = buildPythonPackage rec {
-    name = "docutils-0.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/d/docutils/${name}.1.tar.gz";
-      md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  elementtree = buildPythonPackage rec {
-    name = "elementtree-1.2.7-20070827-preview";
-
+  products_genericsetup = buildPythonPackage rec {
+    name = "Products.GenericSetup-1.7.3";
     src = fetchurl {
-      url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip";
-      md5 = "30e2fe5edd143f347e03a8baf5d60f8a";
+      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz";
+      md5 = "c48967c81c880ed33ee16a14caab3b11";
     };
-
-    buildInputs = [ pkgs.unzip ];
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  experimental_cssselect = buildPythonPackage rec {
-    name = "experimental.cssselect-0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/experimental.cssselect/${name}.zip";
-      md5 = "3fecdcf1fbc3ea6025e115a56a262957";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  extensionclass = buildPythonPackage rec {
-    name = "ExtensionClass-2.13.2";
-
+  plone_theme = buildPythonPackage rec {
+    name = "plone.theme-2.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/E/ExtensionClass/${name}.zip";
-      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
+      url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
+      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  feedparser = buildPythonPackage rec {
-    name = "feedparser-5.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.bz2";
-      md5 = "702835de74bd4a578524f311e62c2877";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  five_customerize = buildPythonPackage rec {
-    name = "five.customerize-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.customerize/${name}.zip";
-      md5 = "32f597c2fa961f7dcc84b23e655d928e";
-    };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_formlib = buildPythonPackage rec {
-    name = "five.formlib-1.0.4";
-
+  zope_tal = buildPythonPackage rec {
+    name = "zope.tal-3.5.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.formlib/${name}.zip";
-      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
+      url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
+      md5 = "13869f292ba36b294736b7330b1396fd";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_globalrequest = buildPythonPackage rec {
-    name = "five.globalrequest-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.globalrequest/${name}.tar.gz";
-      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  five_grok = buildPythonPackage rec {
-    name = "five.grok-1.2.0";
-
+  plone_cachepurging = buildPythonPackage rec {
+    name = "plone.cachepurging-1.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.grok/${name}.zip";
-      md5 = "b99c3017f3a487dc2a8b7b0b310ee8cf";
+      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip";
+      md5 = "886814ac4deef0f1ed99a2eb60864264";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  five_intid = buildPythonPackage rec {
-    name = "five.intid-1.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.intid/${name}.zip";
-      md5 = "60c6726c07a1c1bf557aeec0ddcee369";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  five_localsitemanager = buildPythonPackage rec {
-    name = "five.localsitemanager-2.0.5";
-
+  plone_protect = buildPythonPackage rec {
+    name = "plone.protect-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/${name}.zip";
-      md5 = "5e3a658e6068832bd802018ebc83f2d4";
+      url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
+      md5 = "74925ffb08782e72f9b1e850fa78fffa";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_annotation = buildPythonPackage rec {
-    name = "grokcore.annotation-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.annotation/${name}.tar.gz";
-      md5 = "a28ccb4b7c86198923d9cce40953314f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  grokcore_component = buildPythonPackage rec {
-    name = "grokcore.component-1.9";
-
+  products_portaltransforms = buildPythonPackage rec {
+    name = "Products.PortalTransforms-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.component/${name}.tar.gz";
-      md5 = "24b05b6b132787dbca18acd244c23ffb";
+      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip";
+      md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_formlib = buildPythonPackage rec {
-    name = "grokcore.formlib-1.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.formlib/${name}.tar.gz";
-      md5 = "dced4aba77053ed78a358a1f5e85d9c4";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  grokcore_security = buildPythonPackage rec {
-    name = "grokcore.security-1.2";
-
+  plone_memoize = buildPythonPackage rec {
+    name = "plone.memoize-1.1.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.security/${name}.tar.gz";
-      md5 = "1e668b7e423814fa069c69f2a4014876";
+      url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
+      md5 = "d07cd14b976160e1f26a859e3370147e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_site = buildPythonPackage rec {
-    name = "grokcore.site-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.site/${name}.tar.gz";
-      md5 = "bd16753e6d4f1c0ff38266d2ae79633d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  grokcore_view = buildPythonPackage rec {
-    name = "grokcore.view-1.13.5";
-
+  docutils = buildPythonPackage rec {
+    name = "docutils-0.9.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.view/${name}.tar.gz";
-      md5 = "304363398aa752d5e1479bab39b93e4e";
+      url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
+      md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  grokcore_viewlet = buildPythonPackage rec {
-    name = "grokcore.viewlet-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grokcore.viewlet/${name}.tar.gz";
-      md5 = "5e53b3c77941f9ad0ff2aeb7c1b6dd7d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  initgroups = buildPythonPackage rec {
-    name = "initgroups-2.13.0";
-
+  five_formlib = buildPythonPackage rec {
+    name = "five.formlib-1.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/i/initgroups/${name}.zip";
-      md5 = "38e842dcab8445f65e701fec75213acd";
+      url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
+      md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  jinja2 = buildPythonPackage rec {
-    name = "Jinja2-2.5.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
-      md5 = "83b20c1eeb31f49d8e6392efae91b7d5";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  kss_core = buildPythonPackage rec {
-    name = "kss.core-1.6.5";
-
+  zexceptions = buildPythonPackage rec {
+    name = "zExceptions-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/k/kss.core/${name}.zip";
-      md5 = "87e66e78c3bbd7af3ecce5b2fef935ae";
+      url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
+      md5 = "4c679696c959040d8e656ef85ae40136";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  mailinglogger = buildPythonPackage rec {
-    name = "mailinglogger-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mailinglogger/${name}.tar.gz";
-      md5 = "f865f0df6059ce23062b7457d01dbac5";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  manuel = buildPythonPackage rec {
-    name = "manuel-1.1.1";
-
+  products_cmfuid = buildPythonPackage rec {
+    name = "Products.CMFUid-2.2.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
-      md5 = "8cd560cf6e8720ecb129c4e5be605fbb";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
+      md5 = "e20727959351dffbf0bac80613eee110";
     };
-
-    # ignore dependencies
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  markdown = buildPythonPackage rec {
-    name = "Markdown-2.0.3";
-
+  restrictedpython = buildPythonPackage rec {
+    name = "RestrictedPython-3.6.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/${name}.zip";
-      md5 = "122418893e21e91109edbf6e082f830d";
+      url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
+      md5 = "aa75a7dcc7fbc966357837cc66cacec6";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  martian = buildPythonPackage rec {
-    name = "martian-0.11.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/martian/${name}.tar.gz";
-      md5 = "865646fcd9dd31613204d5f4c2db943b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  mechanize = buildPythonPackage rec {
-    name = "mechanize-0.2.5";
-
+  plone_app_theming = buildPythonPackage rec {
+    name = "plone.app.theming-1.1b2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mechanize/${name}.zip";
-      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
+      url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1b2.zip";
+      md5 = "0cefd88b1c810833c03762cba7bd194d";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfplone plone_subrequest repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml docutils roman plone_resource setuptools five_globalrequest diazo plone_resourceeditor ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  missing = buildPythonPackage rec {
-    name = "Missing-2.13.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Missing/${name}.zip";
-      md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  mocker = buildPythonPackage rec {
-    name = "mocker-1.1.1";
-
+  feedparser = buildPythonPackage rec {
+    name = "feedparser-5.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mocker/${name}.tar.bz2";
-      md5 = "0bd9f83268e16aef2130fa89e2a4839f";
+      url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip";
+      md5 = "cefffeba66b658d3cc7c1d66b92c6a1a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  mr_developer = buildPythonPackage rec {
-    name = "mr.developer-1.21";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mr.developer/${name}.zip";
-      md5 = "5f832f1709714b09cd7490603afd2365";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  multimapping = buildPythonPackage rec {
-    name = "MultiMapping-2.13.0";
-
+  zope_browser = buildPythonPackage rec {
+    name = "zope.browser-1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MultiMapping/${name}.zip";
-      md5 = "d69c5904c105b9f2f085d4103e0f0586";
+      url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
+      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  nose = buildPythonPackage rec {
-    name = "nose-1.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
-      md5 = "144f237b615e23f21f6a50b2183aa817";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  nt_svcutils = buildPythonPackage rec {
-    name = "nt-svcutils-2.13.0";
-
+  products_cmfdefault = buildPythonPackage rec {
+    name = "Products.CMFDefault-2.2.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose/nose-1.1.2.tar.gz";
-      md5 = "144f237b615e23f21f6a50b2183aa817";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
+      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  ordereddict = buildPythonPackage rec {
-    name = "ordereddict-1.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";
-      md5 = "a0ed854ee442051b249bfad0f638bbec";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  paste = buildPythonPackage rec {
-    name = "Paste-1.7.5.1";
-
+  python_dateutil = buildPythonPackage rec {
+    name = "python-dateutil-1.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Paste/${name}.tar.gz";
-      md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed";
+      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
+      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  pastedeploy = buildPythonPackage rec {
-    name = "PasteDeploy-1.3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PasteDeploy/${name}.tar.gz";
-      md5 = "eb4b3e2543d54401249c2cbd9f2d014f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  pastescript = buildPythonPackage rec {
-    name = "PasteScript-1.7.5";
-
+  zope_error = buildPythonPackage rec {
+    name = "zope.error-3.7.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PasteScript/${name}.tar.gz";
-      md5 = "4c72d78dcb6bb993f30536842c16af4d";
+      url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
+      md5 = "281445a906458ff5f18f56923699a127";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    propagatedBuildInputs = [ paste pastedeploy ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  persistence = buildPythonPackage rec {
-    name = "Persistence-2.13.2";
-
+  products_mimetools = buildPythonPackage rec {
+    name = "Products.MIMETools-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/${name}.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
+      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
+      md5 = "ad5372fc1190599a19493db0864448ec";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ documenttemplate setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  pil = buildPythonPackage rec {
-    name = "PIL-1.1.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone = buildPythonPackage rec {
-    name = "Plone-4.2.4";
-
+  zope_deprecation = buildPythonPackage rec {
+    name = "zope.deprecation-3.4.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Plone/${name}.zip";
-      md5 = "688438bd541e7cb2ab650c8c59282b85";
+      url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
+      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_alterego = buildPythonPackage rec {
-    name = "plone.alterego-1.0";
-
+  products_cmfplacefulworkflow = buildPythonPackage rec {
+    name = "Products.CMFPlacefulWorkflow-1.5.9";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.alterego/${name}.zip";
-      md5 = "b7b6dbcbba00505d98d5aba83e016408";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
+      md5 = "9041e1f52eab5b348c0dfa85be438722";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_blob = buildPythonPackage rec {
-    name = "plone.app.blob-1.5.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.blob/${name}.zip";
-      md5 = "8d6ba6f360b6bfd40f87914132339660";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_caching = buildPythonPackage rec {
-    name = "plone.app.caching-1.1.2";
-
+  unidecode = buildPythonPackage rec {
+    name = "Unidecode-0.04.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.caching/${name}.zip";
-      md5 = "83a52efeb7604d4c5b4afbc6c1365c6f";
+      url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
+      md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_collection = buildPythonPackage rec {
-    name = "plone.app.collection-1.0.7";
-
+  products_cmfcore = buildPythonPackage rec {
+    name = "Products.CMFCore-2.2.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.collection/${name}.zip";
-      md5 = "40c9035472e386fc9d0ec1b9a9a3d4f6";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
+      md5 = "9320a4023b8575097feacfd4a400e930";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_content = buildPythonPackage rec {
-    name = "plone.app.content-2.0.12";
-
+  five_localsitemanager = buildPythonPackage rec {
+    name = "five.localsitemanager-2.0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.content/${name}.zip";
-      md5 = "2f14a85fb66d73e0b699b839caaaad26";
+      url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
+      md5 = "5e3a658e6068832bd802018ebc83f2d4";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_contentlisting = buildPythonPackage rec {
-    name = "plone.app.contentlisting-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/${name}.zip";
-      md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_contentmenu = buildPythonPackage rec {
-    name = "plone.app.contentmenu-2.0.7";
-
+  zope_configuration = buildPythonPackage rec {
+    name = "zope.configuration-3.7.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/${name}.zip";
-      md5 = "b1c7e5a37c659ba30b3a077e149b1752";
+      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
+      md5 = "5b0271908ef26c05059eda76928896ea";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_contentrules = buildPythonPackage rec {
-    name = "plone.app.contentrules-2.1.9";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/${name}.zip";
-      md5 = "74d2fed9095a7c5f890b6f27de78dafc";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_controlpanel = buildPythonPackage rec {
-    name = "plone.app.controlpanel-2.2.11";
-
+  products_cmfcalendar = buildPythonPackage rec {
+    name = "Products.CMFCalendar-2.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/${name}.zip";
-      md5 = "401c8880865f398c281953f5837108b9";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
+      md5 = "49458e68dc3b6826ea9a3576ac014419";
     };
-
-    # ignore dependencies
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_customerize = buildPythonPackage rec {
-    name = "plone.app.customerize-1.2.2";
-
+  products_extendedpathindex = buildPythonPackage rec {
+    name = "Products.ExtendedPathIndex-3.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/${name}.zip";
-      md5 = "6a3802c4e8fbd955597adc6a8298febf";
+      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
+      md5 = "00c048a4b103200bdcbda61fa22c66df";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ accesscontrol transaction zope2 setuptools zodb3 ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_dexterity = buildPythonPackage rec {
-    name = "plone.app.dexterity-1.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/${name}.zip";
-      md5 = "25ccd382f9e08cfdfe4a9b7e455030bc";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_discussion = buildPythonPackage rec {
-    name = "plone.app.discussion-2.1.8";
-
+  archetypes_schemaextender = buildPythonPackage rec {
+    name = "archetypes.schemaextender-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/${name}.zip";
-      md5 = "b0cb1fbdf8a7a238cf5a58fb10c24731";
+      url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip";
+      md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_uuid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_folder = buildPythonPackage rec {
-    name = "plone.app.folder-1.0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.folder/${name}.zip";
-      md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_form = buildPythonPackage rec {
-    name = "plone.app.form-2.1.2";
-
+  zconfig = buildPythonPackage rec {
+    name = "ZConfig-2.9.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.form/${name}.zip";
-      md5 = "8017f8f782d992825ed71d16b126c4e7";
+      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip";
+      md5 = "5c932690a70c8907efd240cdd76a7bc4";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_i18n = buildPythonPackage rec {
-    name = "plone.app.i18n-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/${name}.zip";
-      md5 = "a10026573463dfc1899bf4062cebdbf2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_imaging = buildPythonPackage rec {
-    name = "plone.app.imaging-1.0.6";
-
+  plone_app_contentmenu = buildPythonPackage rec {
+    name = "plone.app.contentmenu-2.0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/${name}.zip";
-      md5 = "8d494cd69b3f6be7fcb9e21c20277765";
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip";
+      md5 = "8ba463f1a164c454c70d26507e5bd22a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher products_cmfdynamicviewfti zope_browsermenu zope_interface plone_memoize plone_app_content zope_component acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_intid = buildPythonPackage rec {
-    name = "plone.app.intid-1.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.intid/${name}.tar.gz";
-      md5 = "863077002bd272ff11c47de0f7f9db1a";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_iterate = buildPythonPackage rec {
-    name = "plone.app.iterate-2.1.9";
-
+  products_pluginregistry = buildPythonPackage rec {
+    name = "Products.PluginRegistry-1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/${name}.zip";
-      md5 = "db598cfc0986737145ddc7e6b70a1794";
+      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
+      md5 = "5b166193ca1eb84dfb402051f779ebab";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope2 products_genericsetup setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_jquery = buildPythonPackage rec {
-    name = "plone.app.jquery-1.4.4";
-
+  plone_alterego = buildPythonPackage rec {
+    name = "plone.alterego-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/${name}.zip";
-      md5 = "a12d56f3dfd2ba6840bf21a6bd860b90";
+      url = "http://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
+      md5 = "b7b6dbcbba00505d98d5aba83e016408";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_jquerytools = buildPythonPackage rec {
-    name = "plone.app.jquerytools-1.3.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/${name}.zip";
-      md5 = "326470a34e07aa98c40d75ec22484572";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_kss = buildPythonPackage rec {
-    name = "plone.app.kss-1.7.1";
-
+  plone_outputfilters = buildPythonPackage rec {
+    name = "plone.outputfilters-1.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.kss/${name}.zip";
-      md5 = "97a35086fecfe25e55b65042eb35e796";
+      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.8.zip";
+      md5 = "a5ef28580f7fa7f2dc1768893995b0f7";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_layout = buildPythonPackage rec {
-    name = "plone.app.layout-2.2.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.layout/${name}.zip";
-      md5 = "90ea408f5e01aeb01517d55eb6b6063a";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_linkintegrity = buildPythonPackage rec {
-    name = "plone.app.linkintegrity-1.5.0";
-
+  zope_publisher = buildPythonPackage rec {
+    name = "zope.publisher-3.12.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/${name}.zip";
-      md5 = "41810cc85ca05921a329aac5bc4cf403";
+      url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
+      md5 = "495131970cc7cb14de8e517fb3857ade";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_locales = buildPythonPackage rec {
-    name = "plone.app.locales-4.2.5";
-
+  zope_security = buildPythonPackage rec {
+    name = "zope.security-3.7.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.locales/${name}.zip";
-      md5 = "baf48a0a5278a18fa1c2848d3470464f";
+      url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
+      md5 = "072ab8d11adc083eace11262da08630c";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_lockingbehavior = buildPythonPackage rec {
-    name = "plone.app.lockingbehavior-1.0.1";
-
+  zdaemon = buildPythonPackage rec {
+    name = "zdaemon-2.0.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.lockingbehavior/${name}.tar.gz";
-      md5 = "a25745f1f40c6298da1b228ccd95ee27";
+      url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
+      md5 = "291a875f82e812110557eb6704af8afe";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zconfig ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_openid = buildPythonPackage rec {
-    name = "plone.app.openid-2.0.2";
-
+  zope_annotation = buildPythonPackage rec {
+    name = "zope.annotation-3.5.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.openid/${name}.tar.gz";
-      md5 = "ae0748f91cab0612a498926d405d8edd";
+      url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
+      md5 = "4238153279d3f30ab5613438c8e76380";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_portlets = buildPythonPackage rec {
-    name = "plone.app.portlets-2.3.7";
-
+  repoze_xmliter = buildPythonPackage rec {
+    name = "repoze.xmliter-0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.portlets/${name}.zip";
-      md5 = "534be67a7a17a71ca1e76f6f149ff2ac";
+      url = "http://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
+      md5 = "99da76bcbad6fbaced4a273bde29b10e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ lxml setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_querystring = buildPythonPackage rec {
-    name = "plone.app.querystring-1.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.querystring/${name}.zip";
-      md5 = "b501910b23def9b58e8309d1e469eb6f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_redirector = buildPythonPackage rec {
-    name = "plone.app.redirector-1.1.3";
-
+  plone_app_form = buildPythonPackage rec {
+    name = "plone.app.form-2.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/${name}.zip";
-      md5 = "7d441340a83b8ed72a03bc16148a5f21";
+      url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip";
+      md5 = "6101e6a5bd4de6cc8cdef09ced2743eb";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_site plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_lifecycleevent zope_formlib zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_referenceablebehavior = buildPythonPackage rec {
-    name = "plone.app.referenceablebehavior-0.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.referenceablebehavior/${name}.zip";
-      md5 = "2359140966f753204d5091bb49fce85c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_registry = buildPythonPackage rec {
-    name = "plone.app.registry-1.1";
-
+  zope_structuredtext = buildPythonPackage rec {
+    name = "zope.structuredtext-3.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.registry/${name}.zip";
-      md5 = "0fdbb01e9ff71108f1be262c39b41b81";
+      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
+      md5 = "eabbfb983485d0879322bc878d2478a0";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_relationfield = buildPythonPackage rec {
-    name = "plone.app.relationfield-1.2.0";
-
+  zodb3 = buildPythonPackage rec {
+    name = "ZODB3-3.10.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.relationfield/${name}.zip";
-      md5 = "d19888741677cd457ac7f22dde97ded0";
+      url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
+      md5 = "6f180c6897a1820948fee2a6290503cd";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_search = buildPythonPackage rec {
-    name = "plone.app.search-1.0.7";
-
+  plone_batching = buildPythonPackage rec {
+    name = "plone.batching-1.0b1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.search/${name}.zip";
-      md5 = "bd5a1f4b5016a6d0a8697e7a9cc04833";
+      url = "http://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0b1.zip";
+      md5 = "813a7d2d89fedf4f8e90e0c8da949c48";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_stagingbehavior = buildPythonPackage rec {
-    name = "plone.app.stagingbehavior-0.1b4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.stagingbehavior/${name}.zip";
-      md5 = "0f9589ec056c303ea0c81a804dd411eb";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_testing = buildPythonPackage rec {
-    name = "plone.app.testing-4.2.1";
-
+  documenttemplate = buildPythonPackage rec {
+    name = "DocumentTemplate-2.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.testing/${name}.zip";
-      md5 = "1a40df72c8beda9520b83dc449a97a3c";
+      url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
+      md5 = "07bb086c77c1dfe94125ad2efbba94b7";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_textfield = buildPythonPackage rec {
-    name = "plone.app.textfield-1.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.textfield/${name}.zip";
-      md5 = "f832887a40826d6f68c48b48f071fb9c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_theming = buildPythonPackage rec {
-    name = "plone.app.theming-1.0.4";
-
+  plone_app_search = buildPythonPackage rec {
+    name = "plone.app.search-1.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.theming/${name}.zip";
-      md5 = "2da6d810e0d5f295dd0daa2b60731a1b";
+      url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.3.zip";
+      md5 = "396677c3fba762077360ed97b14071e6";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_app_contentlisting setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_upgrade = buildPythonPackage rec {
-    name = "plone.app.upgrade-1.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/${name}.zip";
-      md5 = "2798dd50863d8c25624400b988a0acdd";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_users = buildPythonPackage rec {
-    name = "plone.app.users-1.1.5";
-
+  diazo = buildPythonPackage rec {
+    name = "diazo-1.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.users/${name}.zip";
-      md5 = "97895d8dbdf885784be1afbf5b8b364c";
+      url = "http://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip";
+      md5 = "d3c2b017af521db4c86fb360c86e0bc8";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ lxml experimental_cssselect setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_uuid = buildPythonPackage rec {
-    name = "plone.app.uuid-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/${name}.zip";
-      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_versioningbehavior = buildPythonPackage rec {
-    name = "plone.app.versioningbehavior-1.1";
-
+  zope_globalrequest = buildPythonPackage rec {
+    name = "zope.globalrequest-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.versioningbehavior/${name}.zip";
-      md5 = "6c153e3fa10b9ffea9742d0dad7b3b85";
+      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
+      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_viewletmanager = buildPythonPackage rec {
-    name = "plone.app.viewletmanager-2.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/${name}.zip";
-      md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_vocabularies = buildPythonPackage rec {
-    name = "plone.app.vocabularies-2.1.9";
-
+  plone_app_customerize = buildPythonPackage rec {
+    name = "plone.app.customerize-1.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/${name}.zip";
-      md5 = "34d4eb9c95879811fec0875aa3235ed3";
+      url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
+      md5 = "6a3802c4e8fbd955597adc6a8298febf";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_app_workflow = buildPythonPackage rec {
-    name = "plone.app.workflow-2.0.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/${name}.zip";
-      md5 = "350ea680ccf7eb9b1598927cafad4f38";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_app_z3cform = buildPythonPackage rec {
-    name = "plone.app.z3cform-0.6.2";
-
+  products_cmfdifftool = buildPythonPackage rec {
+    name = "Products.CMFDiffTool-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/${name}.zip";
-      md5 = "2e77f5e03d48a6fb2eb9994edb871917";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip";
+      md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_autoform = buildPythonPackage rec {
-    name = "plone.autoform-1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.autoform/${name}.zip";
-      md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_behavior = buildPythonPackage rec {
-    name = "plone.behavior-1.0.1";
-
+  zope_testbrowser = buildPythonPackage rec {
+    name = "zope.testbrowser-3.11.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.behavior/${name}.zip";
-      md5 = "a18feb9ec744b2a64028c366a8835d59";
+      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
+      md5 = "64abbee892121e7f1a91aed12cfc155a";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_browserlayer = buildPythonPackage rec {
-    name = "plone.browserlayer-2.1.2";
-
+  products_contentmigration = buildPythonPackage rec {
+    name = "Products.contentmigration-2.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/${name}.zip";
-      md5 = "bce02f4907a4f29314090c525e5fc28e";
+      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.3.zip";
+      md5 = "e15b9777593157f060b50638b0253be1";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_cachepurging = buildPythonPackage rec {
-    name = "plone.cachepurging-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.cachepurging/${name}.zip";
-      md5 = "886814ac4deef0f1ed99a2eb60864264";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_caching = buildPythonPackage rec {
-    name = "plone.caching-1.0";
-
+  plone_intelligenttext = buildPythonPackage rec {
+    name = "plone.intelligenttext-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.caching/${name}.zip";
-      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
+      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
+      md5 = "51688fa0815b49e00334e3ef948328ba";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_contentrules = buildPythonPackage rec {
-    name = "plone.contentrules-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.contentrules/${name}.zip";
-      md5 = "a32370656c4fd58652fcd8a234db69c5";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_dexterity = buildPythonPackage rec {
-    name = "plone.dexterity-1.1.2";
-
+  plonetheme_classic = buildPythonPackage rec {
+    name = "plonetheme.classic-1.3.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.dexterity/${name}.zip";
-      md5 = "c8f495e368ada3a4566d99995d09e64c";
+      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.1.zip";
+      md5 = "8f78a3e79dce692a568c5fbc58ba742a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_directives_dexterity = buildPythonPackage rec {
-    name = "plone.directives.dexterity-1.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.directives.dexterity/${name}.zip";
-      md5 = "713b87644e3591b60b4a8ebd52987477";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_directives_form = buildPythonPackage rec {
-    name = "plone.directives.form-1.0";
-
+  zope_authentication = buildPythonPackage rec {
+    name = "zope.authentication-3.7.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.directives.form/${name}.zip";
-      md5 = "e40a4b3fdde3768a137a450374934565";
+      url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
+      md5 = "7d6bb340610518f2fc71213cfeccda68";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_fieldsets = buildPythonPackage rec {
-    name = "plone.fieldsets-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/${name}.zip";
-      md5 = "4158c8a1f784fcb5cecbd63deda7222f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_folder = buildPythonPackage rec {
-    name = "plone.folder-1.0.4";
-
+  zope_i18n = buildPythonPackage rec {
+    name = "zope.i18n-3.7.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.folder/${name}.zip";
-      md5 = "1674ff18b7a9452d0c2063cf11c679b7";
+      url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
+      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_formwidget_autocomplete = buildPythonPackage rec {
-    name = "plone.formwidget.autocomplete-1.2.4";
-
+  zope_componentvocabulary = buildPythonPackage rec {
+    name = "zope.componentvocabulary-1.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.autocomplete/${name}.zip";
-      md5 = "06b3bfed9ea51fe2e93827f539fc7f07";
+      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
+      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_formwidget_contenttree = buildPythonPackage rec {
-    name = "plone.formwidget.contenttree-1.0.6";
-
+  products_ofsp = buildPythonPackage rec {
+    name = "Products.OFSP-2.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.contenttree/${name}.zip";
-      md5 = "2ea222d53ca856de7c6df831707f4ac1";
+      url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
+      md5 = "c76d40928753c2ee56db873304e65bd5";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ accesscontrol persistence setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_formwidget_namedfile = buildPythonPackage rec {
-    name = "plone.formwidget.namedfile-1.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/${name}.zip";
-      md5 = "9274db2f5d7b4d07748fabfd125e49d0";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_i18n = buildPythonPackage rec {
-    name = "plone.i18n-2.0.5";
-
+  zope_datetime = buildPythonPackage rec {
+    name = "zope.datetime-3.4.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.i18n/${name}.zip";
-      md5 = "ef36aa9a294d507abb37787f9f7700bd";
+      url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
+      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_indexer = buildPythonPackage rec {
-    name = "plone.indexer-1.0.2";
-
+  experimental_cssselect = buildPythonPackage rec {
+    name = "experimental.cssselect-0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.indexer/${name}.zip";
-      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+      url = "http://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
+      md5 = "3fecdcf1fbc3ea6025e115a56a262957";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ lxml setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_intelligenttext = buildPythonPackage rec {
-    name = "plone.intelligenttext-2.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/${name}.zip";
-      md5 = "51688fa0815b49e00334e3ef948328ba";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_keyring = buildPythonPackage rec {
-    name = "plone.keyring-2.0.1";
-
+  products_passwordresettool = buildPythonPackage rec {
+    name = "Products.PasswordResetTool-2.0.12";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.keyring/${name}.zip";
-      md5 = "f3970e9bddb2cc65e461a2c62879233f";
+      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.12.zip";
+      md5 = "db87c166732a5800f25e33f27a23b7b4";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_locking = buildPythonPackage rec {
-    name = "plone.locking-2.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.locking/${name}.zip";
-      md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_memoize = buildPythonPackage rec {
-    name = "plone.memoize-1.1.1";
-
+  plone_app_jquerytools = buildPythonPackage rec {
+    name = "plone.app.jquerytools-1.5.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.memoize/${name}.zip";
-      md5 = "d07cd14b976160e1f26a859e3370147e";
+      url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.4.zip";
+      md5 = "fcc0c48d49deb211d5aadf4e12d3c1a0";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_mocktestcase = buildPythonPackage rec {
-    name = "plone.mocktestcase-1.0b3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.mocktestcase/${name}.tar.gz";
-      md5 = "6de66da6d610537d1f5c31e2ab0f36ee";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_namedfile = buildPythonPackage rec {
-    name = "plone.namedfile-1.0.6";
-
+  products_validation = buildPythonPackage rec {
+    name = "Products.validation-2.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.namedfile/${name}.zip";
-      md5 = "06f5bfa7079f889307ac5760e4cb4a7b";
+      url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
+      md5 = "afa217e2306637d1dccbebf337caa8bf";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_openid = buildPythonPackage rec {
-    name = "plone.openid-2.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.openid/${name}.zip";
-      md5 = "d4c36926a6dbefed035ed92c29329ce1";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_outputfilters = buildPythonPackage rec {
-    name = "plone.outputfilters-1.8";
-
+  plone_registry = buildPythonPackage rec {
+    name = "plone.registry-1.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.outputfilters/${name}.zip";
-      md5 = "a5ef28580f7fa7f2dc1768893995b0f7";
+      url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
+      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_portlet_collection = buildPythonPackage rec {
-    name = "plone.portlet.collection-2.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/${name}.zip";
-      md5 = "5f0006dbb3e0b56870383dfdedc49228";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   plone_portlet_static = buildPythonPackage rec {
     name = "plone.portlet.static-2.0.2";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/${name}.zip";
+      url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
       md5 = "ec0dc691b4191a41ff97779b117f9985";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_portlets = buildPythonPackage rec {
-    name = "plone.portlets-2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.portlets/${name}.zip";
-      md5 = "12b9a33f787756a48617c2d2dd63c538";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_protect = buildPythonPackage rec {
-    name = "plone.protect-2.0.2";
-
+  zope_viewlet = buildPythonPackage rec {
+    name = "zope.viewlet-3.7.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.protect/${name}.zip";
-      md5 = "74925ffb08782e72f9b1e850fa78fffa";
+      url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
+      md5 = "367e03096df57e2f9b74fff43f7901f9";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_recipe_alltests = buildPythonPackage rec {
-    name = "plone.recipe.alltests-1.2";
-
+  plone_portlet_collection = buildPythonPackage rec {
+    name = "plone.portlet.collection-2.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.alltests/${name}.zip";
-      md5 = "c4ba0f67a2fdd259bd0e7d946bd35674";
+      url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.3.zip";
+      md5 = "5f0006dbb3e0b56870383dfdedc49228";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_recipe_zeoserver = buildPythonPackage rec {
-    name = "plone.recipe.zeoserver-1.2.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.recipe.zeoserver/${name}.zip";
-      md5 = "cd58899a7d534fe2d0ef42990a07c499";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_registry = buildPythonPackage rec {
-    name = "plone.registry-1.0.1";
-
+  plone_app_users = buildPythonPackage rec {
+    name = "plone.app.users-1.2a2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.registry/${name}.zip";
-      md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
+      url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip";
+      md5 = "a96e42e34d97162363cb3bbc8483d2ba";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_reload = buildPythonPackage rec {
-    name = "plone.reload-2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.reload/${name}.zip";
-      md5 = "49eab593c81b78a9b80d54786aa4ad72";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_resource = buildPythonPackage rec {
-    name = "plone.resource-1.0.2";
-
+  plone_app_querystring = buildPythonPackage rec {
+    name = "plone.app.querystring-1.0.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.resource/${name}.zip";
-      md5 = "594d41e3acd913ae92f2e9ef96503b9f";
+      url = "http://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.7.zip";
+      md5 = "b501910b23def9b58e8309d1e469eb6f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_i18n zope_publisher setuptools zope_globalrequest plone_app_vocabularies zope_dottedname plone_app_layout datetime plone_registry zope_component plone_app_contentlisting zope_interface zope_schema plone_app_registry products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_rfc822 = buildPythonPackage rec {
-    name = "plone.rfc822-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.rfc822/${name}.zip";
-      md5 = "b5b79bb5a9181da624a7e88940a45424";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_scale = buildPythonPackage rec {
-    name = "plone.scale-1.2.2";
-
+  zope_i18nmessageid = buildPythonPackage rec {
+    name = "zope.i18nmessageid-3.5.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.scale/${name}.zip";
-      md5 = "7c59522b4806ee24f5e0a5fa69c523a5";
+      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
+      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_schemaeditor = buildPythonPackage rec {
-    name = "plone.schemaeditor-1.2.1";
-
+  plone_app_folder = buildPythonPackage rec {
+    name = "plone.app.folder-1.0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/${name}.zip";
-      md5 = "0b0fb4b20d9463b3fef82c2079a897d7";
+      url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip";
+      md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_folder setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_session = buildPythonPackage rec {
-    name = "plone.session-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.session/${name}.zip";
-      md5 = "2f9d3b88e813a47135af56a4da8bbde1";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_stringinterp = buildPythonPackage rec {
-    name = "plone.stringinterp-1.0.7";
-
+  products_zcatalog = buildPythonPackage rec {
+    name = "Products.ZCatalog-2.13.23";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/${name}.zip";
-      md5 = "81909716210c6ac3fd0ee87f45ea523d";
+      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
+      md5 = "d425171516dfc70e543a4e2b852301cb";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_subrequest = buildPythonPackage rec {
-    name = "plone.subrequest-1.6.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.subrequest/${name}.zip";
-      md5 = "cc12f68a22565415b10dbeef0020baa4";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_supermodel = buildPythonPackage rec {
-    name = "plone.supermodel-1.1.4";
-
+  python_openid = buildPythonPackage rec {
+    name = "python-openid-2.2.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.supermodel/${name}.zip";
-      md5 = "00b3d723bb1a48116fe3bf8754f17085";
+      url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip";
+      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_synchronize = buildPythonPackage rec {
-    name = "plone.synchronize-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.synchronize/${name}.zip";
-      md5 = "d25e86ace8daa0816861296c3288c4fb";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_testing = buildPythonPackage rec {
-    name = "plone.testing-4.0.7";
-
+  z3c_autoinclude = buildPythonPackage rec {
+    name = "z3c.autoinclude-0.3.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.testing/${name}.zip";
-      md5 = "fa40f6d3e3e254409c486c1c2c3e8804";
+      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
+      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_theme = buildPythonPackage rec {
-    name = "plone.theme-2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.theme/${name}.zip";
-      md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plone_transformchain = buildPythonPackage rec {
-    name = "plone.transformchain-1.0.3";
-
+  zope_processlifetime = buildPythonPackage rec {
+    name = "zope.processlifetime-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.transformchain/${name}.zip";
-      md5 = "f5fb7ca894249e3e666501c4fae52a6c";
+      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
+      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   plone_uuid = buildPythonPackage rec {
     name = "plone.uuid-1.0.3";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.uuid/${name}.zip";
+      url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
       md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plone_z3cform = buildPythonPackage rec {
-    name = "plone.z3cform-0.7.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plone.z3cform/${name}.zip";
-      md5 = "da891365156a5d5824d4e504465886a2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  plonetheme_classic = buildPythonPackage rec {
-    name = "plonetheme.classic-1.2.5";
-
+  plone_dexterity = buildPythonPackage rec {
+    name = "plone.dexterity-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.classic/${name}.zip";
-      md5 = "9dc15871937f9cdf94cdfdb9be77a221";
+      url = "http://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.2.zip";
+      md5 = "3404947376be89f18e54bbfb5c0d3595";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize zope_dottedname zope_container zope_lifecycleevent plone_synchronize zope_annotation plone_autoform plone_behavior plone_folder zope_publisher products_cmfdefault zope_filerepresentation zope_browser plone_rfc822 zope_size plone_alterego products_statusmessages zope_schema zope2 zope_component zope_location zope_security plone_z3cform zodb3 plone_supermodel plone_uuid setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  plonetheme_sunburst = buildPythonPackage rec {
-    name = "plonetheme.sunburst-1.2.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/${name}.zip";
-      md5 = "be02660c869e04ac8cf6ade3559f2516";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_archetypes = buildPythonPackage rec {
-    name = "Products.Archetypes-1.8.6";
-
+  plone_synchronize = buildPythonPackage rec {
+    name = "plone.synchronize-1.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/${name}.zip";
-      md5 = "74be68879b27228c084a9be869132a98";
+      url = "http://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip";
+      md5 = "d25e86ace8daa0816861296c3288c4fb";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_atcontenttypes = buildPythonPackage rec {
-    name = "Products.ATContentTypes-2.1.11";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/${name}.zip";
-      md5 = "abfb5209ffa11dc2c1a15c488e75d89c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_atreferencebrowserwidget = buildPythonPackage rec {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-
+  zope_traversing = buildPythonPackage rec {
+    name = "zope.traversing-3.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/${name}.zip";
-      md5 = "157bdd32155c8353450c17c649aad042";
+      url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
+      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_btreefolder2 = buildPythonPackage rec {
-    name = "Products.BTreeFolder2-2.13.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/${name}.tar.gz";
-      md5 = "f57c85673036af7ccd34c3fa251f6bb2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfactionicons = buildPythonPackage rec {
-    name = "Products.CMFActionIcons-2.1.3";
-
+  python_gettext = buildPythonPackage rec {
+    name = "python-gettext-1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/${name}.tar.gz";
-      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
+      url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
+      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ unittest2 ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfcalendar = buildPythonPackage rec {
-    name = "Products.CMFCalendar-2.2.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/${name}.tar.gz";
-      md5 = "49458e68dc3b6826ea9a3576ac014419";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfcore = buildPythonPackage rec {
-    name = "Products.CMFCore-2.2.7";
-
+  products_securemailhost = buildPythonPackage rec {
+    name = "Products.SecureMailHost-1.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFCore/${name}.tar.gz";
-      md5 = "9320a4023b8575097feacfd4a400e930";
+      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
+      md5 = "7db0f1fa867bd0df972082f502a7a707";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfdefault = buildPythonPackage rec {
-    name = "Products.CMFDefault-2.2.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/${name}.tar.gz";
-      md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfdifftool = buildPythonPackage rec {
-    name = "Products.CMFDiffTool-2.0.1";
-
+  products_plonelanguagetool = buildPythonPackage rec {
+    name = "Products.PloneLanguageTool-3.2.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/${name}.zip";
-      md5 = "7b7ed9b8f7b4f438e92e299823f92c86";
+      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
+      md5 = "bd9eb6278bf76e8cbce99437ca362164";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfdynamicviewfti = buildPythonPackage rec {
-    name = "Products.CMFDynamicViewFTI-4.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/${name}.zip";
-      md5 = "7d39d416b41b2d93954bc73d9d0e077f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfeditions = buildPythonPackage rec {
-    name = "Products.CMFEditions-2.2.7";
-
+  eggtestinfo = buildPythonPackage rec {
+    name = "eggtestinfo-0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/${name}.zip";
-      md5 = "7dc744b3b896c1b212d9ba37b1752b65";
+      url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
+      md5 = "6f0507aee05f00c640c0d64b5073f840";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfformcontroller = buildPythonPackage rec {
-    name = "Products.CMFFormController-3.0.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/${name}.zip";
-      md5 = "6573df7dcb39e3b63ba22abe2acd639e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfplacefulworkflow = buildPythonPackage rec {
-    name = "Products.CMFPlacefulWorkflow-1.5.9";
-
+  mailinglogger = buildPythonPackage rec {
+    name = "mailinglogger-3.7.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/${name}.zip";
-      md5 = "9041e1f52eab5b348c0dfa85be438722";
+      url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
+      md5 = "f865f0df6059ce23062b7457d01dbac5";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfplone = buildPythonPackage rec {
-    name = "Products.CMFPlone-4.2.4";
-
+  missing = buildPythonPackage rec {
+    name = "Missing-2.13.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/${name}.zip";
-      md5 = "9c9663cb2b68c07e3d9a2fceaa97eaa1";
+      url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
+      md5 = "9823cff54444cbbcaef8fc45d8e42572";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ extensionclass ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmfquickinstallertool = buildPythonPackage rec {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/${name}.tar.gz";
-      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmftestcase = buildPythonPackage rec {
-    name = "Products.CMFTestCase-0.9.12";
-
+  zope_deferredimport = buildPythonPackage rec {
+    name = "zope.deferredimport-3.5.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/${name}.zip";
-      md5 = "fbfdfe7bdb2158419d9899b4ab8c43eb";
+      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
+      md5 = "68fce3bf4f011d4a840902fd763884ee";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_proxy setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_cmftopic = buildPythonPackage rec {
-    name = "Products.CMFTopic-2.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFTopic/${name}.tar.gz";
-      md5 = "4abeeaafe6b6b1d2f2936bf5431cccba";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_cmfuid = buildPythonPackage rec {
-    name = "Products.CMFUid-2.2.1";
-
+  zope_tales = buildPythonPackage rec {
+    name = "zope.tales-3.5.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.CMFUid/${name}.tar.gz";
-      md5 = "e20727959351dffbf0bac80613eee110";
+      url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz";
+      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools zope_tal ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_contentmigration = buildPythonPackage rec {
-    name = "Products.contentmigration-2.1.2";
-
+  products_zsqlmethods = buildPythonPackage rec {
+    name = "Products.ZSQLMethods-2.13.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.contentmigration/${name}.zip";
-      md5 = "1cef33faec03e655b7c52c317db50ed2";
+      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
+      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_dcworkflow = buildPythonPackage rec {
-    name = "Products.DCWorkflow-2.2.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/${name}.tar.gz";
-      md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    propagatedBuildInputs = [ eggtestinfo ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_extendedpathindex = buildPythonPackage rec {
-    name = "Products.ExtendedPathIndex-3.1";
-
+  products_statusmessages = buildPythonPackage rec {
+    name = "Products.statusmessages-4.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/${name}.zip";
-      md5 = "00c048a4b103200bdcbda61fa22c66df";
+      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
+      md5 = "265324b0a58a032dd0ed038103ed0473";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_externaleditor = buildPythonPackage rec {
-    name = "Products.ExternalEditor-1.1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/${name}.zip";
-      md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_externalmethod = buildPythonPackage rec {
-    name = "Products.ExternalMethod-2.13.0";
-
+  plone_i18n = buildPythonPackage rec {
+    name = "plone.i18n-2.0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/${name}.zip";
-      md5 = "15ba953ef6cb632eb571977651252ea6";
+      url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.5.zip";
+      md5 = "ef36aa9a294d507abb37787f9f7700bd";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_genericsetup = buildPythonPackage rec {
-    name = "Products.GenericSetup-1.7.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/${name}.tar.gz";
-      md5 = "c48967c81c880ed33ee16a14caab3b11";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_i18ntestcase = buildPythonPackage rec {
-    name = "Products.i18ntestcase-1.3";
-
+  archetypes_querywidget = buildPythonPackage rec {
+    name = "archetypes.querywidget-1.0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.i18ntestcase/${name}.zip";
-      md5 = "f72f72e573975f15adfabfeef34fd721";
+      url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip";
+      md5 = "3416b6b4948c624e1b5b8dd8d7e33f59";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_app_jquerytools plone_app_querystring setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_kupu = buildPythonPackage rec {
-    name = "Products.kupu-1.5.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.kupu/${name}.zip";
-      md5 = "b884fcc7f510426974d8d3c4333da4f4";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_mailhost = buildPythonPackage rec {
-    name = "Products.MailHost-2.13.1";
-
+  plone_transformchain = buildPythonPackage rec {
+    name = "plone.transformchain-1.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MailHost/${name}.zip";
-      md5 = "1102e523435d8bf78a15b9ddb57478e1";
+      url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
+      md5 = "f5fb7ca894249e3e666501c4fae52a6c";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_marshall = buildPythonPackage rec {
-    name = "Products.Marshall-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.Marshall/${name}.zip";
-      md5 = "bde4d7f75195c1ded8371554b04d2541";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_mimetools = buildPythonPackage rec {
-    name = "Products.MIMETools-2.13.0";
-
+  products_pluggableauthservice = buildPythonPackage rec {
+    name = "Products.PluggableAuthService-1.10.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MIMETools/${name}.zip";
-      md5 = "ad5372fc1190599a19493db0864448ec";
+      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
+      md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
-    buildInputs = [ pkgs.unzip ];
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_mimetypesregistry = buildPythonPackage rec {
-    name = "Products.MimetypesRegistry-2.0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/${name}.zip";
-      md5 = "898166bb2aaececc8238ad4ee4826793";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_ofsp = buildPythonPackage rec {
-    name = "Products.OFSP-2.13.2";
-
+  borg_localrole = buildPythonPackage rec {
+    name = "borg.localrole-3.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.OFSP/${name}.zip";
-      md5 = "c76d40928753c2ee56db873304e65bd5";
+      url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
+      md5 = "04082694dfda9ae5cda62747b8ac7ccf";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_passwordresettool = buildPythonPackage rec {
-    name = "Products.PasswordResetTool-2.0.11";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/${name}.zip";
-      md5 = "8dfd65f06c3f4a4b0742d1b44b65f014";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_placelesstranslationservice = buildPythonPackage rec {
-    name = "Products.PlacelessTranslationService-2.0.3";
-
+  archetypes_referencebrowserwidget = buildPythonPackage rec {
+    name = "archetypes.referencebrowserwidget-2.4.17";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/${name}.zip";
-      md5 = "a94635eb712563c5a002520713f5d6dc";
+      url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.17.zip";
+      md5 = "bb7552f5ccfddcd068649d7b8162020c";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_plonelanguagetool = buildPythonPackage rec {
-    name = "Products.PloneLanguageTool-3.2.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/${name}.zip";
-      md5 = "bd9eb6278bf76e8cbce99437ca362164";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_plonepas = buildPythonPackage rec {
-    name = "Products.PlonePAS-4.0.15";
-
+  five_globalrequest = buildPythonPackage rec {
+    name = "five.globalrequest-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/${name}.zip";
-      md5 = "c19241b558c994ff280a2e1f50aa1f19";
+      url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
+      md5 = "87f8996bd21d4aa156aa26e7d21b8744";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_plonetestcase = buildPythonPackage rec {
-    name = "Products.PloneTestCase-0.9.15";
-
+  plone_rfc822 = buildPythonPackage rec {
+    name = "plone.rfc822-1.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/${name}.zip";
-      md5 = "ddd5810937919ab5233ebd64893c8bae";
+      url = "http://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip";
+      md5 = "b5b79bb5a9181da624a7e88940a45424";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_schema zope_component python_dateutil setuptools zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_pluggableauthservice = buildPythonPackage rec {
-    name = "Products.PluggableAuthService-1.9.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/${name}.tar.gz";
-      md5 = "f78f16e46d016c2848bc84254fa66596";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_pluginregistry = buildPythonPackage rec {
-    name = "Products.PluginRegistry-1.3";
-
+  plonetheme_sunburst = buildPythonPackage rec {
+    name = "plonetheme.sunburst-1.4.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/${name}.tar.gz";
-      md5 = "5b166193ca1eb84dfb402051f779ebab";
+      url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.1.zip";
+      md5 = "e2008dae3dad458dd7bf3be10e95160b";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_portaltransforms = buildPythonPackage rec {
-    name = "Products.PortalTransforms-2.1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/${name}.zip";
-      md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_pythonscripts = buildPythonPackage rec {
-    name = "Products.PythonScripts-2.13.2";
-
+  plone_portlets = buildPythonPackage rec {
+    name = "plone.portlets-2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/${name}.zip";
-      md5 = "04c86f2c45a29a162297a80dac61d14f";
+      url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip";
+      md5 = "5b7e06bee6e40af83694b82e1fee8c2d";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_resourceregistries = buildPythonPackage rec {
-    name = "Products.ResourceRegistries-2.2.6";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/${name}.zip";
-      md5 = "9cf6efbcf2a6510033c06e1d3af94080";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_securemailhost = buildPythonPackage rec {
-    name = "Products.SecureMailHost-1.1.2";
-
+  zope_proxy = buildPythonPackage rec {
+    name = "zope.proxy-3.6.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/${name}.zip";
-      md5 = "7db0f1fa867bd0df972082f502a7a707";
+      url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
+      md5 = "a400b0a26624b17fa889dbcaa989d440";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_standardcachemanagers = buildPythonPackage rec {
-    name = "Products.StandardCacheManagers-2.13.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/${name}.zip";
-      md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_statusmessages = buildPythonPackage rec {
-    name = "Products.statusmessages-4.0";
-
+  products_archetypes = buildPythonPackage rec {
+    name = "Products.Archetypes-1.8.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.statusmessages/${name}.zip";
-      md5 = "265324b0a58a032dd0ed038103ed0473";
+      url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.6.zip";
+      md5 = "74be68879b27228c084a9be869132a98";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_tinymce = buildPythonPackage rec {
-    name = "Products.TinyMCE-1.2.15";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/${name}.zip";
-      md5 = "108b919bfcff711d2116e41eccbede58";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_validation = buildPythonPackage rec {
-    name = "Products.validation-2.0";
-
+  initgroups = buildPythonPackage rec {
+    name = "initgroups-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.validation/${name}.zip";
-      md5 = "afa217e2306637d1dccbebf337caa8bf";
+      url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
+      md5 = "38e842dcab8445f65e701fec75213acd";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_zcatalog = buildPythonPackage rec {
-    name = "Products.ZCatalog-2.13.23";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/${name}.zip";
-      md5 = "d425171516dfc70e543a4e2b852301cb";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_zctextindex = buildPythonPackage rec {
-    name = "Products.ZCTextIndex-2.13.4";
-
+  zope_schema = buildPythonPackage rec {
+    name = "zope.schema-4.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/${name}.zip";
-      md5 = "8bbfa5fcd3609246990a9314d6f826b4";
+      url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
+      md5 = "e7e581af8193551831560a736a53cf58";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  products_zopeversioncontrol = buildPythonPackage rec {
-    name = "Products.ZopeVersionControl-1.1.3";
-
+  plone_scale = buildPythonPackage rec {
+    name = "plone.scale-1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/${name}.zip";
-      md5 = "238239102f3ac798ee4f4c53343a561f";
+      url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.zip";
+      md5 = "2de525b3f436c851bce6e03f639d2d35";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  products_zsqlmethods = buildPythonPackage rec {
-    name = "Products.ZSQLMethods-2.13.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/${name}.zip";
-      md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  py = buildPythonPackage rec {
-    name = "py-1.3.4";
-
+  zope_copy = buildPythonPackage rec {
+    name = "zope.copy-3.5.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/py/${name}.tar.gz";
-      md5 = "b64d73a04121c1c4e27c7ec335ef87c8";
+      url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
+      md5 = "a9836a5d36cd548be45210eb00407337";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  pygments = buildPythonPackage rec {
-    name = "Pygments-1.3.1";
-
+  roman = buildPythonPackage rec {
+    name = "roman-1.4.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      md5 = "54be67c04834f13d7e255e1797d629a5";
+      url = "http://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
+      md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  python_dateutil = buildPythonPackage rec {
-    name = "python-dateutil-1.5";
-
+  zope_event = buildPythonPackage rec {
+    name = "zope.event-3.5.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/${name}.tar.gz";
-      md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
+      url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
+      md5 = "6e8af2a16157a74885d4f0d88137cefb";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  python_gettext = buildPythonPackage rec {
-    name = "python-gettext-1.2";
-
+  acquisition = buildPythonPackage rec {
+    name = "Acquisition-2.13.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-gettext/${name}.zip";
-      md5 = "cd4201d440126d1296d1d2bc2b4795f3";
+      url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
+      md5 = "8c33160c157b50649e2b2b3224622579";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface extensionclass ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  python_openid = buildPythonPackage rec {
-    name = "python-openid-2.2.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-openid/${name}.zip";
-      md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  pytz = buildPythonPackage rec {
-    name = "pytz-2012c";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.tar.gz";
-      md5 = "1aa85f072e3d34ae310665967a0ce053";
-    };
-
-    doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  record = buildPythonPackage rec {
-    name = "Record-2.13.0";
-
+  plone_resource = buildPythonPackage rec {
+    name = "plone.resource-1.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/Record/${name}.zip";
-      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
+      url = "http://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
+      md5 = "594d41e3acd913ae92f2e9ef96503b9f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ python_dateutil zope_filerepresentation zope2 zope_publisher z3c_caching zope_interface zope_traversing zope_configuration zope_component plone_caching setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  repoze_retry = buildPythonPackage rec {
-    name = "repoze.retry-1.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.retry/${name}.tar.gz";
-      md5 = "55f9dbde5d7f939d93c352fef0f2ce8b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  repoze_tm2 = buildPythonPackage rec {
-    name = "repoze.tm2-1.0";
-
+  plone_app_linkintegrity = buildPythonPackage rec {
+    name = "plone.app.linkintegrity-1.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.tm2/${name}.tar.gz";
-      md5 = "c645a878874c8876c9c6b3467246afbc";
+      url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.1.zip";
+      md5 = "89701634d59c3b1a6fc61e5a21c4de52";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  repoze_who = buildPythonPackage rec {
-    name = "repoze.who-2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.who/${name}.tar.gz";
-      md5 = "eab01991b6a2979678ce6015815262e2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  repoze_xmliter = buildPythonPackage rec {
-    name = "repoze.xmliter-0.5";
-
+  products_resourceregistries = buildPythonPackage rec {
+    name = "Products.ResourceRegistries-2.2.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.xmliter/${name}.zip";
-      md5 = "99da76bcbad6fbaced4a273bde29b10e";
+      url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.7.zip";
+      md5 = "954e31a168a1eb3153e2fd4e590bb9ba";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  restrictedpython = buildPythonPackage rec {
-    name = "RestrictedPython-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/R/RestrictedPython/${name}.zip";
-      md5 = "aa75a7dcc7fbc966357837cc66cacec6";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  roman = buildPythonPackage rec {
-    name = "roman-1.4.0";
-
+  plone_browserlayer = buildPythonPackage rec {
+    name = "plone.browserlayer-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/roman/${name}.tar.gz";
-      md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
+      url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip";
+      md5 = "bce02f4907a4f29314090c525e5fc28e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  rwproperty = buildPythonPackage rec {
-    name = "rwproperty-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/r/rwproperty/${name}.tar.gz";
-      md5 = "050bdf066492b3cd82a3399f8efea6b1";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  simplejson = buildPythonPackage rec {
-    name = "simplejson-2.5.2";
-
+  markdown = buildPythonPackage rec {
+    name = "Markdown-2.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
-      md5 = "d7a7acf0bd7681bd116b5c981d2f7959";
+      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip";
+      md5 = "122418893e21e91109edbf6e082f830d";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  sphinx = buildPythonPackage rec {
-    name = "Sphinx-1.1.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
-      md5 = "8f55a6d4f87fc6d528120c5d1f983e98";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  tempstorage = buildPythonPackage rec {
-    name = "tempstorage-2.12.2";
-
+  z3c_formwidget_query = buildPythonPackage rec {
+    name = "z3c.formwidget.query-0.9";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tempstorage/${name}.zip";
-      md5 = "7a2b76b39839e229249b1bb175604480";
+      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip";
+      md5 = "d9f7960b1a5a81d8ba5241530f496522";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid z3c_form zope_interface zope_component setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  tl_eggdeps = buildPythonPackage rec {
-    name = "tl.eggdeps-0.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tl.eggdeps/${name}.tar.gz";
-      md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  transaction = buildPythonPackage rec {
-    name = "transaction-1.1.1";
-
+  plone_app_z3cform = buildPythonPackage rec {
+    name = "plone.app.z3cform-0.7.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
-      md5 = "30b062baa34fe1521ad979fb088c8c55";
+      url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.2.zip";
+      md5 = "aa8d1d45f8072ccfbfe0a608cd7144b6";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 setuptools plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget zope_component zope_browserpage plone_protect zope_traversing ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  unidecode = buildPythonPackage rec {
-    name = "Unidecode-0.04.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/U/Unidecode/${name}2.tar.gz";
-      md5 = "351dc98f4512bdd2e93f7a6c498730eb";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  unittest2 = buildPythonPackage rec {
-    name = "unittest2-0.5.1";
-
+  plone_app_viewletmanager = buildPythonPackage rec {
+    name = "plone.app.viewletmanager-2.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz";
-      md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
+      url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip";
+      md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools plone_app_vocabularies zope_viewlet zope_contentprovider ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  webob = buildPythonPackage rec {
-    name = "WebOb-1.0.8";
-
+  plone_app_contentlisting = buildPythonPackage rec {
+    name = "plone.app.contentlisting-1.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebOb/${name}.zip";
-      md5 = "9809f9fb64fca8690a7da533fa29a272";
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip";
+      md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_uuid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  wicked = buildPythonPackage rec {
-    name = "wicked-1.1.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/w/wicked/${name}.zip";
-      md5 = "f65611f11d547d7dc8e623bf87d3929d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  wsgi_intercept = buildPythonPackage rec {
-    name = "wsgi-intercept-0.4";
-
+  zope_ramcache = buildPythonPackage rec {
+    name = "zope.ramcache-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
-      md5 = "f65611f11d547d7dc8e623bf87d3929d";
+      url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
+      md5 = "87289e15f0e51f50704adda1557c02a7";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_autoinclude = buildPythonPackage rec {
-    name = "z3c.autoinclude-0.3.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/${name}.zip";
-      md5 = "6a615ae18c12b459bceb3ae28e8e7709";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_batching = buildPythonPackage rec {
-    name = "z3c.batching-1.1.0";
-
+  plone_app_vocabularies = buildPythonPackage rec {
+    name = "plone.app.vocabularies-2.1.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.batching/${name}.tar.gz";
-      md5 = "d1dc834781d228127ca6d15301757863";
+      url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz";
+      md5 = "166a0d6f9a3e3cd753efa56aaef585be";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_site zope_formlib zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_blobfile = buildPythonPackage rec {
-    name = "z3c.blobfile-0.1.5";
-
+  plone_app_discussion = buildPythonPackage rec {
+    name = "plone.app.discussion-2.2.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.blobfile/${name}.zip";
-      md5 = "2e806640aa2f3b51e4578f35c44f567a";
+      url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.4.zip";
+      md5 = "e40ef3d26f024fc1555b30b52489b445";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_caching = buildPythonPackage rec {
-    name = "z3c.caching-2.0a1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.caching/${name}.tar.gz";
-      md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_checkversions = buildPythonPackage rec {
-    name = "z3c.checkversions-0.4.1";
-
+  zlog = buildPythonPackage rec {
+    name = "zLOG-2.11.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.checkversions/${name}.tar.gz";
-      md5 = "907f3a28aac04ad98fb3c4c5879a1eaf";
+      url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
+      md5 = "68073679aaa79ac5a7b6a5c025467147";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zconfig ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_coverage = buildPythonPackage rec {
-    name = "z3c.coverage-1.2.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.coverage/${name}.tar.gz";
-      md5 = "d7f323a6c89f848fab38209f2162294d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_form = buildPythonPackage rec {
-    name = "z3c.form-2.5.1";
-
+  zc_recipe_egg = buildPythonPackage rec {
+    name = "zc.recipe.egg-1.3.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.form/${name}.tar.gz";
-      md5 = "f029f83dd226f695f55049ed1ecee95e";
+      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz";
+      md5 = "1cb6af73f527490dde461d3614a36475";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zc_buildout setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_formwidget_query = buildPythonPackage rec {
-    name = "z3c.formwidget.query-0.9";
-
+  plone = buildPythonPackage rec {
+    name = "Plone-4.3rc1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/${name}.zip";
-      md5 = "d9f7960b1a5a81d8ba5241530f496522";
+      url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.3rc1.zip";
+      md5 = "21e4fafe5d608f44e759a1a0544aed72";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfplone plone_app_caching plone_app_dexterity plone_app_theming setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_objpath = buildPythonPackage rec {
-    name = "z3c.objpath-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.objpath/${name}.tar.gz";
-      md5 = "63641934441b255ebeeaeabc618f01ed";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_ptcompat = buildPythonPackage rec {
-    name = "z3c.ptcompat-1.0.1";
-
+  products_standardcachemanagers = buildPythonPackage rec {
+    name = "Products.StandardCacheManagers-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.ptcompat/${name}.tar.gz";
-      md5 = "bfe1ba6f9a38679705bd3eb5a5a2d7c4";
+      url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
+      md5 = "c5088b2b62bd26d63d9579a04369cb73";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_recipe_compattest = buildPythonPackage rec {
-    name = "z3c.recipe.compattest-0.12.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.recipe.compattest/${name}.tar.gz";
-      md5 = "ed5a1bde7ce384154721913846c736c7";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_recipe_depgraph = buildPythonPackage rec {
-    name = "z3c.recipe.depgraph-0.5";
-
+  plone_fieldsets = buildPythonPackage rec {
+    name = "plone.fieldsets-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.recipe.depgraph/${name}.zip";
-      md5 = "eb734419815146eb5b7080b5e17346dc";
+      url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
+      md5 = "4158c8a1f784fcb5cecbd63deda7222f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_recipe_sphinxdoc = buildPythonPackage rec {
-    name = "z3c.recipe.sphinxdoc-0.0.8";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.recipe.sphinxdoc/${name}.tar.gz";
-      md5 = "86e6965c919b43fa1de07588580f8790";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  z3c_relationfield = buildPythonPackage rec {
-    name = "z3c.relationfield-0.6.2";
-
+  collective_monkeypatcher = buildPythonPackage rec {
+    name = "collective.monkeypatcher-1.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.relationfield/${name}.zip";
-      md5 = "e34a6230cdfbd4a0bc1c90a77600e0e7";
+      url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
+      md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  z3c_template = buildPythonPackage rec {
-    name = "z3c.template-1.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.template/${name}.tar.gz";
-      md5 = "330e2dba8cd064d5790392afd9f460dd";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   z3c_zcmlhook = buildPythonPackage rec {
     name = "z3c.zcmlhook-1.0b1";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
       md5 = "7b6c80146f5930409eb0b355ddf3daeb";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_lockfile = buildPythonPackage rec {
-    name = "zc.lockfile-1.0.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz";
-      md5 = "6cf83766ef9935c33e240b0904c7a45e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zc_recipe_egg = buildPythonPackage rec {
-    name = "zc.recipe.egg-1.3.2";
-
+  plone_recipe_zope2instance = buildPythonPackage rec {
+    name = "plone.recipe.zope2instance-4.2.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/${name}.tar.gz";
-      md5 = "1cb6af73f527490dde461d3614a36475";
+      url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.10.zip";
+      md5 = "787fad7fa44757de74a50a91e9bcfcb5";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zc_recipe_testrunner = buildPythonPackage rec {
-    name = "zc.recipe.testrunner-1.2.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.recipe.testrunner/${name}.tar.gz";
-      md5 = "1be4a1518e5b94890634468118242850";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zc_relation = buildPythonPackage rec {
-    name = "zc.relation-1.0";
-
+  plone_supermodel = buildPythonPackage rec {
+    name = "plone.supermodel-1.2.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.relation/${name}.tar.gz";
-      md5 = "7e479095954fc6d8f648951434695837";
+      url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.1.zip";
+      md5 = "b60d1553b297d41d9e2181afe15da4f4";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ lxml zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zc_resourcelibrary = buildPythonPackage rec {
-    name = "zc.resourcelibrary-1.3.4";
-
+  plone_app_registry = buildPythonPackage rec {
+    name = "plone.app.registry-1.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.resourcelibrary/${name}.tar.gz";
-      md5 = "bebe49f3e930f896a8ea75531bf3fae8";
+      url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.2.zip";
+      md5 = "d4659a2c4cfb3a66cd6c7ff1ca17be7f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid lxml plone_registry products_genericsetup plone_supermodel plone_app_z3cform zope_dottedname zope_component zope2 setuptools zope_interface products_statusmessages plone_autoform products_cmfcore ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zc_sourcefactory = buildPythonPackage rec {
-    name = "zc.sourcefactory-0.7.0";
-
+  zope_pagetemplate = buildPythonPackage rec {
+    name = "zope.pagetemplate-3.6.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.sourcefactory/${name}.tar.gz";
-      md5 = "532dfd0a72489023268c19e3788b105d";
+      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip";
+      md5 = "834a4bf702c05fba1e669677b4dc871f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zconfig = buildPythonPackage rec {
-    name = "ZConfig-2.9.0";
-
+  products_cmfformcontroller = buildPythonPackage rec {
+    name = "Products.CMFFormController-3.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/${name}.zip";
-      md5 = "5c932690a70c8907efd240cdd76a7bc4";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
+      md5 = "6573df7dcb39e3b63ba22abe2acd639e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zdaemon = buildPythonPackage rec {
-    name = "zdaemon-2.0.7";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
-      md5 = "291a875f82e812110557eb6704af8afe";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zexceptions = buildPythonPackage rec {
-    name = "zExceptions-2.13.0";
-
+  plone_openid = buildPythonPackage rec {
+    name = "plone.openid-2.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zExceptions/${name}.zip";
-      md5 = "4c679696c959040d8e656ef85ae40136";
+      url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
+      md5 = "d4c36926a6dbefed035ed92c29329ce1";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zlog = buildPythonPackage rec {
-    name = "zLOG-2.11.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zLOG/${name}.tar.gz";
-      md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zodb3 = buildPythonPackage rec {
-    name = "ZODB3-3.10.5";
-
+  zope_app_content = buildPythonPackage rec {
+    name = "zope.app.content-3.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB3/${name}.tar.gz";
-      md5 = "6f180c6897a1820948fee2a6290503cd";
+      url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
+      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zodbcode = buildPythonPackage rec {
-    name = "zodbcode-3.4.0";
-
+  zope_size = buildPythonPackage rec {
+    name = "zope.size-3.4.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zodbcode/${name}.tar.gz";
-      md5 = "9b128f89aa2a2117fae4f74757eefeff";
+      url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
+      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope2 = buildPythonPackage rec {
-    name = "Zope2-2.13.19";
-
+  products_mimetypesregistry = buildPythonPackage rec {
+    name = "Products.MimetypesRegistry-2.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/Zope2/${name}.zip";
-      md5 = "26fee311aace7c12e406543ea91eb42a";
+      url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip";
+      md5 = "898166bb2aaececc8238ad4ee4826793";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_annotation = buildPythonPackage rec {
-    name = "zope.annotation-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.annotation/${name}.tar.gz";
-      md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_apidoc = buildPythonPackage rec {
-    name = "zope.app.apidoc-3.7.5";
-
+  plone_app_imaging = buildPythonPackage rec {
+    name = "plone.app.imaging-1.0.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.apidoc/${name}.zip";
-      md5 = "91e969b2d1089bb0a6a303990d269f0a";
+      url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.7.zip";
+      md5 = "27c24477bdcbcebeba6cd83419a57aa6";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_scale setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_applicationcontrol = buildPythonPackage rec {
-    name = "zope.app.applicationcontrol-3.5.10";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.applicationcontrol/${name}.tar.gz";
-      md5 = "f785c13698192c83024fda75f1f3d822";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_appsetup = buildPythonPackage rec {
-    name = "zope.app.appsetup-3.14.0";
-
+  products_marshall = buildPythonPackage rec {
+    name = "Products.Marshall-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.appsetup/${name}.tar.gz";
-      md5 = "2c3da1f514e6793e2bf612cb06ad9076";
+      url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
+      md5 = "bde4d7f75195c1ded8371554b04d2541";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_authentication = buildPythonPackage rec {
-    name = "zope.app.authentication-3.8.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.authentication/${name}.tar.gz";
-      md5 = "f8eb74fbdeebfd32c5e15c0f03aa3623";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_basicskin = buildPythonPackage rec {
-    name = "zope.app.basicskin-3.5.1";
-
+  zope_ptresource = buildPythonPackage rec {
+    name = "zope.ptresource-3.9.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.basicskin/${name}.tar.gz";
-      md5 = "75915a315f336a5b614db67df1093eb3";
+      url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
+      md5 = "f4645e51c15289d3fdfb4139039e18e9";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_broken = buildPythonPackage rec {
-    name = "zope.app.broken-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.broken/${name}.tar.gz";
-      md5 = "e6a7efdd1ea1facfd8c5ba4b25d395cb";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_cache = buildPythonPackage rec {
-    name = "zope.app.cache-3.7.0";
-
+  pillow = buildPythonPackage rec {
+    name = "Pillow-1.7.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.cache/${name}.zip";
-      md5 = "8dd74574e869ce236ced0de7e349bb5c";
+      url = "http://pypi.python.org/packages/source/P/Pillow/Pillow-1.7.7.zip";
+      md5 = "0617fae88d62422b878906a3c394c687";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_catalog = buildPythonPackage rec {
-    name = "zope.app.catalog-3.8.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.catalog/${name}.tar.gz";
-      md5 = "1ce21dee4e8256cfe254f8ee24c6ecef";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    configurePhase = '' sed -i "setup.py" -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;' '';
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_component = buildPythonPackage rec {
-    name = "zope.app.component-3.9.3";
-
+  multimapping = buildPythonPackage rec {
+    name = "MultiMapping-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.component/${name}.tar.gz";
-      md5 = "bc2dce245d2afe462529c350956711e0";
+      url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
+      md5 = "d69c5904c105b9f2f085d4103e0f0586";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_container = buildPythonPackage rec {
-    name = "zope.app.container-3.9.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.container/${name}.tar.gz";
-      md5 = "1e286c59f0166e517d67ddd723641c84";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_content = buildPythonPackage rec {
-    name = "zope.app.content-3.5.1";
-
+  products_mailhost = buildPythonPackage rec {
+    name = "Products.MailHost-2.13.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.content/${name}.tar.gz";
-      md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
+      url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
+      md5 = "1102e523435d8bf78a15b9ddb57478e1";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_dav = buildPythonPackage rec {
-    name = "zope.app.dav-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.dav/${name}.tar.gz";
-      md5 = "19ec8dc5f7ad21468dea1c46e86d95dd";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_debug = buildPythonPackage rec {
-    name = "zope.app.debug-3.4.1";
-
+  pytz = buildPythonPackage rec {
+    name = "pytz-2012g";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.debug/${name}.tar.gz";
-      md5 = "1a9d349b14d91137b57da52a2b9d185f";
+      url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012g.zip";
+      md5 = "1a9b24da1ab6328074b48fc3d4525078";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_debugskin = buildPythonPackage rec {
-    name = "zope.app.debugskin-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.debugskin/${name}.tar.gz";
-      md5 = "bd95d2848aa3108e53717d13b3c0924d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_dependable = buildPythonPackage rec {
-    name = "zope.app.dependable-3.5.1";
-
+  plone_app_i18n = buildPythonPackage rec {
+    name = "plone.app.i18n-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.dependable/${name}.zip";
-      md5 = "5f180620a880e6ec754e3a34bd110891";
+      url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
+      md5 = "a10026573463dfc1899bf4062cebdbf2";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_error = buildPythonPackage rec {
-    name = "zope.app.error-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.error/${name}.tar.gz";
-      md5 = "bab82dd06233e9b5e34e9709e8993ace";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_exception = buildPythonPackage rec {
-    name = "zope.app.exception-3.6.3";
-
+  plone_indexer = buildPythonPackage rec {
+    name = "plone.indexer-1.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.exception/${name}.tar.gz";
-      md5 = "af161d3e7c17db7f56f7816a6f2d980c";
+      url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
+      md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_file = buildPythonPackage rec {
-    name = "zope.app.file-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.file/${name}.tar.gz";
-      md5 = "fff140c36a2872c85b55433835ac3b98";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_folder = buildPythonPackage rec {
-    name = "zope.app.folder-3.5.2";
-
+  products_externalmethod = buildPythonPackage rec {
+    name = "Products.ExternalMethod-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.folder/${name}.tar.gz";
-      md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9";
+      url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
+      md5 = "15ba953ef6cb632eb571977651252ea6";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_form = buildPythonPackage rec {
-    name = "zope.app.form-4.0.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.form/${name}.tar.gz";
-      md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_ftp = buildPythonPackage rec {
-    name = "zope.app.ftp-3.5.0";
-
+  plone_app_upgrade = buildPythonPackage rec {
+    name = "plone.app.upgrade-1.3rc1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.ftp/${name}.tar.gz";
-      md5 = "b0769f90023156a86cb3f46040e6b5b0";
+      url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3rc1.zip";
+      md5 = "5132e3a77cc0288068106430136f2a49";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets zope2 plone_app_portlets products_cmfcalendar products_plonepas transaction products_pluggableauthservice zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_generations = buildPythonPackage rec {
-    name = "zope.app.generations-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.generations/${name}.tar.gz";
-      md5 = "ca74e0f4a01ad8767e1bba6332c39aa2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_http = buildPythonPackage rec {
-    name = "zope.app.http-3.9.0";
-
+  zope_browserpage = buildPythonPackage rec {
+    name = "zope.browserpage-3.12.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.http/${name}.tar.gz";
-      md5 = "26f73a3affecefc3aff960cd8b088681";
+      url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
+      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_i18n = buildPythonPackage rec {
-    name = "zope.app.i18n-3.6.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.i18n/${name}.tar.gz";
-      md5 = "c8573307ba08926214b7944a05e43632";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_interface = buildPythonPackage rec {
-    name = "zope.app.interface-3.5.2";
-
+  plone_resourceeditor = buildPythonPackage rec {
+    name = "plone.resourceeditor-1.0b4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.interface/${name}.tar.gz";
-      md5 = "b15522275a435c609bd44f2f019bd13c";
+      url = "http://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0b4.zip";
+      md5 = "6e419868c2ea94a322dd631a1b0b753c";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_resource zope2 zope_publisher zope_interface zope_component setuptools zope_schema ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_interpreter = buildPythonPackage rec {
-    name = "zope.app.interpreter-3.4.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.interpreter/${name}.tar.gz";
-      md5 = "fb8a2aa57dcfa3af2f30801dfafc78c4";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_intid = buildPythonPackage rec {
-    name = "zope.app.intid-3.7.1";
-
+  products_atcontenttypes = buildPythonPackage rec {
+    name = "Products.ATContentTypes-2.1.12";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.intid/${name}.tar.gz";
-      md5 = "0d2c1daf5d1d6fd09351b652042a2dac";
+      url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.12.zip";
+      md5 = "ef38ce0769a5f44e272623f8f118a669";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_keyreference = buildPythonPackage rec {
-    name = "zope.app.keyreference-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.keyreference/${name}.tar.gz";
-      md5 = "78539e472016a8ca57b34b6ea0ab7d9d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_locales = buildPythonPackage rec {
-    name = "zope.app.locales-3.6.2";
-
+  products_cmfeditions = buildPythonPackage rec {
+    name = "Products.CMFEditions-2.2.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locales/${name}.tar.gz";
-      md5 = "bd2b4c6040e768f33004b1210d3207fa";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip";
+      md5 = "1806f2e17e2527fad9364670b343bd11";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool zope_copy zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_localpermission = buildPythonPackage rec {
-    name = "zope.app.localpermission-3.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.localpermission/${name}.tar.gz";
-      md5 = "121509781b19ce55ebe890fa408702fc";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_locking = buildPythonPackage rec {
-    name = "zope.app.locking-3.5.0";
-
+  zope_interface = buildPythonPackage rec {
+    name = "zope.interface-3.6.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.locking/${name}.tar.gz";
-      md5 = "4edce1ba26f6c56b0eb79f703d8a80fe";
+      url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
+      md5 = "9df962180fbbb54eb1875cff9fe436e5";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_onlinehelp = buildPythonPackage rec {
-    name = "zope.app.onlinehelp-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.onlinehelp/${name}.tar.gz";
-      md5 = "67d0be66965e34b24ef18c269da62e4c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_pagetemplate = buildPythonPackage rec {
-    name = "zope.app.pagetemplate-3.11.2";
-
+  plone_app_content = buildPythonPackage rec {
+    name = "plone.app.content-2.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/${name}.tar.gz";
-      md5 = "2d304729c0d6a9ab67dd5ea852f19476";
+      url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.zip";
+      md5 = "8c8f0d5cc235fe7cb5ef9fe02b7e1c09";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container plone_batching zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_preference = buildPythonPackage rec {
-    name = "zope.app.preference-3.8.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.preference/${name}.tar.gz";
-      md5 = "ab6906261854c61ff9f0a13c7612d3e8";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_preview = buildPythonPackage rec {
-    name = "zope.app.preview-3.4.0";
-
+  products_cmfquickinstallertool = buildPythonPackage rec {
+    name = "Products.CMFQuickInstallerTool-3.0.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.preview/${name}.tar.gz";
-      md5 = "e698c10b043fb944150a825af9af536e";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
+      md5 = "af34adb87ddf2b6da48eff8b70ca2989";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_principalannotation = buildPythonPackage rec {
-    name = "zope.app.principalannotation-3.7.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.principalannotation/${name}.tar.gz";
-      md5 = "29c6bf8e817330b0d29de253686a68f2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_publication = buildPythonPackage rec {
-    name = "zope.app.publication-3.12.0";
-
+  plone_autoform = buildPythonPackage rec {
+    name = "plone.autoform-1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publication/${name}.zip";
-      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
+      url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.3.zip";
+      md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_publisher = buildPythonPackage rec {
-    name = "zope.app.publisher-3.10.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.publisher/${name}.zip";
-      md5 = "66e9110e2967d8d204a65a98e2227404";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_renderer = buildPythonPackage rec {
-    name = "zope.app.renderer-3.5.1";
-
+  plone_app_contentrules = buildPythonPackage rec {
+    name = "plone.app.contentrules-3.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.renderer/${name}.tar.gz";
-      md5 = "1cc605baf5dab7db50b0a0fd218566f3";
+      url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.zip";
+      md5 = "bd60122bf527ed90e9d6fbc6a7fb3625";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_rotterdam = buildPythonPackage rec {
-    name = "zope.app.rotterdam-3.5.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.rotterdam/${name}.tar.gz";
-      md5 = "4cb3c53844bc7481f9b7d60f3c5e3a85";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_schema = buildPythonPackage rec {
-    name = "zope.app.schema-3.5.0";
-
+  record = buildPythonPackage rec {
+    name = "Record-2.13.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.schema/${name}.tar.gz";
-      md5 = "92b7c3f4512f3433acc931ecb6ffc936";
+      url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
+      md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_app_security = buildPythonPackage rec {
-    name = "zope.app.security-3.7.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.security/${name}.tar.gz";
-      md5 = "c7cec00f6d8379b93180faf6ffaa89ea";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_securitypolicy = buildPythonPackage rec {
-    name = "zope.app.securitypolicy-3.6.1";
-
+  plone_behavior = buildPythonPackage rec {
+    name = "plone.behavior-1.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.securitypolicy/${name}.tar.gz";
-      md5 = "e3c6ef1db3228dbbb60a452c1a2a8f27";
+      url = "http://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip";
+      md5 = "4459b91287ebc2f2cf4fa38728b2a739";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_configuration zope_component setuptools zope_schema zope_annotation ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_server = buildPythonPackage rec {
-    name = "zope.app.server-3.6.0";
-
+  products_plonetestcase = buildPythonPackage rec {
+    name = "Products.PloneTestCase-0.9.15";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.server/${name}.tar.gz";
-      md5 = "d3a75eaf2a3f4759352dd3243dfb1d50";
+      url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.15.zip";
+      md5 = "ddd5810937919ab5233ebd64893c8bae";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_session = buildPythonPackage rec {
-    name = "zope.app.session-3.6.2";
-
+  plone_stringinterp = buildPythonPackage rec {
+    name = "plone.stringinterp-1.0.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.session/${name}.tar.gz";
-      md5 = "93467bf6854d714b53e71f36a9d770f3";
+      url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.7.zip";
+      md5 = "81909716210c6ac3fd0ee87f45ea523d";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_skins = buildPythonPackage rec {
-    name = "zope.app.skins-3.4.0";
-
+  plone_formwidget_namedfile = buildPythonPackage rec {
+    name = "plone.formwidget.namedfile-1.0.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.skins/${name}.tar.gz";
-      md5 = "a0bc210720ee50e40adb93e9c685e884";
+      url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.5.zip";
+      md5 = "7d39a5760d679c89d8e41abbc295240f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ z3c_form plone_z3cform plone_namedfile setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_testing = buildPythonPackage rec {
-    name = "zope.app.testing-3.7.8";
-
+  plone_app_blob = buildPythonPackage rec {
+    name = "plone.app.blob-1.5.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.testing/${name}.tar.gz";
-      md5 = "6fd3eb11e24973a3dbdf5f1ab655c0d4";
+      url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.7.zip";
+      md5 = "135bc404212981c445d5bbb6a749b155";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_tree = buildPythonPackage rec {
-    name = "zope.app.tree-3.6.0";
-
+  products_cmfdynamicviewfti = buildPythonPackage rec {
+    name = "Products.CMFDynamicViewFTI-4.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.tree/${name}.tar.gz";
-      md5 = "fbde3403c682bc7cf7b73d43cd2eed3a";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.3.zip";
+      md5 = "7d39d416b41b2d93954bc73d9d0e077f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_twisted = buildPythonPackage rec {
-    name = "zope.app.twisted-3.5.0";
-
+  plone_keyring = buildPythonPackage rec {
+    name = "plone.keyring-2.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.twisted/${name}.tar.gz";
-      md5 = "9e98868b8be8a0c4f720036366364a67";
+      url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
+      md5 = "f3970e9bddb2cc65e461a2c62879233f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_undo = buildPythonPackage rec {
-    name = "zope.app.undo-3.5.0";
-
+  zope_contentprovider = buildPythonPackage rec {
+    name = "zope.contentprovider-3.7.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.undo/${name}.tar.gz";
-      md5 = "7a40060aa0451a635a31d6e12d17a82e";
+      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
+      md5 = "1bb2132551175c0123f17939a793f812";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_wsgi = buildPythonPackage rec {
-    name = "zope.app.wsgi-3.9.3";
-
+  plone_app_jquery = buildPythonPackage rec {
+    name = "plone.app.jquery-1.7.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.wsgi/${name}.tar.gz";
-      md5 = "9c766908b720d777e02e0b0a9ac8a8a1";
+      url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
+      md5 = "e204cf45456d26217263531832b5bdac";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_zcmlfiles = buildPythonPackage rec {
-    name = "zope.app.zcmlfiles-3.7.1";
-
+  products_atreferencebrowserwidget = buildPythonPackage rec {
+    name = "Products.ATReferenceBrowserWidget-3.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.zcmlfiles/${name}.tar.gz";
-      md5 = "0e8991d2bed71ee6b98a2c48d21e1126";
+      url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
+      md5 = "157bdd32155c8353450c17c649aad042";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_zopeappgenerations = buildPythonPackage rec {
-    name = "zope.app.zopeappgenerations-3.5.1";
-
+  zope_browserresource = buildPythonPackage rec {
+    name = "zope.browserresource-3.10.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.zopeappgenerations/${name}.tar.gz";
-      md5 = "4c8a0bc409677f8b17dc57737d41f919";
+      url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
+      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_app_zptpage = buildPythonPackage rec {
-    name = "zope.app.zptpage-3.5.1";
-
+  plone_caching = buildPythonPackage rec {
+    name = "plone.caching-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.app.zptpage/${name}.tar.gz";
-      md5 = "aed8ec49e10911bd1e9d2c9d467fd098";
+      url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
+      md5 = "2c2e3b27d13b9101c92dfed222fde36c";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_applicationcontrol = buildPythonPackage rec {
-    name = "zope.applicationcontrol-3.5.5";
-
+  zope_app_locales = buildPythonPackage rec {
+    name = "zope.app.locales-3.6.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.applicationcontrol/${name}.tar.gz";
-      md5 = "5e4bb54afe55185e15bd9d1ba3750857";
+      url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
+      md5 = "bd2b4c6040e768f33004b1210d3207fa";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_authentication = buildPythonPackage rec {
-    name = "zope.authentication-3.7.1";
-
+  products_placelesstranslationservice = buildPythonPackage rec {
+    name = "Products.PlacelessTranslationService-2.0.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.authentication/${name}.zip";
-      md5 = "7d6bb340610518f2fc71213cfeccda68";
+      url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip";
+      md5 = "a94635eb712563c5a002520713f5d6dc";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_broken = buildPythonPackage rec {
-    name = "zope.broken-3.6.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip";
-      md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_browser = buildPythonPackage rec {
-    name = "zope.browser-1.3";
-
+  plone_z3cform = buildPythonPackage rec {
+    name = "plone.z3cform-0.8.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
-      md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
+      url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
+      md5 = "bdb23dd162544964d2f8f8f5f002e874";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope2 zope_component plone_batching zope_i18n z3c_form zope_browserpage setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_browsermenu = buildPythonPackage rec {
-    name = "zope.browsermenu-3.9.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/${name}.zip";
-      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_browserpage = buildPythonPackage rec {
-    name = "zope.browserpage-3.12.2";
-
+  zope_lifecycleevent = buildPythonPackage rec {
+    name = "zope.lifecycleevent-3.6.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserpage/${name}.tar.gz";
-      md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
+      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
+      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_browserresource = buildPythonPackage rec {
-    name = "zope.browserresource-3.10.3";
-
+  zope_app_form = buildPythonPackage rec {
+    name = "zope.app.form-4.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browserresource/${name}.zip";
-      md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
+      url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
+      md5 = "3d2b164d9d37a71490a024aaeb412e91";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_cachedescriptors = buildPythonPackage rec {
-    name = "zope.cachedescriptors-3.5.1";
-
+  products_tinymce = buildPythonPackage rec {
+    name = "Products.TinyMCE-1.3-1.3.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/${name}.zip";
-      md5 = "263459a95238fd61d17e815d97ca49ce";
+      url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.zip";
+      md5 = "02bec5bac10a3fe5fff3d04beb46ac53";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_archetypes plone_app_imaging plone_namedfile plone_app_layout zope_schema products_resourceregistries zope_app_content plone_caching setuptools plone_outputfilters ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_catalog = buildPythonPackage rec {
-    name = "zope.catalog-3.8.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.catalog/${name}.tar.gz";
-      md5 = "f9baff3997e337f0a23ac158258c8842";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_component = buildPythonPackage rec {
-    name = "zope.component-3.9.5";
-
+  collective_z3cform_datetimewidget = buildPythonPackage rec {
+    name = "collective.z3cform.datetimewidget-1.2.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/${name}.tar.gz";
-      md5 = "22780b445b1b479701c05978055d1c82";
+      url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip";
+      md5 = "439117021c93f26c677510504ee245d3";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_componentvocabulary = buildPythonPackage rec {
-    name = "zope.componentvocabulary-1.0.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/${name}.tar.gz";
-      md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_configuration = buildPythonPackage rec {
-    name = "zope.configuration-3.7.4";
-
+  z3c_form = buildPythonPackage rec {
+    name = "z3c.form-3.0.0a2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/${name}.zip";
-      md5 = "5b0271908ef26c05059eda76928896ea";
+      url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.0a2.zip";
+      md5 = "c4468ed0273901fb887cca9cfd1bb2cb";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_container = buildPythonPackage rec {
-    name = "zope.container-3.11.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
-      md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_contentprovider = buildPythonPackage rec {
-    name = "zope.contentprovider-3.7.2";
-
+  products_dcworkflow = buildPythonPackage rec {
+    name = "Products.DCWorkflow-2.2.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contentprovider/${name}.tar.gz";
-      md5 = "1bb2132551175c0123f17939a793f812";
+      url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
+      md5 = "c90a16c4f3611015592ba8173a5f1863";
     };
-
-    # ignore dependencies
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_contenttype = buildPythonPackage rec {
-    name = "zope.contenttype-3.5.5";
-
+  mechanize = buildPythonPackage rec {
+    name = "mechanize-0.2.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip";
-      md5 = "c6ac80e6887de4108a383f349fbdf332";
+      url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip";
+      md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [  ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_copy = buildPythonPackage rec {
-    name = "zope.copy-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.tar.gz";
-      md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_copypastemove = buildPythonPackage rec {
-    name = "zope.copypastemove-3.7.0";
-
+  plone_app_iterate = buildPythonPackage rec {
+    name = "plone.app.iterate-2.1.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copypastemove/${name}.tar.gz";
-      md5 = "f335940686d15cfc5520c42f2494a924";
+      url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip";
+      md5 = "8bd270d8a3c9509e524a06e092a9b4c4";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_dcworkflow products_statusmessages zope_event setuptools products_cmfplacefulworkflow zope_schema zope_lifecycleevent zope_annotation zope2 plone_locking products_cmfcore acquisition ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_datetime = buildPythonPackage rec {
-    name = "zope.datetime-3.4.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.datetime/${name}.tar.gz";
-      md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_deferredimport = buildPythonPackage rec {
-    name = "zope.deferredimport-3.5.3";
-
+  accesscontrol = buildPythonPackage rec {
+    name = "AccessControl-3.0.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deferredimport/${name}.tar.gz";
-      md5 = "68fce3bf4f011d4a840902fd763884ee";
+      url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip";
+      md5 = "a8ce472482adabf9ec969f3971a39a19";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_deprecation = buildPythonPackage rec {
-    name = "zope.deprecation-3.4.1";
-
+  zope_testing = buildPythonPackage rec {
+    name = "zope.testing-3.9.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz";
-      md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
+      url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
+      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_documenttemplate = buildPythonPackage rec {
-    name = "zope.documenttemplate-3.4.3";
-
+  products_externaleditor = buildPythonPackage rec {
+    name = "Products.ExternalEditor-1.1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.documenttemplate/${name}.tar.gz";
-      md5 = "d5c302534ee0913c39bdc227e1592cb7";
+      url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
+      md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_dottedname = buildPythonPackage rec {
-    name = "zope.dottedname-3.4.6";
-
+  zope_app_publication = buildPythonPackage rec {
+    name = "zope.app.publication-3.12.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz";
-      md5 = "62d639f75b31d2d864fe5982cb23959c";
+      url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
+      md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_dublincore = buildPythonPackage rec {
-    name = "zope.dublincore-3.7.0";
-
+  zope_filerepresentation = buildPythonPackage rec {
+    name = "zope.filerepresentation-3.6.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dublincore/${name}.tar.gz";
-      md5 = "2e34e42e454d896feb101ac74af62ded";
+      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
+      md5 = "4a7a434094f4bfa99a7f22e75966c359";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_schema zope_interface setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_error = buildPythonPackage rec {
-    name = "zope.error-3.7.4";
-
+  six = buildPythonPackage rec {
+    name = "six-1.2.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.error/${name}.tar.gz";
-      md5 = "281445a906458ff5f18f56923699a127";
+      url = "http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
+      md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_event = buildPythonPackage rec {
-    name = "zope.event-3.5.2";
-
+  plone_app_dexterity = buildPythonPackage rec {
+    name = "plone.app.dexterity-2.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
-      md5 = "6e8af2a16157a74885d4f0d88137cefb";
+      url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.4.zip";
+      md5 = "3fabdb2ec9fa0cfee0ffd4b7e9f05f5b";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   zope_exceptions = buildPythonPackage rec {
     name = "zope.exceptions-3.6.2";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
       md5 = "d7234d99d728abe3d9275346e8d24fd9";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_file = buildPythonPackage rec {
-    name = "zope.file-0.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.file/${name}.tar.gz";
-      md5 = "5df3b63c678f4b445be345f1dff1bc9b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_filerepresentation = buildPythonPackage rec {
-    name = "zope.filerepresentation-3.6.1";
-
+  plone_app_layout = buildPythonPackage rec {
+    name = "plone.app.layout-2.3.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz";
-      md5 = "4a7a434094f4bfa99a7f22e75966c359";
+      url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.4.zip";
+      md5 = "817819f27ad46fcb8a9d66e988fa08f2";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_formlib = buildPythonPackage rec {
-    name = "zope.formlib-4.0.6";
-
+  zope_contenttype = buildPythonPackage rec {
+    name = "zope.contenttype-3.5.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.formlib/${name}.zip";
-      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
+      url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
+      md5 = "c6ac80e6887de4108a383f349fbdf332";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_globalrequest = buildPythonPackage rec {
-    name = "zope.globalrequest-1.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.globalrequest/${name}.zip";
-      md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_hookable = buildPythonPackage rec {
-    name = "zope.hookable-3.4.1";
-
+  five_customerize = buildPythonPackage rec {
+    name = "five.customerize-1.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.hookable/${name}.tar.gz";
-      md5 = "fe6713aef5b6c0f4963fb984bf326da0";
+      url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip";
+      md5 = "80772212a2d55150a6c070fc4638b0c7";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_html = buildPythonPackage rec {
-    name = "zope.html-2.1.0";
-
+  plone_subrequest = buildPythonPackage rec {
+    name = "plone.subrequest-1.6.7";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.html/${name}.tar.gz";
-      md5 = "868cb987e400b9a290355a1207d47143";
+      url = "http://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip";
+      md5 = "cc12f68a22565415b10dbeef0020baa4";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_globalrequest five_globalrequest setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_i18n = buildPythonPackage rec {
-    name = "zope.i18n-3.7.4";
-
+  zope_site = buildPythonPackage rec {
+    name = "zope.site-3.9.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
-      md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
+      url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
+      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_i18nmessageid = buildPythonPackage rec {
-    name = "zope.i18nmessageid-3.5.3";
-
+  wicked = buildPythonPackage rec {
+    name = "wicked-1.1.10";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/${name}.tar.gz";
-      md5 = "cb84bf61c2b7353e3b7578057fbaa264";
+      url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
+      md5 = "f65611f11d547d7dc8e623bf87d3929d";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_index = buildPythonPackage rec {
-    name = "zope.index-3.6.4";
-
+  plone_schemaeditor = buildPythonPackage rec {
+    name = "plone.schemaeditor-1.3.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.index/${name}.tar.gz";
-      md5 = "65c34f446f54ffd711e34ede9eb89dad";
+      url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.1.zip";
+      md5 = "81a5a66cc07b20c554c68ad2ae831b2f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope2 zope_publisher zope_container z3c_form zope_interface zope_component setuptools zope_schema zope_lifecycleevent plone_autoform plone_z3cform ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_interface = buildPythonPackage rec {
-    name = "zope.interface-3.6.7";
-
+  plone_app_uuid = buildPythonPackage rec {
+    name = "plone.app.uuid-1.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.zip";
-      md5 = "9df962180fbbb54eb1875cff9fe436e5";
+      url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
+      md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_intid = buildPythonPackage rec {
-    name = "zope.intid-3.7.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.intid/${name}.zip";
-      md5 = "241f2fe62fb60f6319d9902b12bc333d";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_keyreference = buildPythonPackage rec {
-    name = "zope.keyreference-3.6.4";
-
+  unittest2 = buildPythonPackage rec {
+    name = "unittest2-0.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.keyreference/${name}.tar.gz";
-      md5 = "3774c90f236f880547f4c042ee0997e9";
+      url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip";
+      md5 = "1527fb89e38343945af1166342d851ee";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_kgs = buildPythonPackage rec {
-    name = "zope.kgs-1.2.0";
-
+  persistence = buildPythonPackage rec {
+    name = "Persistence-2.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.kgs/${name}.tar.gz";
-      md5 = "15ed01a270bddcf253b1c08479549692";
+      url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
+      md5 = "92693648ccdc59c8fc71f7f06b1d228c";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ extensionclass zodb3 ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_lifecycleevent = buildPythonPackage rec {
-    name = "zope.lifecycleevent-3.6.2";
-
+  products_zopeversioncontrol = buildPythonPackage rec {
+    name = "Products.ZopeVersionControl-1.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
-      md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
+      url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
+      md5 = "238239102f3ac798ee4f4c53343a561f";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
   zope_location = buildPythonPackage rec {
     name = "zope.location-3.9.1";
-
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
       md5 = "1684a8f986099d15296f670c58e713d8";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_login = buildPythonPackage rec {
-    name = "zope.login-1.0.0";
-
+  zope_browsermenu = buildPythonPackage rec {
+    name = "zope.browsermenu-3.9.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.login/${name}.zip";
-      md5 = "4eceb766329125a80aee1b4b4809869a";
+      url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
+      md5 = "a47c7b1e786661c912a1150bf8d1f83f";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_mimetype = buildPythonPackage rec {
-    name = "zope.mimetype-1.3.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.mimetype/${name}.tar.gz";
-      md5 = "c865758c896707287f86ba603f06a84b";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_minmax = buildPythonPackage rec {
-    name = "zope.minmax-1.1.2";
-
+  plone_app_workflow = buildPythonPackage rec {
+    name = "plone.app.workflow-2.1.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.minmax/${name}.tar.gz";
-      md5 = "0c3fbac9623f402ed758dace80080d55";
+      url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.2.zip";
+      md5 = "8da95b396f3a9ec54895085ef12202a7";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime zope_component products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n products_cmfcore acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_mkzeoinstance = buildPythonPackage rec {
-    name = "zope.mkzeoinstance-3.9.5";
-
+  plone_locking = buildPythonPackage rec {
+    name = "plone.locking-2.0.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/${name}.tar.gz";
-      md5 = "2c2dcf7cc7de58f7d009ca3294f54377";
+      url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
+      md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_modulealias = buildPythonPackage rec {
-    name = "zope.modulealias-3.4.0";
-
+  zope_dottedname = buildPythonPackage rec {
+    name = "zope.dottedname-3.4.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.modulealias/${name}.tar.gz";
-      md5 = "77f4603524b578a5c6b4b4fdde58a484";
+      url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
+      md5 = "62d639f75b31d2d864fe5982cb23959c";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_pagetemplate = buildPythonPackage rec {
-    name = "zope.pagetemplate-3.6.3";
-
+  zope_cachedescriptors = buildPythonPackage rec {
+    name = "zope.cachedescriptors-3.5.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/${name}.zip";
-      md5 = "834a4bf702c05fba1e669677b4dc871f";
+      url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
+      md5 = "263459a95238fd61d17e815d97ca49ce";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_password = buildPythonPackage rec {
-    name = "zope.password-3.6.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.password/${name}.tar.gz";
-      md5 = "230f93a79020c8a3dc01d79832546e3c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_pluggableauth = buildPythonPackage rec {
-    name = "zope.pluggableauth-1.0.3";
-
+  plone_app_collection = buildPythonPackage rec {
+    name = "plone.app.collection-1.0.8";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.pluggableauth/${name}.tar.gz";
-      md5 = "85d16cb2e5b41bf2a438828857719566";
+      url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.8.zip";
+      md5 = "8bbd299daa04b35ecfad3c13afa7aba0";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_preference = buildPythonPackage rec {
-    name = "zope.preference-3.8.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.preference/${name}.tar.gz";
-      md5 = "bb8b1c9f65387a51be429407528cc453";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_principalannotation = buildPythonPackage rec {
-    name = "zope.principalannotation-3.6.1";
-
+  zc_lockfile = buildPythonPackage rec {
+    name = "zc.lockfile-1.0.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.principalannotation/${name}.tar.gz";
-      md5 = "652685ca13cefaad78dbc5c6507fc9ab";
+      url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz";
+      md5 = "6cf83766ef9935c33e240b0904c7a45e";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_principalregistry = buildPythonPackage rec {
-    name = "zope.principalregistry-3.7.1";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.principalregistry/${name}.tar.gz";
-      md5 = "9b90adc7915d9bbed4237db432fc70c2";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_processlifetime = buildPythonPackage rec {
-    name = "zope.processlifetime-1.0";
-
+  lxml = buildPythonPackage rec {
+    name = "lxml-2.3.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.processlifetime/${name}.tar.gz";
-      md5 = "69604bfd668a01ebebdd616a8f26ccfe";
+      url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
+      md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-3.6.1";
-
+  plone_contentrules = buildPythonPackage rec {
+    name = "plone.contentrules-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.zip";
-      md5 = "a400b0a26624b17fa889dbcaa989d440";
+      url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.2.zip";
+      md5 = "a32370656c4fd58652fcd8a234db69c5";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_ptresource = buildPythonPackage rec {
-    name = "zope.ptresource-3.9.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ptresource/${name}.tar.gz";
-      md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_publisher = buildPythonPackage rec {
-    name = "zope.publisher-3.12.6";
-
+  zope_sendmail = buildPythonPackage rec {
+    name = "zope.sendmail-3.7.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz";
-      md5 = "495131970cc7cb14de8e517fb3857ade";
+      url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
+      md5 = "8a513ecf2b41cad849f6607bf16d6818";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_ramcache = buildPythonPackage rec {
-    name = "zope.ramcache-1.0";
-
+  zope_formlib = buildPythonPackage rec {
+    name = "zope.formlib-4.0.6";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.ramcache/${name}.zip";
-      md5 = "87289e15f0e51f50704adda1557c02a7";
+      url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
+      md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_rdb = buildPythonPackage rec {
-    name = "zope.rdb-3.5.0";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.rdb/${name}.tar.gz";
-      md5 = "2068b469c07c9c0b41392cd9839e3728";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_schema = buildPythonPackage rec {
-    name = "zope.schema-4.2.1";
-
+  plone_app_caching = buildPythonPackage rec {
+    name = "plone.app.caching-1.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.zip";
-      md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6";
+      url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.3.zip";
+      md5 = "1975506ecf8d42944946dbb2b8f8dc01";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_security = buildPythonPackage rec {
-    name = "zope.security-3.7.4";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz";
-      md5 = "072ab8d11adc083eace11262da08630c";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_securitypolicy = buildPythonPackage rec {
-    name = "zope.securitypolicy-3.7.0";
-
+  products_cmfplone = buildPythonPackage rec {
+    name = "Products.CMFPlone-4.3rc1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.securitypolicy/${name}.tar.gz";
-      md5 = "fe9ba029384c0640b2ba175ba1805cd8";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3rc1.zip";
+      md5 = "cc861f8fa93f50a531cb850ea5a9fa37";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plonetheme_classic plone_batching plone_fieldsets products_cmfdefault acquisition plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup pillow five_localsitemanager plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_customerize plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext z3c_autoinclude zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_sendmail = buildPythonPackage rec {
-    name = "zope.sendmail-3.7.5";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sendmail/${name}.tar.gz";
-      md5 = "8a513ecf2b41cad849f6607bf16d6818";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_sequencesort = buildPythonPackage rec {
-    name = "zope.sequencesort-3.4.0";
-
+  transaction = buildPythonPackage rec {
+    name = "transaction-1.1.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sequencesort/${name}.tar.gz";
-      md5 = "cfc35fc426a47f5c0ee43c416224b864";
+      url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
+      md5 = "30b062baa34fe1521ad979fb088c8c55";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_server = buildPythonPackage rec {
-    name = "zope.server-3.6.3";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.server/${name}.tar.gz";
-      md5 = "2a758720fd6d9bdfb1cea8d644c27923";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_session = buildPythonPackage rec {
-    name = "zope.session-3.9.5";
-
+  plone_app_controlpanel = buildPythonPackage rec {
+    name = "plone.app.controlpanel-2.3.4";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.session/${name}.tar.gz";
-      md5 = "2934e9f2daa01555e9a7a1f9945c3493";
+      url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.4.zip";
+      md5 = "d01b8c188498080a52275de2a50b25eb";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_site = buildPythonPackage rec {
-    name = "zope.site-3.9.2";
-
+  plone_app_redirector = buildPythonPackage rec {
+    name = "plone.app.redirector-1.2a1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.site/${name}.tar.gz";
-      md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
+      url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2a1.zip";
+      md5 = "b63b6443b4bbc5562bddcb43600349f7";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ plone_memoize setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_size = buildPythonPackage rec {
-    name = "zope.size-3.4.1";
-
+  zope_component = buildPythonPackage rec {
+    name = "zope.component-3.9.5";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
-      md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
+      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
+      md5 = "22780b445b1b479701c05978055d1c82";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_event setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_structuredtext = buildPythonPackage rec {
-    name = "zope.structuredtext-3.5.1";
-
+  zope_broken = buildPythonPackage rec {
+    name = "zope.broken-3.6.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.structuredtext/${name}.tar.gz";
-      md5 = "eabbfb983485d0879322bc878d2478a0";
+      url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
+      md5 = "eff24d7918099a3e899ee63a9c31bee6";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_interface setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_tal = buildPythonPackage rec {
-    name = "zope.tal-3.5.2";
-
+  plone_namedfile = buildPythonPackage rec {
+    name = "plone.namedfile-2.0.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tal/${name}.zip";
-      md5 = "13869f292ba36b294736b7330b1396fd";
+      url = "http://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.1.zip";
+      md5 = "9739c2fe25977d7e050a85eaed9e776a";
     };
-
-    # ignore dependencies
-    installCommand = ''
-      easy_install --always-unzip --no-deps --prefix="$out" .
-    '';
-
     buildInputs = [ pkgs.unzip ];
-
+    propagatedBuildInputs = [ zope_traversing zope_security zope_component zope_browserpage setuptools plone_rfc822 ];
     doCheck = false;
-
-    meta = {
-      maintainers = [
-        stdenv.lib.maintainers.chaoflow
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
-    };
-  };
-
-
-  zope_tales = buildPythonPackage rec {
-    name = "zope.tales-3.5.2";
-
-    src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.tales/${name}.tar.gz";
-      md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
-    };
-
-    # ignore dependencies
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_testbrowser = buildPythonPackage rec {
-    name = "zope.testbrowser-3.11.1";
-
+  plone_app_openid = buildPythonPackage rec {
+    name = "plone.app.openid-2.0.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testbrowser/${name}.tar.gz";
-      md5 = "64abbee892121e7f1a91aed12cfc155a";
+      url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
+      md5 = "ae0748f91cab0612a498926d405d8edd";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_testing = buildPythonPackage rec {
-    name = "zope.testing-3.9.7";
-
+  z3c_caching = buildPythonPackage rec {
+    name = "z3c.caching-2.0a1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
-      md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
+      url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
+      md5 = "17f250b5084c2324a7d15c6810ee628e";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_thread = buildPythonPackage rec {
-    name = "zope.thread-3.4";
-
+  plone_app_textfield = buildPythonPackage rec {
+    name = "plone.app.textfield-1.2.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.thread/${name}.tar.gz";
-      md5 = "3567037865b746c933d4af86e5aefa35";
+      url = "http://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
+      md5 = "f832887a40826d6f68c48b48f071fb9c";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_schema zope_interface zodb3 setuptools zope_component ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_traversing = buildPythonPackage rec {
-    name = "zope.traversing-3.13.2";
-
+  tempstorage = buildPythonPackage rec {
+    name = "tempstorage-2.12.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
-      md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
+      url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
+      md5 = "7a2b76b39839e229249b1bb175604480";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ zope_testing zodb3 setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_viewlet = buildPythonPackage rec {
-    name = "zope.viewlet-3.7.2";
-
+  zc_buildout = buildPythonPackage rec {
+    name = "zc.buildout-1.7.0";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.viewlet/${name}.tar.gz";
-      md5 = "367e03096df57e2f9b74fff43f7901f9";
+      url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.0.tar.gz";
+      md5 = "4e3b521600e475c56a0a66459a5fc7bb";
     };
-
-    # ignore dependencies
+    buildInputs = [  ];
+    propagatedBuildInputs = [ setuptools ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zope_xmlpickle = buildPythonPackage rec {
-    name = "zope.xmlpickle-3.4.0";
-
+  products_cmfactionicons = buildPythonPackage rec {
+    name = "Products.CMFActionIcons-2.1.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.xmlpickle/${name}.tar.gz";
-      md5 = "b579f35546b095aec2c890d3f8a46911";
+      url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
+      md5 = "ab1dc62404ed11aea84dc0d782b2235e";
     };
-
-    # ignore dependencies
+    buildInputs = [ eggtestinfo ];
+    propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  zopeundo = buildPythonPackage rec {
-    name = "ZopeUndo-2.12.0";
-
+  products_zctextindex = buildPythonPackage rec {
+    name = "Products.ZCTextIndex-2.13.3";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZopeUndo/${name}.zip";
-      md5 = "2b8da09d1b98d5558f62e12f6e52c401";
+      url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.3.zip";
+      md5 = "bf95ea9fa2831237fa3c3d38fafdec96";
     };
-
-    # ignore dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    buildInputs = [ pkgs.unzip ];
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-
-  eggtestinfo = buildPythonPackage rec {
-    name = "eggtestinfo-0.3";
-
+  extensionclass = buildPythonPackage rec {
+    name = "ExtensionClass-2.13.2";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/e/eggtestinfo/${name}.tar.gz";
-      md5 = "6f0507aee05f00c640c0d64b5073f840";
+      url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
+      md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
     };
-
-    # circular dependencies
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    doCheck = false;
     installCommand = ''
       easy_install --always-unzip --no-deps --prefix="$out" .
     '';
-
-    doCheck = false;
-
+    
     meta = {
+      description = "UNKNOWN";
+      homepage = "UNKNOWN";
       maintainers = [
-        stdenv.lib.maintainers.chaoflow
         stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.goibhniu
-     ];
+        stdenv.lib.maintainers.iElectric
+      ];
+      platforms = stdenv.lib.platforms.all;
     };
   };
 
-}; in plone42Packages
-
-# Not Found: ['nt-svcutils', 'PIL', 'wsgi-intercept']
-# Version Error: ['collective.z3cform.datagridfield-demo']
+}; in plone43rc1Packages