diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 219fe85b176..a70597e6ee5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -89,9 +89,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
-  # https://github.com/peti/jailbreak-cabal/issues/5
-  ReadArgs = dontCheck super.ReadArgs;
-
   # Until the changes have been pushed to Hackage
   haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch {
     url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 68ea13ab775..5c5ef83b10b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1748,6 +1748,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "CLI" = callPackage
+    ({ mkDerivation, base, directory, doctest, split, time }:
+     mkDerivation {
+       pname = "CLI";
+       version = "0.1.0.0";
+       sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall";
+       buildDepends = [ base directory split time ];
+       testDepends = [ base doctest ];
+       description = "CLI tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "CMCompare" = callPackage
     ({ mkDerivation, array, base, BiobaseInfernal, BiobaseXNA, cmdargs
      , containers, lens
@@ -4866,12 +4878,12 @@ self: {
      }) {};
 
   "GLURaw" = callPackage
-    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw }:
+    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
-       version = "1.4.0.2";
-       sha256 = "10sy0zag1wfrrq137azv3xazcgs21zb6bp84xzh518qbhiiycjhg";
-       buildDepends = [ base OpenGLRaw ];
+       version = "1.5.0.0";
+       sha256 = "1y3qbq1qaxnylrb86all96xdja1d62adilyyky0glsbl9dqnzr4j";
+       buildDepends = [ base OpenGLRaw transformers ];
        extraLibraries = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
@@ -4902,11 +4914,11 @@ self: {
      }:
      mkDerivation {
        pname = "GLUtil";
-       version = "0.8.4";
-       sha256 = "1bjc33cnlcb29hfyq2141cj2g2pklg5296hg1jpg246j0bcy9fcf";
+       version = "0.8.5";
+       sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv";
        buildDepends = [
-         array base bytestring containers cpphs directory filepath
-         JuicyPixels linear OpenGL OpenGLRaw transformers vector
+         array base bytestring containers directory filepath JuicyPixels
+         linear OpenGL OpenGLRaw transformers vector
        ];
        buildTools = [ cpphs ];
        description = "Miscellaneous OpenGL utilities";
@@ -7782,6 +7794,7 @@ self: {
        version = "5.2.0.16";
        sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s";
        buildDepends = [ array base containers StateVar transformers ];
+       jailbreak = true;
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
@@ -10778,12 +10791,12 @@ self: {
           winmm = null;  winspool = null;};
 
   "ObjectName" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ObjectName";
-       version = "1.0.1.1";
-       sha256 = "18bqaqxzafhmnf1r4qc0qnxdiv00i4zis89yinvpwjqbiwlwakda";
-       buildDepends = [ base ];
+       version = "1.1.0.0";
+       sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg";
+       buildDepends = [ base transformers ];
        homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
        license = stdenv.lib.licenses.bsd3;
@@ -10981,12 +10994,12 @@ self: {
      }) {};
 
   "OpenGLRaw" = callPackage
-    ({ mkDerivation, base, mesa }:
+    ({ mkDerivation, base, mesa, transformers }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.3.0.0";
-       sha256 = "03hlk0j03a963534swqvagrckl9y2s8hh07a7pczc104nw45jxln";
-       buildDepends = [ base ];
+       version = "2.4.0.0";
+       sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2";
+       buildDepends = [ base transformers ];
        extraLibraries = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
@@ -11490,18 +11503,18 @@ self: {
 
   "Plot-ho-matic" = callPackage
     ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers
-     , data-default-class, generic-accessors, glib, gtk, lens, linear
-     , spatial-math, stm, text, time
+     , data-default-class, generic-accessors, glib, gtk, lens, text
+     , time
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.5.0.0";
-       sha256 = "00dza3lkgaivxyxy7q8z936zmlpxr4nk0lgq3vyg524pd4hq38sg";
+       version = "0.5.0.2";
+       sha256 = "0i55milm63y0djnni3sg40pydxw5ls4gjsj18g8f5rbbdjx6y95q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base cairo Chart Chart-cairo containers data-default-class
-         generic-accessors glib gtk lens linear spatial-math stm text time
+         generic-accessors glib gtk lens text time
        ];
        description = "Real-time line plotter for protobuf-like data";
        license = stdenv.lib.licenses.bsd3;
@@ -12302,8 +12315,8 @@ self: {
      }:
      mkDerivation {
        pname = "Redmine";
-       version = "0.0.1";
-       sha256 = "0ifs2gca5sgmaqrby3fc410n5k357102c8jh3fh77rhdc3m8l8bd";
+       version = "0.0.2";
+       sha256 = "06w5q8xb4n5428ja1834z18rn6zl5cqdizcvj7519a2xy9m5qda5";
        buildDepends = [
          aeson base bytestring connection containers HTTP http-client-tls
          http-conduit MissingH network old-locale old-time resourcet text
@@ -13504,12 +13517,12 @@ self: {
      }) {};
 
   "StateVar" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
-       version = "1.0.1.1";
-       sha256 = "0h2cykrbnq4aq8dmi59mmnagvzz00lfagqx3476y2ygqc7v1iisl";
-       buildDepends = [ base ];
+       version = "1.1.0.0";
+       sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1";
+       buildDepends = [ base stm transformers ];
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
@@ -18468,6 +18481,7 @@ self: {
          base bytestring http-conduit MonadCatchIO-transformers mtl snap
          snap-core time
        ];
+       jailbreak = true;
        homepage = "https://github.com/dbp/analyze-client";
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
@@ -18945,8 +18959,8 @@ self: {
      }:
      mkDerivation {
        pname = "apiary";
-       version = "1.4.0";
-       sha256 = "1z0wky3xhkgayxf6fzrj7dnll6r948vgqsvfhhjh32ybadmi97bm";
+       version = "1.4.2";
+       sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal";
        buildDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
@@ -19672,12 +19686,11 @@ self: {
        pname = "arithmoi";
        version = "0.4.1.1";
        sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix";
-       editedCabalFile = "d12980bee5be68b204594ee91c026599ec930613be6c05106ea27d93d96c0433";
+       editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a";
        buildDepends = [
          array base containers ghc-prim integer-gmp mtl random
        ];
        configureFlags = [ "-f-llvm" ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/dafis/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -19899,8 +19912,8 @@ self: {
      }:
      mkDerivation {
        pname = "ascii-progress";
-       version = "0.2.1.0";
-       sha256 = "0r3an905by72w7r9pd00rf7fn061v668bh4x6apllmpxid7a7pm7";
+       version = "0.2.1.1";
+       sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25449,6 +25462,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "broccoli" = callPackage
+    ({ mkDerivation, base, stm, unamb }:
+     mkDerivation {
+       pname = "broccoli";
+       version = "0.2.0.1";
+       sha256 = "0kish92mch22jlpg86iq6y73jmmsjg1yl7s2f15y6vwfdvbhv8zz";
+       buildDepends = [ base stm unamb ];
+       description = "Small library for interactive functional programs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bsd-sysctl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -25661,10 +25685,9 @@ self: {
     ({ mkDerivation, base, bytestring, containers, dlist, text }:
      mkDerivation {
        pname = "buildable";
-       version = "0.1.0.2";
-       sha256 = "1p9xi5ms7rxgzn5jxv5nv8bynyfb9ll952k0j7di5s7zbga8v1pg";
+       version = "0.1.0.3";
+       sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
        buildDepends = [ base bytestring containers dlist text ];
-       jailbreak = true;
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -26536,8 +26559,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-db";
-       version = "0.1.11";
-       sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7";
+       version = "0.1.12";
+       sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -26671,6 +26694,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cabal-helper" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, data-default, directory
+     , filepath, mtl, process, template-haskell, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "cabal-helper";
+       version = "0.1.0.1";
+       sha256 = "1a7yavkja9ghrr7pf9j8hkg4fg1xl6g4fn82hwc56snmvlpc0ms5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring Cabal data-default directory filepath mtl process
+         template-haskell temporary transformers
+       ];
+       description = "Simple interface to Cabal's configuration state used by ghc-mod";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "cabal-install" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
@@ -30403,18 +30444,22 @@ self: {
      }) {};
 
   "clustering" = callPackage
-    ({ mkDerivation, base, containers, hierarchical-clustering
-     , mwc-random, tasty, tasty-hunit, vector
+    ({ mkDerivation, base, binary, containers, hierarchical-clustering
+     , matrices, mwc-random, primitive, split, tasty, tasty-hunit
+     , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "clustering";
-       version = "0.1.0";
-       sha256 = "04x6q7da64b2v326mbralkc13zb3b5x1fwdc3by703hf7mv28kd4";
-       buildDepends = [ base containers vector ];
-       testDepends = [
-         base hierarchical-clustering mwc-random tasty tasty-hunit vector
+       version = "0.1.1";
+       sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws";
+       buildDepends = [
+         base binary containers matrices mwc-random primitive vector
        ];
-       description = "fast clustering algorithms";
+       testDepends = [
+         base binary hierarchical-clustering mwc-random split tasty
+         tasty-hunit tasty-quickcheck vector
+       ];
+       description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -30911,6 +30956,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "collection-json" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text }:
+     mkDerivation {
+       pname = "collection-json";
+       version = "0.1.0.0";
+       sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc";
+       buildDepends = [ aeson base bytestring text ];
+       homepage = "https://github.com/danchoi/collection-json.hs";
+       description = "Collection+JSON hypermedia type tools";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "collections" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, QuickCheck }:
      mkDerivation {
@@ -31216,8 +31273,8 @@ self: {
      }:
      mkDerivation {
        pname = "comonad";
-       version = "4.2.3";
-       sha256 = "1zs967yx1qv7382qks7fy42qxy7d20mkiw2bxrnk5m1x339hqysj";
+       version = "4.2.4";
+       sha256 = "0wycd7ir3bjrf9k1fh81jl09lk9s99fg8z25lwhb8bc70q50sab8";
        buildDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
@@ -32582,15 +32639,15 @@ self: {
      }) {};
 
   "contravariant" = callPackage
-    ({ mkDerivation, base, foreign-var, semigroups, transformers
+    ({ mkDerivation, base, semigroups, StateVar, transformers
      , transformers-compat, void
      }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.2.2.1";
-       sha256 = "0w1kgx85wbf96f1hr50b6nh9pqjbqbn4axfd419b38xy09j61j75";
+       version = "1.3";
+       sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r";
        buildDepends = [
-         base foreign-var semigroups transformers transformers-compat void
+         base semigroups StateVar transformers transformers-compat void
        ];
        homepage = "http://github.com/ekmett/contravariant/";
        description = "Contravariant functors";
@@ -34785,9 +34842,8 @@ self: {
     ({ mkDerivation, base, bytestring, c2hs, pretty }:
      mkDerivation {
        pname = "cuda";
-       version = "0.6.5.1";
-       sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y";
-       editedCabalFile = "4a72db38c131b220e445e389755d48338769d9a08e826244dcfb7b1182c21c00";
+       version = "0.6.6.0";
+       sha256 = "0xa8wfqrgc0br7cr3g5j0i30kna07bci7vx05iw46fv445rhjv5y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring pretty ];
@@ -34824,7 +34880,6 @@ self: {
        sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg";
        buildDepends = [ base cuda ];
        buildTools = [ c2hs ];
-       jailbreak = true;
        homepage = "http://github.com/robeverest/cufft";
        description = "Haskell bindings for the CUFFT library";
        license = stdenv.lib.licenses.bsd3;
@@ -38411,6 +38466,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-rubiks-cube" = callPackage
+    ({ mkDerivation, base, data-default-class, diagrams-lib, lens }:
+     mkDerivation {
+       pname = "diagrams-rubiks-cube";
+       version = "0.1.0.0";
+       sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv";
+       buildDepends = [ base data-default-class diagrams-lib lens ];
+       homepage = "https://github.com/timjb/rubiks-cube";
+       description = "Library for drawing the Rubik's Cube";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "diagrams-svg" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg
      , bytestring, colour, containers, diagrams-core, diagrams-lib
@@ -44273,8 +44340,8 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
      mkDerivation {
        pname = "farmhash";
-       version = "0.1.0.1";
-       sha256 = "1dm3msrlrfhm20qc1d5a42w4sspmdwgmdkm75xprmyvpyivh2alb";
+       version = "0.1.0.2";
+       sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq";
        buildDepends = [ base bytestring ];
        testDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/abhinav/haskell-farmhash";
@@ -44892,6 +44959,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "feldspar-signal" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "feldspar-signal";
+       version = "0.0.0.1";
+       sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx";
+       buildDepends = [ base ];
+       homepage = "https://github.com/markus-git/feldspar-signal";
+       description = "Signal Processing extension for Feldspar";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fences" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48097,12 +48176,13 @@ self: {
     ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
      mkDerivation {
        pname = "gearbox";
-       version = "1.0.0.2";
-       sha256 = "15ip1vb1b82ympfylm1m1hxw2nkcmhnqhj2bl4v8mw61zcvznky7";
+       version = "1.0.0.3";
+       sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base GLUT OpenGLRaw Vec ];
        jailbreak = true;
+       homepage = "http://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -48243,8 +48323,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.1.0.0";
-       sha256 = "0ssyrdn0cqm7gq3rp3dqkg7il2llagdri719z03ywj96qjh4vxw5";
+       version = "0.1.0.1";
+       sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95";
        buildDepends = [ base linear spatial-math ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -48782,8 +48862,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-core-html";
-       version = "0.1.1";
-       sha256 = "0l0474kpzvzzwkbz9mcjl4fnasznb1crynjcsk3hmnjq8syhmm97";
+       version = "0.1.2";
+       sha256 = "1yhyi99cbnfk2a65j9v6hinp0rpmc341z55dvqvli1wx5c9i7gf6";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -48879,16 +48959,19 @@ self: {
 
   "ghc-exactprint" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
-     , ghc-paths, ghc-syb-utils, HUnit, mtl, random, syb
+     , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.1.0.1";
-       sha256 = "0z6ff4pf3dnz8slg7sfmq86ygzxqn87idv5d63h4qyg8pwvv6zvx";
-       buildDepends = [ base containers ghc ghc-paths syb ];
+       version = "0.1.1.0";
+       sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l";
+       buildDepends = [
+         base containers directory filepath ghc ghc-paths ghc-syb-utils mtl
+         syb
+       ];
        testDepends = [
          base containers directory filepath ghc ghc-paths ghc-syb-utils
-         HUnit mtl random syb
+         HUnit mtl random stm syb
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -49316,8 +49399,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.3.5";
-       sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx";
+       version = "0.3.6";
+       sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -50171,8 +50254,8 @@ self: {
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7.2.3";
-       sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b";
+       version = "0.7.2.4";
+       sha256 = "0kv8yyxixhhiqbicyd1w1fmpv7szf5h5wxs8b57sf76hww7gq0fn";
        buildDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -52472,13 +52555,12 @@ self: {
     ({ mkDerivation, base, cairo, containers, filepath, gtk }:
      mkDerivation {
        pname = "gulcii";
-       version = "0.2.0.1";
-       sha256 = "0r368b4gw32yxi7xx85ljaw72plbw1i659kwjqiigmd2s54ids5h";
+       version = "0.2.0.3";
+       sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base cairo containers filepath gtk ];
-       jailbreak = true;
-       homepage = "http://gitorious.org/maximus/gulcii";
+       homepage = "http://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -53269,8 +53351,8 @@ self: {
      }:
      mkDerivation {
        pname = "hack2-handler-snap-server";
-       version = "2014.11.17";
-       sha256 = "0cfc2d6px0n33a3wl7s7k0l7nq9rfi1lxchlwjjb6wyp4f6mg4bb";
+       version = "2015.3.9";
+       sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7";
        buildDepends = [
          air base blaze-builder bytestring case-insensitive containers
          data-default directory enumerator hack2 mtl network snap-core
@@ -54025,8 +54107,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.6.6.0";
-       sha256 = "1bjrj6q215c3abwnf7y39731n598jqi4hr3pajkl0qm2n1rfkyxb";
+       version = "4.6.7.0";
+       sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -54045,7 +54127,6 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time
        ];
-       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -54406,16 +54487,16 @@ self: {
 
   "handsy" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, operational
-     , process, process-extras, retry, shell-escape, split, tasty
-     , tasty-hunit, tasty-th, transformers
+     , process-extras, retry, shell-escape, split, tasty, tasty-hunit
+     , tasty-th, transformers
      }:
      mkDerivation {
        pname = "handsy";
-       version = "0.0.12";
-       sha256 = "0awiffsgwa2vmib9yq9zamkr4zm1vw9xxj3g47d1ljq3jg93nn3f";
+       version = "0.0.13";
+       sha256 = "0v79p5gcz9b0s2x910ddhcpxxagiyx59zajxndikp9a0nxx8x0l5";
        buildDepends = [
-         base bytestring data-default-class operational process
-         process-extras retry shell-escape split transformers
+         base bytestring data-default-class operational process-extras retry
+         shell-escape split transformers
        ];
        testDepends = [ base bytestring tasty tasty-hunit tasty-th ];
        homepage = "https://github.com/utdemir/handsy";
@@ -56220,8 +56301,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.0.10";
-       sha256 = "0av67yxcnnamg0420v9wzydnm07hfkc58zs0fn6827zrxmxzqcv2";
+       version = "0.3.0.12";
+       sha256 = "1kh1xglqcz8yg1660ham0k4y0mxs63x75hv9xxjk2ms5386jpj6c";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base monad-control mtl resourcet
@@ -59293,8 +59374,8 @@ self: {
      }:
      mkDerivation {
        pname = "here";
-       version = "1.2.6";
-       sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif";
+       version = "1.2.7";
+       sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6";
        buildDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
@@ -61253,8 +61334,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlibBladeRF";
-       version = "0.1.0.4";
-       sha256 = "0xs56kszgwm2hz1fl2cajzbygm8n3883bz3j7qqckw14iw81c25b";
+       version = "0.1.0.6";
+       sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw";
        buildDepends = [ base bindings-DSL bytestring ];
        testDepends = [ base hlint ];
        pkgconfigDepends = [ libbladeRF ];
@@ -66707,8 +66788,8 @@ self: {
      }:
      mkDerivation {
        pname = "htsn-import";
-       version = "0.2.3";
-       sha256 = "1c10p1l5rm98c4gyxhmxkhmlv3w6068ca399xjb762wp72xsyz8n";
+       version = "0.2.4";
+       sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -66762,8 +66843,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.8";
-       sha256 = "10vflra58ndyq861zswshpcnqdx9acglb2m8f2yzha0slihwda77";
+       version = "0.4.8.1";
+       sha256 = "08dd730ix5j0y7jrzrb8d0i153g2jmvklj97npdizmqhwxjfwiis";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive clock containers cookie data-default-class deepseq
@@ -68344,6 +68425,7 @@ self: {
          base hydrogen-cli-args hydrogen-data hydrogen-multimap
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
        ];
+       jailbreak = true;
        homepage = "https://scravy.de/hydrogen-cli/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
@@ -68360,6 +68442,7 @@ self: {
        buildDepends = [
          base containers hydrogen-multimap hydrogen-prelude
        ];
+       jailbreak = true;
        homepage = "https://scravy.de/hydrogen-cli-args/";
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
@@ -68372,6 +68455,7 @@ self: {
        version = "0.14";
        sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
        buildDepends = [ base hydrogen-parsing hydrogen-prelude ];
+       jailbreak = true;
        homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
@@ -68396,6 +68480,7 @@ self: {
        version = "0.14";
        sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy";
        buildDepends = [ base containers hydrogen-prelude parsec ];
+       jailbreak = true;
        homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
@@ -68409,8 +68494,8 @@ self: {
      }:
      mkDerivation {
        pname = "hydrogen-prelude";
-       version = "0.14";
-       sha256 = "05xpxgvpllay8rqs5hbkr5pf8i1aanr72651xkz02qp864g0i822";
+       version = "0.15";
+       sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f";
        buildDepends = [
          array base cereal containers directory filepath hashable
          hydrogen-multimap hydrogen-version network nicify process random
@@ -68434,6 +68519,7 @@ self: {
          base containers hydrogen-parsing hydrogen-prelude nicify parsec
          uuid
        ];
+       jailbreak = true;
        homepage = "https://scravy.de/hydrogen-syntax/";
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
@@ -68613,8 +68699,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyphenation";
-       version = "0.4.2";
-       sha256 = "05nhspfsf6nzkv9jivzrf39l24mmm7sb3p8k3sabgb058k3a4h28";
+       version = "0.4.2.1";
+       sha256 = "069mbxdjlj36lyxr8bqkh1d05bhly64wk5lk71mz73lzcyaivcxi";
        buildDepends = [ base containers unordered-containers ];
        testDepends = [
          base containers directory doctest filepath unordered-containers
@@ -71711,8 +71797,8 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.2";
-       sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr";
+       version = "1.3";
+       sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Cabal ];
@@ -73141,8 +73227,8 @@ self: {
      }:
      mkDerivation {
        pname = "keter";
-       version = "1.3.8";
-       sha256 = "1128ik8ad4s5nd2c4vjs7nm9db44hyd6w0z19642klyrxlhmr67w";
+       version = "1.3.9.1";
+       sha256 = "0b86f7j9yr4q24q88fwd2j4disns8mcwabrqgcz3hghrh6rhpgg9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -73781,6 +73867,7 @@ self: {
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/laika";
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
@@ -74849,14 +74936,14 @@ self: {
      , hslogger, hslua, hspec, http-conduit, http-types, HUnit, iconv
      , lens, lens-aeson, luautils, mtl, operational
      , optparse-applicative, parallel-io, parsec, parsers, pcre-utils
-     , process, regex-pcre-builtin, scientific, split, stateWriter, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
+     , process, regex-pcre-builtin, scientific, split, stm
+     , strict-base-types, temporary, text, time, transformers-compat
+     , unix, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.0.1";
-       sha256 = "1bhhbr50xzb095nikfhc99sd5qmhzd81rg0z922x807r38kkdgnx";
+       version = "1.1.0";
+       sha256 = "1mda3ip071qx7xfhv3d4q1pdivhycsdk9fxykm7hcs9a7a4c5jls";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74865,14 +74952,13 @@ self: {
          Glob hashable hruby hslogger hslua hspec http-conduit http-types
          iconv lens lens-aeson luautils mtl operational optparse-applicative
          parallel-io parsec parsers pcre-utils process regex-pcre-builtin
-         scientific split stateWriter stm strict-base-types text time
-         transformers unix unordered-containers vector yaml
+         scientific split stm strict-base-types text time
+         transformers-compat unix unordered-containers vector yaml
        ];
        testDepends = [
          ansi-wl-pprint base Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -75554,7 +75640,7 @@ self: {
        pname = "lens";
        version = "4.7";
        sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s";
-       editedCabalFile = "a991d37b9cd348226fcdd0b99b079bede892c172b1ddf8a88142b01f80cd5775";
+       editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725";
        buildDepends = [
          array base bifunctors bytestring comonad containers contravariant
          distributive exceptions filepath free ghc-prim hashable mtl
@@ -75589,6 +75675,7 @@ self: {
        pname = "lens";
        version = "4.8";
        sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr";
+       editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33";
        buildDepends = [
          array base bifunctors bytestring comonad containers contravariant
          distributive exceptions filepath free ghc-prim hashable
@@ -76919,8 +77006,8 @@ self: {
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.4.0.0";
-       sha256 = "0kq4xcpgzrpadibh5ahli5pvb5rd9h1gnd1dzxddjz3plgxil803";
+       version = "0.4.0.1";
+       sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my";
        buildDepends = [
          base containers free hoopl linearscan transformers
        ];
@@ -78123,8 +78210,8 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "logfloat";
-       version = "0.13.0.1";
-       sha256 = "1v8n4x3mspsf5q0b9xf5rf8c6xwqc5qvyv1s0zjsqw823i2vkgag";
+       version = "0.13.1";
+       sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8";
        buildDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
@@ -78746,8 +78833,8 @@ self: {
     ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
      mkDerivation {
        pname = "lucid-svg";
-       version = "0.4.0.3";
-       sha256 = "0fr8f641rkazi4ff5s0gr72v5chd2f7dl600v8rj4fp2vmxwwhjc";
+       version = "0.4.0.4";
+       sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12";
        buildDepends = [ base blaze-builder lucid text transformers ];
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
@@ -79046,6 +79133,7 @@ self: {
        pname = "machines";
        version = "0.4.1";
        sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb";
+       editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8";
        buildDepends = [
          base comonad containers free mtl pointed profunctors semigroups
          transformers void
@@ -81022,6 +81110,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mgeneric" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl, template-haskell }:
+     mkDerivation {
+       pname = "mgeneric";
+       version = "0.0.0.0";
+       sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk";
+       buildDepends = [ base containers lens mtl template-haskell ];
+       homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/";
+       description = "Generics with multiple parameters";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mi" = callPackage
     ({ mkDerivation, base, haskell-src-meta, parsec, split
      , template-haskell
@@ -84418,6 +84518,7 @@ self: {
          async base contravariant managed mmorph pipes pipes-concurrency
          transformers
        ];
+       jailbreak = true;
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84573,7 +84674,7 @@ self: {
        homepage = "https://github.com/bos/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) mysql;  inherit (pkgs) zlib;};
+     }) { mysql = null;  inherit (pkgs) zlib;};
 
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
@@ -85583,6 +85684,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-anonymous-i2p" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, exceptions, hspec
+     , hspec-attoparsec, hspec-expectations, mtl, network
+     , network-attoparsec, network-simple, text, transformers, uuid
+     }:
+     mkDerivation {
+       pname = "network-anonymous-i2p";
+       version = "0.9.2";
+       sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8";
+       buildDepends = [
+         attoparsec base bytestring exceptions mtl network
+         network-attoparsec network-simple text transformers uuid
+       ];
+       testDepends = [
+         attoparsec base bytestring exceptions hspec hspec-attoparsec
+         hspec-expectations mtl network network-simple transformers uuid
+       ];
+       homepage = "http://github.com/solatis/haskell-network-anonymous-i2p";
+       description = "Haskell API for I2P anonymous networking";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "network-api-support" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , case-insensitive, http-client, http-client-tls, http-types, text
@@ -85689,8 +85812,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-conduit-tls";
-       version = "1.1.0.2";
-       sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax";
+       version = "1.1.1";
+       sha256 = "0wq074k6nwn3h1ww1an7n6i9zx6ii9hsm9vw6x51w22mp787dj1p";
        buildDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
          data-default monad-control network streaming-commons system-fileio
@@ -86744,15 +86867,15 @@ self: {
      }) {};
 
   "not-gloss" = callPackage
-    ({ mkDerivation, base, binary, cereal, GLUT, OpenGLRaw
-     , spatial-math, time
+    ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT
+     , OpenGLRaw, spatial-math, time
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.0.2";
-       sha256 = "1mizah0fwpk3nqk772qmp225kpbwbhikr70qrjzwgmlak9n8f54y";
+       version = "0.7.1.1";
+       sha256 = "0mkjzw3n4a5zi9ygpys1w2xdvdycvgylflz8fj6sxdc3r9m1icy9";
        buildDepends = [
-         base binary cereal GLUT OpenGLRaw spatial-math time
+         base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time
        ];
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -87621,6 +87744,7 @@ self: {
        version = "0.5";
        sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91";
        buildDepends = [ base contravariant ghc-prim transformers ];
+       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
@@ -87696,7 +87820,7 @@ self: {
        pname = "opaleye";
        version = "0.3.1";
        sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905";
-       editedCabalFile = "aad8d4a8bcd52a4668a5f04362af0a1443924b44369f753a184ae170a9a5ca9d";
+       editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd";
        buildDepends = [
          attoparsec base case-insensitive contravariant old-locale
          postgresql-simple pretty product-profunctors profunctors semigroups
@@ -89950,8 +90074,8 @@ self: {
     ({ mkDerivation, base, doctest, primitive, random, time }:
      mkDerivation {
        pname = "pcg-random";
-       version = "0.1.0.1";
-       sha256 = "00w6r2zpw5h2db7h8k3y6l1kryi8jvn1rf5wamx0a634ga606czc";
+       version = "0.1.1.0";
+       sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61";
        buildDepends = [ base primitive random time ];
        testDepends = [ base doctest ];
        homepage = "http://github.com/cchalmers/pcg-random";
@@ -90921,17 +91045,19 @@ self: {
      }) {};
 
   "pgdl" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, configurator, directory
-     , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui
+    ({ mkDerivation, array, base, bytestring, Cabal, configurator
+     , directory, filepath, HTTP, network-uri, process, tagsoup, text
+     , vty, vty-ui
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "7.6";
-       sha256 = "1vgvf7xbzkmb5nbxgaf552i18p22pkj9wgyz3mhbg1m0j2jr1dnj";
+       version = "7.77";
+       sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk";
+       editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring Cabal configurator directory filepath HTTP
+         array base bytestring Cabal configurator directory filepath HTTP
          network-uri process tagsoup text vty vty-ui
        ];
        description = "pgdownloader";
@@ -93367,8 +93493,8 @@ self: {
      }:
      mkDerivation {
        pname = "prednote";
-       version = "0.30.0.0";
-       sha256 = "0srmjh4hzsg341bjgixz4kvhlc15bbzyx2spcd8hi25m0l0ji0m9";
+       version = "0.32.0.0";
+       sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -93591,13 +93717,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pretty_1_1_2_1" = callPackage
+  "pretty_1_1_3_1" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "pretty";
-       version = "1.1.2.1";
-       sha256 = "128bgw9qgm256f28ffb49dvqs9js01m9q6mj6dhg4nlcbpz5fhav";
-       editedCabalFile = "ebd25419c2eacdf4212ba30592975908255c84b928a228fe5b045bc4f32c102a";
+       version = "1.1.3.1";
+       sha256 = "0v1g7gr8nki1bka5dxagayx9azj2gyyd5y23202pnk53synj2lzh";
        buildDepends = [ base deepseq ghc-prim ];
        testDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
@@ -94184,7 +94309,7 @@ self: {
        pname = "product-profunctors";
        version = "0.6";
        sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4";
-       editedCabalFile = "d0b625cde02d967598b57bca429c61e9496b164b36db238b8f896d649230f4d1";
+       editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca";
        buildDepends = [ base contravariant profunctors template-haskell ];
        testDepends = [ base profunctors ];
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
@@ -94473,8 +94598,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.1.0";
-       sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4";
+       version = "2.2.0";
+       sha256 = "15y4affp5bipjg33ybkm8wwms54cx8a0dh8c9c328dz9x7cf9bgp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -97008,6 +97133,7 @@ self: {
        version = "1.0.1.0";
        sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8";
        buildDepends = [ base readline StateVar ];
+       jailbreak = true;
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97083,10 +97209,8 @@ self: {
      }:
      mkDerivation {
        pname = "record";
-       version = "0.2.1";
-       sha256 = "12swkcpzcif5bzfp961fx75a7bi0x79z6f16qh7im41amy2zpg19";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0";
+       sha256 = "0kyhvdpk6xr111yyd828f6sdfc4f7ayhdmwsyml6j4c7npxb1g6i";
        buildDepends = [
          attoparsec base base-prelude template-haskell text transformers
        ];
@@ -99098,9 +99222,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.17.0.0";
-       sha256 = "1z0227d43dj3c1yh74lh71qihggj21pl7i6mwarb6kam2ziwp7mk";
-       editedCabalFile = "4940711977084fce3b86efa958906ba38df63ac450eaf7093ef36268a4c25fe7";
+       version = "0.17.0.1";
+       sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -99111,7 +99234,6 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
-       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102209,8 +102331,8 @@ self: {
      }:
      mkDerivation {
        pname = "search";
-       version = "0.1";
-       sha256 = "1d996dkirvv22kkli5vpaxy2ismyiwd4jyzfvbxyqc79lqanf2gh";
+       version = "0.1.0.1";
+       sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw";
        buildDepends = [
          base ghc-prim profunctors semigroupoids tagged transformers
        ];
@@ -102601,8 +102723,8 @@ self: {
      }:
      mkDerivation {
        pname = "semver";
-       version = "0.3.1";
-       sha256 = "0vakqqdhjn7a049k1sx86ah5x85c005hrxri2xl9qcd690bvrs6f";
+       version = "0.3.2";
+       sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz";
        buildDepends = [ attoparsec base deepseq text ];
        testDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/semver";
@@ -104513,14 +104635,13 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.3.0";
-       sha256 = "0blr8j52q8q1mdmb66byll3pnhzqmrlwc8jjz40km86bj73n1c7h";
+       version = "0.3.1";
+       sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld";
        buildDepends = [
          base containers deepseq directory filepath
          MonadCatchIO-transformers mtl old-locale SafeSemaphore text time
          transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -105653,9 +105774,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "0.13.3.2";
-       sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp";
-       editedCabalFile = "2ffeb6e3e6d6d54819bc8c7d58c4bdabf1911599c4e83ededbda4f5719c0298f";
+       version = "0.14.0";
+       sha256 = "11vf7v1aqbm1lzb5jjjna6j8gj7757xkc8zk820z9d73ak8bq7m8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -105791,6 +105911,7 @@ self: {
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
@@ -105825,6 +105946,7 @@ self: {
          async base containers monad-loops MonadCatchIO-transformers snap
          stm time transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
@@ -106000,6 +106122,7 @@ self: {
        sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
        editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7";
        buildDepends = [ acid-state base snap text ];
+       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -106099,6 +106222,7 @@ self: {
          base bytestring css-text directory filepath lens snap text
          utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/zmthy/snaplet-css-min";
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
@@ -106128,8 +106252,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-fay";
-       version = "0.3.3.10";
-       sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll";
+       version = "0.3.3.11";
+       sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr";
        buildDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -106394,6 +106518,7 @@ self: {
          MonadCatchIO-transformers mtl postgresql-simple
          resource-pool-catchio snap text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -106445,6 +106570,7 @@ self: {
          aeson base blaze-builder bytestring configurator heist http-conduit
          lens MonadCatchIO-transformers mtl snap text
        ];
+       jailbreak = true;
        homepage = "http://github.com/mikeplus64/snaplet-recaptcha";
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -106461,6 +106587,7 @@ self: {
        buildDepends = [
          base configurator hedis lens mtl network snap text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dzhus/snaplet-redis/";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -106602,6 +106729,7 @@ self: {
          SafeSemaphore snap snap-core sqlite-simple stm test-framework
          test-framework-hunit text time transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -114312,18 +114440,20 @@ self: {
      }) {};
 
   "threads-supervisor" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty
+    ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty
      , tasty-hunit, tasty-quickcheck, time, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.2.0";
-       sha256 = "1k8p8l8fvvc9qrw0qgbbfy9r6h3i1mfkmfzy1g2rsq9kcsc0821r";
-       buildDepends = [ base stm time unordered-containers ];
+       version = "1.0.3.0";
+       sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base retry stm time unordered-containers ];
        testDepends = [
-         base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck
-         time transformers
+         base bytestring QuickCheck retry stm tasty tasty-hunit
+         tasty-quickcheck time transformers
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
        license = stdenv.lib.licenses.mit;
@@ -114562,14 +114692,14 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.4.29";
-       sha256 = "05p6iga6lzshk6vzywpxd6g53r7hqyvs1rq90v00lpxkiwyqxs6i";
+       version = "0.4.30";
+       sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
          websockets
        ];
-       homepage = "http://yaxu.org/tidal/";
+       homepage = "http://tidal.lurk.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117961,8 +118091,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.0.2.1";
-       sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i";
+       version = "0.1";
+       sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q";
        buildDepends = [
          base containers contravariant mtl transformers transformers-compat
        ];
@@ -119926,16 +120056,17 @@ self: {
      }) {};
 
   "validate-input" = callPackage
-    ({ mkDerivation, base, bytestring, either, mtl, pcre-heavy
-     , stringable, text
+    ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy
+     , QuickCheck, stringable, text
      }:
      mkDerivation {
        pname = "validate-input";
-       version = "0.1.0.0";
-       sha256 = "1xbpgc2zkaszjydy15ir11vlrwg4pgclm6ldnjxmv3p2v1cswxq6";
+       version = "0.2.0.0";
+       sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls";
        buildDepends = [
          base bytestring either mtl pcre-heavy stringable text
        ];
+       testDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/agrafix/validate-input";
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
@@ -120120,8 +120251,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache-trie";
-       version = "0.1";
-       sha256 = "0aln3vin1jah4c7hnhdbm4w5vsiqf3kgf48z6xdyzc0zwhv7mf1k";
+       version = "0.1.1";
+       sha256 = "12nfik4fp5snxf8w3kp6r6v327i9izs18aflj90ib0gq267qrlnk";
        buildDepends = [ array base bytestring bytestring-builder vcache ];
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
@@ -121759,23 +121890,22 @@ self: {
      }) {};
 
   "wai-middleware-throttle" = callPackage
-    ({ mkDerivation, base, bytestring, haddock, hlint, hspec
-     , http-types, HUnit, network, process, regex-compat, stm, text
-     , token-bucket, transformers, unordered-containers, wai, wai-extra
+    ({ mkDerivation, base, bytestring, containers, haddock, hlint
+     , hspec, http-types, HUnit, network, process, regex-compat, stm
+     , token-bucket, transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-middleware-throttle";
-       version = "0.1.0.1";
-       sha256 = "1404i9f8pcvhpa2kjz5rc7r18f5dk7889v576i5k41faxb749ig0";
+       version = "0.2.0.0";
+       sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74";
        buildDepends = [
-         base bytestring http-types network stm text token-bucket
-         transformers unordered-containers wai
+         base containers http-types network stm token-bucket transformers
+         wai
        ];
        testDepends = [
          base bytestring haddock hlint hspec http-types HUnit process
-         regex-compat stm transformers unordered-containers wai wai-extra
+         regex-compat stm transformers wai wai-extra
        ];
-       jailbreak = true;
        description = "WAI Middleware for Request Throttling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122067,6 +122197,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "waitra" = callPackage
+    ({ mkDerivation, aeson, base, http-types, regex-applicative, tasty
+     , tasty-hunit, text, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "waitra";
+       version = "0.0.2.0";
+       sha256 = "1hzwxwaw5w38bmsyh15mggrawjbfn1bnkjjjv4aigynv19kdjf03";
+       buildDepends = [
+         aeson base http-types regex-applicative text wai
+       ];
+       testDepends = [
+         aeson base http-types regex-applicative tasty tasty-hunit wai
+         wai-extra
+       ];
+       homepage = "https://github.com/futurice/waitra";
+       description = "A very simple Wai router";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec
@@ -122137,8 +122287,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.2";
-       sha256 = "1jhra0iq7iph4cn5lq98892rapzws2nsf1pyb70gpww4l3bgjfzd";
+       version = "3.0.3";
+       sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -123184,13 +123334,13 @@ self: {
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.1.1.1";
-       sha256 = "1i0jvxc1llcq5aayzgqhkz51mqh96pdadml6gi94h2z3yj20nicg";
+       version = "0.1.2.1";
+       sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52";
        buildDepends = [
          base containers hashable transformers unordered-containers vector
        ];
        homepage = "https://github.com/fumieval/witherable";
-       description = "Generalization of catMaybes";
+       description = "Generalization of filter and catMaybes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -124144,8 +124294,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.2.0";
-       sha256 = "1388nw6ikk8myqq9h9if3fkdlxhzj7fs9l3hyfiv77k499j3iln9";
+       version = "0.2.1";
+       sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -126326,8 +126476,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.4";
-       sha256 = "0xd5rx9gpaj8m5v1ln3lgi6xhk2lw43c8ykdiqhp3583aybjkvnm";
+       version = "1.4.5";
+       sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -126401,8 +126551,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.8.1";
-       sha256 = "1ynhxzc4q80zamyyabjhiz7mgh7wjzqm23xlx67x7lpwz0q18hpb";
+       version = "1.4.8.2";
+       sha256 = "0syfgwyj5cgs2rl26g8mz2sz3vr39g813ljz441asrqv80mz4xww";
        buildDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
@@ -126579,8 +126729,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-form";
-       version = "1.4.4";
-       sha256 = "1vy4gscw3rgglbiq0v4l0zjmvan2sk6sgd93402hw64xwxwzc35c";
+       version = "1.4.4.1";
+       sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html blaze-markup
          byteable bytestring containers data-default email-validate
@@ -127881,7 +128031,7 @@ self: {
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { zeromq = null;};
+     }) { inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, lifted-base
@@ -127923,7 +128073,7 @@ self: {
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { zeromq = null;};
+     }) { inherit (pkgs) zeromq;};
 
   "zeromq4-haskell" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
@@ -127944,7 +128094,7 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
-     }) { zeromq = null;};
+     }) { inherit (pkgs) zeromq;};
 
   "zeroth" = callPackage
     ({ mkDerivation, base, Cabal, derive, directory, filepath