Merge remote-tracking branch 'upstream/master' into staging

4 files changed, 663 insertions, 318 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ef71e1ed0888..27079cea8691 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -22,8 +22,8 @@ self: super: {
   statistics = dontCheck super.statistics;
   text = dontCheck super.text;
 
-  # https://github.com/bartavelle/hruby/issues/10
-  hruby = addExtraLibrary super.hruby pkgs.ruby_2_1;
+  # The package doesn't compile with ruby 1.9, which is our default at the moment.
+  hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
 
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
@@ -155,9 +155,11 @@ self: super: {
     patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal";
   });
 
-  # The test suite imposes too narrow restrictions on the version of
-  # Cabal that can be used to build this package.
-  cabal-test-quickcheck = dontCheck super.cabal-test-quickcheck;
+  # Needs the latest version of QuickCheck to compile.
+  cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; };
+
+  # https://github.com/massysett/rainbox/issues/1
+  rainbox = dontCheck super.rainbox;
 
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;
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 9a05a2511370..0e4fd3cc5d1f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -329,4 +329,9 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
+  # https://github.com/bos/wreq/issues/61
+  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
+  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
+  hipbot = dontDistribute super.hipbot;
+
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4bd22feda5c3..04293b81fe70 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1007,6 +1007,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "BCMtools" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-lexing
+     , colour, conduit, conduit-extra, data-binary-ieee754
+     , data-default-class, matrices, optparse-applicative, resourcet
+     , split, transformers, unordered-containers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "BCMtools";
+       version = "0.1.0";
+       sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base binary bytestring bytestring-lexing colour conduit
+         conduit-extra data-binary-ieee754 data-default-class matrices
+         optparse-applicative resourcet split transformers
+         unordered-containers vector zlib
+       ];
+       description = "Big Contact Map Tools";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "BNFC" = callPackage
     ({ mkDerivation, alex, array, base, containers, deepseq, directory
      , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process
@@ -1619,6 +1641,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "BufferedSocket" = callPackage
+    ({ mkDerivation, base, bytestring, network, text }:
+     mkDerivation {
+       pname = "BufferedSocket";
+       version = "0.1.1.0";
+       sha256 = "1j0v2g7p8fmjgcdd10wfinakiviv9r1bh3mw897gsk1h5ycbxfjg";
+       buildDepends = [ base bytestring network text ];
+       jailbreak = true;
+       description = "A socker wrapper that makes the IO of sockets much cleaner";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Buster" = callPackage
     ({ mkDerivation, base, bytestring, conduit, data-default, errors
      , hinotify, hslogger, hspec, hspec-expectations, http-conduit
@@ -2874,19 +2908,20 @@ self: {
 
   "CouchDB" = callPackage
     ({ mkDerivation, base, bytestring, containers, HTTP, HUnit, json
-     , mtl, network, utf8-string
+     , mtl, network, network-uri, utf8-string
      }:
      mkDerivation {
        pname = "CouchDB";
-       version = "1.2";
-       sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
+       version = "1.2.1";
+       sha256 = "0hj1rml9pf9knwm3grwrkizjricc7bchsi6m7dgjlfh81q247jp4";
        buildDepends = [
-         base bytestring containers HTTP json mtl network utf8-string
+         base bytestring containers HTTP json mtl network network-uri
+         utf8-string
        ];
        testDepends = [
-         base bytestring containers HTTP HUnit json mtl network utf8-string
+         base bytestring containers HTTP HUnit json mtl network network-uri
+         utf8-string
        ];
-       jailbreak = true;
        homepage = "http://github.com/arjunguha/haskell-couchdb/";
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
@@ -3897,12 +3932,12 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, containers, kan-extensions, ListLike }:
+    ({ mkDerivation, base, containers, ListLike }:
      mkDerivation {
        pname = "Earley";
-       version = "0.6.0";
-       sha256 = "0fqiiqrmrnb7zmk61bjnc98y30jvrd0yqflsk8mcnkfahbhhsc5w";
-       buildDepends = [ base containers kan-extensions ListLike ];
+       version = "0.7.0";
+       sha256 = "1jjyrf56crk4zxp7kw148969hjvl5hj248xv3495xb188s610y72";
+       buildDepends = [ base containers ListLike ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6639,12 +6674,15 @@ self: {
      mkDerivation {
        pname = "HList";
        version = "0.3.4.1";
+       revision = "1";
        sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2";
+       editedCabalFile = "b3eec9db43bda99e47b409bc7f188e89899f0e13854de02674be6d0d24eef4f6";
        buildDepends = [ base ghc-prim mtl tagged template-haskell ];
        testDepends = [
          base cmdargs directory doctest filepath hspec lens mtl process syb
        ];
        buildTools = [ diffutils ];
+       jailbreak = true;
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) diffutils;};
@@ -10629,15 +10667,14 @@ self: {
      }:
      mkDerivation {
        pname = "Network-NineP";
-       version = "0.2.0";
-       sha256 = "0pa0j9ljq32dikffwi3n1cifilb2586z3q004rqa0sq82zyah949";
+       version = "0.3.0";
+       sha256 = "02igsbmhkpkaxdpdhkl6vb7kzryhg7p5bb59irykz0dkg095wr89";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base binary bytestring containers convertible monad-loops mstate
          mtl network NineP regex-posix stateref transformers
        ];
-       jailbreak = true;
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14664,8 +14701,8 @@ self: {
      }:
      mkDerivation {
        pname = "UISF";
-       version = "0.3.0.1";
-       sha256 = "0qfhcc0ii7nncfsyxvafwbrx8j6jjdc0jrj56g8jm8vmzsa082kp";
+       version = "0.3.0.2";
+       sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46";
        buildDepends = [
          arrows base containers deepseq GLFW OpenGL stm transformers
        ];
@@ -17361,21 +17398,20 @@ self: {
      }) {};
 
   "aeson-t" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec2, text
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-t";
-       version = "0.0.4";
-       sha256 = "0y4mbn1xb288amgy8j6p5x9ih873qwiwrialfchc8ryg0n8syp8r";
+       version = "0.0.5";
+       sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd";
        buildDepends = [
          aeson base bytestring text unordered-containers vector
        ];
        testDepends = [
-         aeson aeson-qq base bytestring hspec2 text unordered-containers
+         aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/begriffs/aeson-t";
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
@@ -17512,8 +17548,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "agum";
-       version = "2.5";
-       sha256 = "0acirnqsm7mrz6pgy9nabn23bmljdcz08b3ahak4ma5lcm5bql9q";
+       version = "2.6";
+       sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers ];
@@ -18019,8 +18055,8 @@ self: {
      }:
      mkDerivation {
        pname = "alms";
-       version = "0.6.5";
-       sha256 = "12hnhz1lz9wb4s95b9via1nkfgmgmr7p1wc9k4bcvsm778j920s8";
+       version = "0.6.7";
+       sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -18028,7 +18064,7 @@ self: {
          incremental-sat-solver mtl network parsec pretty QuickCheck random
          stm syb template-haskell transformers tuple
        ];
-       homepage = "http://www.ccs.neu.edu/~tov/pubs/alms";
+       homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/";
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21079,8 +21115,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.0.1";
-       sha256 = "0x5q3aqsqi10plrwdpcprpvc9fd6vq0ar4f4am5kv5zs1h0yjvfd";
+       version = "0.4.0.2";
+       sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp";
        buildDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -21763,8 +21799,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.4";
-       sha256 = "0bd424ls3kfqx2y7fzcmhssss3r3bhra8bzmllx1slb1x04apgn6";
+       version = "0.0.5";
+       sha256 = "17291lzz09d5rpz62395jfqkwc06sp8pwd8wq04wycsk0hizz32i";
        buildDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
          cryptohash inflections influxdb MonadRandom mtl network
@@ -22037,8 +22073,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-kinesis-client";
-       version = "0.4.0.0";
-       sha256 = "1jmm83pciv4mfknwj9z57kbq4siikfad21xhysnhwrpm2maqswa4";
+       version = "0.4.0.1";
+       sha256 = "1ky05hq0fs500jbf840ap6ji4vq26vn50w5cz8nqfz416jdjgx7r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22049,7 +22085,6 @@ self: {
          resourcet stm stm-chans stm-queue-extras text transformers
          unordered-containers
        ];
-       jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -22131,8 +22166,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-route53";
-       version = "0.1.1";
-       sha256 = "1nzxs6ff0nh6ncswfnx2gxxmx2by0xxzfpmlkk1cnd9xkz7c8n0k";
+       version = "0.1.2";
+       sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18";
        buildDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -22932,8 +22967,8 @@ self: {
     ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }:
      mkDerivation {
        pname = "base58string";
-       version = "0.9.0";
-       sha256 = "09mkc4fqm897b9msczqpdfipj9kr98pkmq4gbsynksrapiamrgg3";
+       version = "0.9.1";
+       sha256 = "1j7vk3par9z2svq8mwwxm73yd5yks25412l3n9mr081ybvywkckd";
        buildDepends = [ aeson base binary bytestring text ];
        testDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -23027,8 +23062,8 @@ self: {
      }:
      mkDerivation {
        pname = "basic-prelude";
-       version = "0.3.12";
-       sha256 = "1qmwxd8wfszawhfncqhcnbc2h1a47jcqa4zj4pfwybhy3xnn0yns";
+       version = "0.3.13";
+       sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l";
        buildDepends = [
          base bytestring containers hashable lifted-base ReadArgs safe
          system-filepath text transformers unordered-containers vector
@@ -24347,6 +24382,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { fann = null;};
 
+  "bindings-fluidsynth" = callPackage
+    ({ mkDerivation, base, bindings-DSL, fluidsynth }:
+     mkDerivation {
+       pname = "bindings-fluidsynth";
+       version = "0.1.1";
+       sha256 = "04q5zxv4iyjb7zf7bhx19cfc8nhnqxmxnl1q63qszjysmlpy39g5";
+       buildDepends = [ base bindings-DSL ];
+       pkgconfigDepends = [ fluidsynth ];
+       homepage = "http://github.com/bgamari/bindings-fluidsynth";
+       description = "Haskell FFI bindings for fluidsynth software synthesizer";
+       license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) fluidsynth;};
+
   "bindings-friso" = callPackage
     ({ mkDerivation, base, bindings-DSL, friso }:
      mkDerivation {
@@ -25123,6 +25171,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bitcoin-types" = callPackage
+    ({ mkDerivation, base, base58string, binary, bytestring, hexstring
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "bitcoin-types";
+       version = "0.9.0";
+       sha256 = "1y2v4cm00pmysi051z37rsxis0i97bjk5zvybmpxal9g4k8mlbi5";
+       buildDepends = [
+         base base58string binary bytestring hexstring text
+       ];
+       testDepends = [ base base58string bytestring hexstring hspec ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Provides consistent low-level types used commonly among Bitcoin implementations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bitly-cli" = callPackage
     ({ mkDerivation, base, Bitly, directory, filepath, regexpr }:
      mkDerivation {
@@ -27849,8 +27914,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.2.0";
-       sha256 = "06igjmr0n8418wid1pr74cgvlsmwni7ar72g9bddivlbxax1pfli";
+       version = "0.3.3.0";
+       sha256 = "0bvd7qf206slg4ckjc7bjjfrgdxsq3kmb9rp8qp7lfc81ccnr09j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -28193,20 +28258,21 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, classy-prelude-conduit
      , conduit, conduit-extra, containers, directory, filepath
      , http-client, http-client-tls, http-conduit, http-types, network
-     , process, resourcet, shelly, system-fileio, system-filepath, tar
-     , temporary, text, transformers
+     , process, resourcet, shelly, streaming-commons, system-fileio
+     , system-filepath, tar, temporary, text, transformers
      }:
      mkDerivation {
        pname = "cabal-src";
-       version = "0.2.5";
-       sha256 = "07nxnr011i50lpmahvj6q113zd6jmmxv83y4rby2rjnimjvgj3z7";
+       version = "0.2.5.1";
+       sha256 = "0ym5lsgah4aq37mg074ab82kdjxwmcp0qax3jnalk2hvcm531k9z";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal classy-prelude-conduit conduit conduit-extra
          containers directory filepath http-client http-client-tls
          http-conduit http-types network process resourcet shelly
-         system-fileio system-filepath tar temporary text transformers
+         streaming-commons system-fileio system-filepath tar temporary text
+         transformers
        ];
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
@@ -28266,7 +28332,6 @@ self: {
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -29403,8 +29468,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "catamorphism";
-       version = "0.4.0.0";
-       sha256 = "00gyb84jfb19n4g0igm4sikqk2bl96wj9293g82rjxgrk9m19iq7";
+       version = "0.4.0.1";
+       sha256 = "05mpw0dgn5f9gwnk7jkkm5k6fsfhi70i3fr96b6jca7w1b151hn9";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
@@ -30104,17 +30169,12 @@ self: {
      }) {};
 
   "chart-histogram" = callPackage
-    ({ mkDerivation, base, Chart, colour, data-default-class, lens
-     , vector
-     }:
+    ({ mkDerivation, base, Chart }:
      mkDerivation {
        pname = "chart-histogram";
-       version = "0.4.5";
-       sha256 = "0c1y4jaslzxlcmqhj5bgdcx76jw49asmnfgdvfkprf2siq154zba";
-       buildDepends = [
-         base Chart colour data-default-class lens vector
-       ];
-       jailbreak = true;
+       version = "1.0.0";
+       sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5";
+       buildDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30622,8 +30682,8 @@ self: {
     ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }:
      mkDerivation {
        pname = "cipher-aes128";
-       version = "0.7";
-       sha256 = "105400panhmmykbdvfajb4kff4qj24zq2n65qwy2nh8py722nbw0";
+       version = "0.7.0.1";
+       sha256 = "0qknpgg7dimx2nm4bzig7vvzcq3kvbxjv5rb0s4f2ina4vwczbhq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring cereal crypto-api tagged ];
@@ -31926,12 +31986,12 @@ self: {
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, HUnit, text }:
+    ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.3.1";
-       sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb";
-       buildDepends = [ base text ];
+       version = "0.3.2";
+       sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk";
+       buildDepends = [ base bytestring text ];
        testDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
@@ -32076,8 +32136,8 @@ self: {
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
        pname = "cmu";
-       version = "1.9";
-       sha256 = "1mn6l17x7zwhc8wlbfqiaxjsvmwh6j0sr4x3gss1z32n5g03syd0";
+       version = "1.10";
+       sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base containers ];
@@ -32114,8 +32174,8 @@ self: {
      }:
      mkDerivation {
        pname = "cndict";
-       version = "0.5.4";
-       sha256 = "1jza2s9qmmzg4qgq8wpslj71ybbs3b8lk81jfqp70j3dq1zvzhba";
+       version = "0.5.5";
+       sha256 = "0l2fknpg07r5hp2as3irqqa7zik9p8n3jyi74a2b3d001d54gc7z";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
@@ -33478,8 +33538,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4";
-       sha256 = "1vqajj5mwnknqcjc5pj883jz4iwjj6is4jr701bzr0n6ngvn7qvh";
+       version = "1.2.4.1";
+       sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base void
@@ -33619,8 +33679,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.7.2";
-       sha256 = "0nb7sd8a5lbl9frypz9clr808ircln356244nzm7kl5qd53752iw";
+       version = "1.1.7.3";
+       sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -34565,8 +34625,8 @@ self: {
      }:
      mkDerivation {
        pname = "conversion-text";
-       version = "1.0.0.1";
-       sha256 = "0v2vpma9sf0n2fd635zagnfzv1bizys6yf592c2mm7yxanlhj6rp";
+       version = "1.0.0.2";
+       sha256 = "0j7j0jww92v9gldh8hd35p51ka2mq4n26chfw6n4m034q3pjqpby";
        buildDepends = [
          base-prelude bytestring conversion conversion-bytestring text
        ];
@@ -34645,17 +34705,17 @@ self: {
      }) {};
 
   "cookie" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, data-default
-     , deepseq, HUnit, old-locale, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text, time
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text, time
      }:
      mkDerivation {
        pname = "cookie";
-       version = "0.4.1.4";
-       sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d";
+       version = "0.4.1.5";
+       sha256 = "0n1kil6z2sgaj8p67wbi7gaaz5rs78aagcnbk2338xhpd69wgrmn";
        buildDepends = [
-         base blaze-builder bytestring data-default deepseq old-locale text
-         time
+         base blaze-builder bytestring data-default-class deepseq old-locale
+         text time
        ];
        testDepends = [
          base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
@@ -35922,8 +35982,8 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-classical";
-       version = "0.0.3";
-       sha256 = "1k158w6dvnfcfan167lvk2g852fgn0aqsfc7qagxihkbi4l0nrls";
+       version = "0.1.0";
+       sha256 = "06x694ia1alw53a282krzmkbcr1xbvn5nmgfqbgysgpz5ky931wg";
        buildDepends = [
          base bytestring containers crypto-numbers crypto-random lens
          modular-arithmetic QuickCheck random random-shuffle text
@@ -36704,17 +36764,15 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, rtld, time }:
      mkDerivation {
        pname = "curlhs";
-       version = "0.1.4";
+       version = "0.1.5";
        revision = "1";
-       sha256 = "09zsrz2n4rhyscjdykz17dprbapjhgj4nkbpjvj0if7crr4dy5xr";
-       editedCabalFile = "0d7a7a08c0da6d5ee17977e7f821a12bf138019418b559c1295041c6d16b5e46";
+       sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky";
+       editedCabalFile = "54dc0c9c8004df751cde41989c305af8e60e6112def522a07bdaf54fd28f27cd";
        buildDepends = [ base bytestring rtld time ];
        testDepends = [ base hspec ];
-       jailbreak = true;
        homepage = "https://github.com/kkardzis/curlhs";
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "currency" = callPackage
@@ -41801,8 +41859,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.6.0.0";
-       sha256 = "17dbhnwdn89wqm0s8j9zfydi7g6x1wlf1bnjv39qrp7qyr8mm2k5";
+       version = "0.6.0.1";
+       sha256 = "1dx1f647849v5mlsp862x7cmwiygiph9y1fgdfg1xnfshlx6r4qp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -42358,6 +42416,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dove" = callPackage
+    ({ mkDerivation, acl2, base }:
+     mkDerivation {
+       pname = "dove";
+       version = "0.0.0";
+       sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
+       buildDepends = [ acl2 base ];
+       description = "The Dove verification language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dow" = callPackage
     ({ mkDerivation, array, base, directory, elerea, GLFW
      , mersenne-random, OpenGL
@@ -43130,8 +43199,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-graph";
-       version = "0.1.0.7";
-       sha256 = "1jpl8prd18ka8ypkf2ni8i6arfmv9x3d75r7327aalayj3vzap3d";
+       version = "0.1.0.8";
+       sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k";
        buildDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
@@ -44879,8 +44948,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
        pname = "enummapset";
-       version = "0.5.2.0";
-       sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js";
+       version = "0.5.2.1";
+       sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
        buildDepends = [ base containers deepseq ];
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
@@ -45758,6 +45827,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventloop" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, network, suspend, text
+     , timers, websockets
+     }:
+     mkDerivation {
+       pname = "eventloop";
+       version = "0.3.0.0";
+       sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3";
+       buildDepends = [
+         aeson base bytestring network suspend text timers websockets
+       ];
+       jailbreak = true;
+       homepage = "-";
+       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "eventstore" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
      , network, protobuf, random, sodium, text, time, uuid
@@ -46704,12 +46790,12 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, base, containers, parsec, split, text }:
+    ({ mkDerivation, base, containers, parsec, pipes, split, text }:
      mkDerivation {
        pname = "fasta";
-       version = "0.5.3.0";
-       sha256 = "060y8sqbklf7wr8kl2c935cxakykj705f1bbn72c4zcwfdrf5jz4";
-       buildDepends = [ base containers parsec split text ];
+       version = "0.5.4.0";
+       sha256 = "15ff6l8kv6pivl8l9apfpsnn5arwgbhzxi8h4chr05qvanlycvfg";
+       buildDepends = [ base containers parsec pipes split text ];
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -47628,17 +47714,17 @@ self: {
      }) {};
 
   "filediff" = callPackage
-    ({ mkDerivation, base, data-default, data-memocombinators
-     , directory, either, mtl, tasty, tasty-hunit, text, time
-     , transformers, Zora
+    ({ mkDerivation, base, bytestring, data-default
+     , data-memocombinators, directory, either, mtl, rainbow, tasty
+     , tasty-hunit, text, time, transformers, Zora
      }:
      mkDerivation {
        pname = "filediff";
-       version = "0.1.0.7";
-       sha256 = "1anjfh549ah2m8k5ibdgc578pi5phyycxj1avky38w499dadgwfi";
+       version = "0.1.0.8";
+       sha256 = "1wsinnmc5dw4r9wk3ijx9zlzwf0rqsknl6mql28lja2r1m2s2jc3";
        buildDepends = [
-         base data-default data-memocombinators directory either mtl tasty
-         tasty-hunit text time transformers Zora
+         base bytestring data-default data-memocombinators directory either
+         mtl rainbow tasty tasty-hunit text time transformers Zora
        ];
        testDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
@@ -47821,24 +47907,28 @@ self: {
 
   "find-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
-     , directory, doctest, either, exceptions, filepath, hspec, mmorph
-     , monad-control, mtl, regex-posix, semigroups, system-filepath
-     , text, time, transformers, transformers-base, unix
+     , conduit-extra, directory, doctest, either, exceptions, filepath
+     , hspec, mmorph, monad-control, mtl, regex-posix, semigroups
+     , streaming-commons, system-filepath, text, time, transformers
+     , transformers-base, unix, unix-compat
      }:
      mkDerivation {
        pname = "find-conduit";
-       version = "0.4.1";
-       sha256 = "171y1bb3r6af41i2xsip2r4xm7grbzpvlwczrvaj8hzyknr3y7dx";
+       version = "0.4.3";
+       sha256 = "05s1whyqmv1nxcbrrfhfn8lcqb2cwyz1wa2im8b976i14qgw65lm";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         attoparsec base conduit conduit-combinators either exceptions
-         mmorph monad-control mtl regex-posix semigroups system-filepath
-         text time transformers transformers-base unix
+         attoparsec base conduit conduit-combinators conduit-extra either
+         exceptions filepath mmorph monad-control mtl regex-posix semigroups
+         streaming-commons system-filepath text time transformers
+         transformers-base unix unix-compat
        ];
        testDepends = [
          attoparsec base conduit conduit-combinators directory doctest
          either exceptions filepath hspec mmorph monad-control mtl
-         regex-posix semigroups system-filepath text time transformers
-         transformers-base unix
+         regex-posix semigroups streaming-commons system-filepath text time
+         transformers transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
@@ -47962,10 +48052,8 @@ self: {
      }:
      mkDerivation {
        pname = "fit";
-       version = "0.5";
-       revision = "1";
-       sha256 = "0xazsm6zdvnjxhy31c5zpjbd3fc98pcy545fq3jxvzh6c913fdjl";
-       editedCabalFile = "87f70d521590ba57a662694c83401df69c45c6c721e52119fde62685873b5f6f";
+       version = "0.5.1";
+       sha256 = "0y7jvczi0ldzjw9y102z1k4nyj7z8f6p8w368x5v0m308d0jw6db";
        buildDepends = [
          attoparsec base bytestring containers contravariant mtl text
        ];
@@ -47973,7 +48061,6 @@ self: {
          attoparsec base bytestring containers hspec hspec-attoparsec mtl
          QuickCheck text
        ];
-       jailbreak = true;
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52353,8 +52440,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-monitor";
-       version = "3.1.1.3";
-       sha256 = "0xcb7i5hvx7967wqsyawxz8fk052ylrb90y3b2spw9pxhqry3j4s";
+       version = "3.1.1.4";
+       sha256 = "00byw8y9av60rwacp4006kv7qb9sc26j1f82cz1ngr42nfx9955c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -52502,21 +52589,27 @@ self: {
   "github" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , byteable, bytestring, case-insensitive, conduit, containers
-     , cryptohash, data-default, failure, hashable, HTTP, http-conduit
-     , http-types, network, old-locale, text, time, unordered-containers
-     , vector
+     , cryptohash, data-default, failure, hashable, hspec, HTTP
+     , http-conduit, http-types, network, old-locale, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "github";
-       version = "0.13.1";
-       sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l";
+       version = "0.13.2";
+       sha256 = "1i07jwhkzaxia98a3fjnm3hynh4mjdhy9rzdh9chdlram5wqk87z";
        buildDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
          hashable HTTP http-conduit http-types network old-locale text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/fpco/github";
+       testDepends = [
+         aeson attoparsec base base16-bytestring byteable bytestring
+         case-insensitive conduit containers cryptohash data-default failure
+         hashable hspec HTTP http-conduit http-types network old-locale text
+         time unordered-containers vector
+       ];
+       homepage = "https://github.com/jwiegley/github";
        description = "Access to the Github API, v3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52709,21 +52802,21 @@ self: {
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, directory, exceptions, fast-logger, filepath, gitlib
      , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
-     , lifted-async, lifted-base, missing-foreign, mmorph, monad-control
-     , monad-logger, monad-loops, mtl, resourcet, stm, stm-conduit
-     , tagged, template-haskell, text, text-icu, time, transformers
+     , lifted-async, lifted-base, mmorph, monad-control, monad-logger
+     , monad-loops, mtl, resourcet, stm, stm-conduit, tagged
+     , template-haskell, text, text-icu, time, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "gitlib-libgit2";
-       version = "3.1.0.3";
-       sha256 = "19lly5nrxa05gj6mv887d419mm65ha40rggv2a8y1jd6s7z6drfi";
+       version = "3.1.0.4";
+       sha256 = "0657m22xybk54rpyzhdv27089nh85a1n0v47w06q9h5pakq3vfv7";
        buildDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
-         lifted-base missing-foreign mmorph monad-control monad-logger
-         monad-loops mtl resourcet stm stm-conduit tagged template-haskell
-         text text-icu time transformers transformers-base
+         lifted-base mmorph monad-control monad-logger monad-loops mtl
+         resourcet stm stm-conduit tagged template-haskell text text-icu
+         time transformers transformers-base
        ];
        testDepends = [
          base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
@@ -52982,10 +53075,9 @@ self: {
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
        pname = "gll";
-       version = "0.1.0.0";
-       sha256 = "0z3v0bg8r1gmca5bgkrbc44j9ggxkrzlk6r1mqmpycjgv5zryw05";
+       version = "0.1.0.1";
+       sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv";
        buildDepends = [ array base containers ];
-       jailbreak = true;
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55100,21 +55192,21 @@ self: {
      }) { gtk3 = null;};
 
   "gtk3-mac-integration" = callPackage
-    ({ mkDerivation, array, base, containers, glib, gtk-mac-integration
-     , gtk2hs-buildtools, gtk3, mtl
+    ({ mkDerivation, array, base, containers, glib
+     , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.0.2";
-       sha256 = "0fsgcy5vwdcy7mf57w6axqa7804w0729mbzb7gvf4wh25k2i2xhp";
+       version = "0.3.0.3";
+       sha256 = "1jzkx10mmmxxv1ys9ywr2sfpy0pxvy8276pbkh0xnypxsyd2sfdn";
        buildDepends = [ array base containers glib gtk3 mtl ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration ];
+       pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration = null;};
+     }) { gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
@@ -66103,6 +66195,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpack" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, deepseq, directory
+     , filepath, hspec, interpolate, mockery, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.1.2";
+       sha256 = "1rnsqgycnqp3z3hszq438h8hwm0s6gs5vykm620am36r6md3kmzh";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base base-compat deepseq directory filepath
+         unordered-containers yaml
+       ];
+       testDepends = [
+         aeson base base-compat deepseq directory filepath hspec interpolate
+         mockery unordered-containers yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hpaco" = callPackage
     ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict
      , utf8-string, yaml
@@ -66589,20 +66704,21 @@ self: {
 
   "hruby" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
-     , scientific, stm, text, unordered-containers, vector
+     , ruby, scientific, stm, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.1";
-       sha256 = "137vvqmyq81aqjpag6rl980l2amf0in1rx6im4pp0gzwl48vzsyj";
+       version = "0.3.1.2";
+       sha256 = "1w57k3c4y08mk0887knar33yg36hpk2z31lqwz4aiq3dnidvjmdz";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
+       extraLibraries = [ ruby ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) { inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
@@ -68607,8 +68723,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.6";
-       sha256 = "0ych09pli7v3mhfmvr6c0milvcmxf8bk1jf528z9r9halgjg18vh";
+       version = "2.1.7";
+       sha256 = "096rfq7ss5hvy1wcc9fdb4svnfiy96p79xh7vj3h7radh2wggfwv";
        buildDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -68678,8 +68794,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.6";
-       sha256 = "0ymgsvl9bq96b7ln4x3yqj5pkla7683xpgg1mp0z9nc70kdzq1w5";
+       version = "2.1.7";
+       sha256 = "1ifwsqa8ay8f8l96k37rawxjya0qs72bcifxfr5hlz3gagg4a02b";
        buildDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -68698,8 +68814,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.6";
-       sha256 = "0vjgnh4g4sg73n4rfgrlqn0xw2mhkpwrwkkccpwik5jfyks7l1jq";
+       version = "2.1.7";
+       sha256 = "0gh9kn9ds50xl0zin5vbablf4dpfiabi96sz2a4xsxlskfjflhl0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath ];
@@ -68878,8 +68994,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.2.5";
-       sha256 = "1973b4rp11lqck4233ha88z867sfz0rzpp3v3irkrjhvzmdhh6lx";
+       version = "0.3.2.6";
+       sha256 = "12kmkixr7azd33r5fx3z4siw0xdkda4sfxwi75vlm5w9w07ackpn";
        buildDepends = [
          base bytestring containers digestive-functors HandsomeSoup hspec
          hspec-core hxt lens mtl snap snap-core text transformers
@@ -69745,14 +69861,14 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.0.0.2";
-       sha256 = "09djrc8ws8ijig8syanjj29b4fdgrf6cp7py3vx2x1gap4jg5zya";
+       version = "1.0.1.0";
+       sha256 = "0s44w6nhp6xlibh1740paa21rbjvbnkhjdf35d9yw5hycjwyjwqc";
        buildDepends = [
          attoparsec base-prelude text unordered-containers
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
        homepage = "https://github.com/nikita-volkov/html-entities";
-       description = "An \"attoparsec\" parser and a decoder of HTML entities";
+       description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -70013,22 +70129,21 @@ self: {
 
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, clock, containers
-     , cookie, data-default-class, deepseq, directory, exceptions
-     , filepath, ghc-prim, hspec, http-types, mime-types, monad-control
-     , network, network-uri, publicsuffixlist, random, streaming-commons
-     , text, time, transformers, zlib
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
+     , network-uri, random, streaming-commons, text, time, transformers
+     , zlib
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.11.1";
-       sha256 = "122h9g6nk17nwxrwqwni75gfbc221s1jvjjlmq6sh9ksgsyh09b4";
+       version = "0.4.11.2";
+       sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
-         case-insensitive clock containers cookie data-default-class deepseq
+         case-insensitive containers cookie data-default-class deepseq
          exceptions filepath ghc-prim http-types mime-types network
-         network-uri publicsuffixlist random streaming-commons text time
-         transformers
+         network-uri random streaming-commons text time transformers
        ];
        testDepends = [
          async base base64-bytestring blaze-builder bytestring
@@ -70175,8 +70290,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-common";
-       version = "0.7.2.0";
-       sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960";
+       version = "0.8.2.0";
+       sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599";
        buildDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          directory mtl network text transformers unordered-containers
@@ -70501,8 +70616,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-streams";
-       version = "0.7.2.6";
-       sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7";
+       version = "0.8.3.1";
+       sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
@@ -70517,6 +70632,7 @@ self: {
          snap-core snap-server system-fileio system-filepath text
          transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://research.operationaldynamics.com/projects/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
@@ -75763,18 +75879,21 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.3";
-       sha256 = "0bldhn9bhhz07shcdcdc0p01ggxa8af43cf0bza9za8zywgq5i9x";
-       buildDepends = [ base lens template-haskell text transformers ];
+       version = "0.2.0.4";
+       sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8";
+       buildDepends = [
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
        testDepends = [
-         base hslogger lens template-haskell text transformers
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78503,8 +78622,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.1";
-       sha256 = "14bfzzf4lspkb1haf0bdq75zii50hzwzcl4q5rxysmxfhvmgldh4";
+       version = "1.1.1.2";
+       sha256 = "0d5510krnwfq4vfnq2vlzbjnyhnr13hx1jnm3gajznb2bzn6srx4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78517,7 +78636,7 @@ self: {
          time transformers unix unordered-containers vector yaml
        ];
        testDepends = [
-         ansi-wl-pprint base Glob hspec HUnit lens parsec parsers
+         ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
        homepage = "http://lpuppet.banquise.net/";
@@ -79792,19 +79911,20 @@ self: {
   "libconfig" = callPackage
     ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config
      , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text
-     , text-binary, transformers
+     , text-binary, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "libconfig";
-       version = "0.2.0.0";
-       sha256 = "1z03vnqhm6iiz964rmhvzm15hdx7mmck06yawf0sy4h5ljwrq94a";
+       version = "0.3.0.0";
+       sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
        buildDepends = [
          base binary cereal cereal-text deepseq hashable profunctors text
-         text-binary transformers
+         text-binary transformers transformers-compat
        ];
        testDepends = [ base doctest doctest-prop lens ];
        buildTools = [ c2hs ];
        extraLibraries = [ config ];
+       homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
      }) { config = null;};
@@ -81209,15 +81329,21 @@ self: {
      }) {};
 
   "list-t-html-parser" = callPackage
-    ({ mkDerivation, base-prelude, either, html-tokenizer, list-t
-     , mtl-prelude, text
+    ({ mkDerivation, base-prelude, case-insensitive, conversion
+     , conversion-text, either, hspec, html-entities, html-tokenizer
+     , list-t, list-t-attoparsec, list-t-text, mtl-prelude, text
      }:
      mkDerivation {
        pname = "list-t-html-parser";
-       version = "0.2.1.0";
-       sha256 = "0vf58ji73vc8hgbq2bd7p2ls7syk33qy5pp92kx5byr5j38zzar3";
+       version = "0.2.2.0";
+       sha256 = "07fd7nzlhwvhzj4g84wmsm48rj1748m0cbglv0wc2w1rsbsikwl0";
        buildDepends = [
-         base-prelude either html-tokenizer list-t mtl-prelude text
+         base-prelude case-insensitive either html-entities html-tokenizer
+         list-t mtl-prelude text
+       ];
+       testDepends = [
+         base-prelude conversion conversion-text hspec html-tokenizer
+         list-t-attoparsec list-t-text text
        ];
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
@@ -81263,8 +81389,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-text";
-       version = "0.1.0.2";
-       sha256 = "05vz6r9r5903wm9spmy6zsql8jzzqj1dv94yfnfhiwkkmgjsvv5z";
+       version = "0.2.0.1";
+       sha256 = "1ylb4fs5gbphny281gwd0j0k26ayqcqmc79qarcfpfm6j4washng";
        buildDepends = [ base-prelude bytestring list-t mtl-prelude text ];
        testDepends = [
          base base-prelude bytestring hspec list-t QuickCheck
@@ -84250,12 +84376,15 @@ self: {
      }) { eng = null;  mat = null;  mx = null;};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, binary, primitive, vector }:
+    ({ mkDerivation, base, primitive, tasty, tasty-hunit
+     , tasty-quickcheck, vector
+     }:
      mkDerivation {
        pname = "matrices";
-       version = "0.4.0";
-       sha256 = "1whajm8cqr724dz6aqnjbki77c40xr1sy16pks15rq56j7f2av2v";
-       buildDepends = [ base binary primitive vector ];
+       version = "0.4.1";
+       sha256 = "16xx6cdz90an0ifpvkpmchiqhijgxmi1cn5qq4171jhi87sswm7z";
+       buildDepends = [ base primitive vector ];
+       testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84687,27 +84816,47 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memcache-conduit" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
+     , conduit, conduit-extra, containers, hashtables, memcache-haskell
+     , monad-control, mtl, network, resourcet, split, stm, transformers
+     }:
+     mkDerivation {
+       pname = "memcache-conduit";
+       version = "0.0.3";
+       sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec attoparsec-binary base bytestring conduit conduit-extra
+         containers hashtables memcache-haskell monad-control mtl network
+         resourcet split stm transformers
+       ];
+       description = "Conduit library for memcache procotol";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "memcache-haskell" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hashable
-     , hashtables, HUnit, mtl, network, network-conduit, QuickCheck
+    ({ mkDerivation, attoparsec, base, bytestring, conduit-extra
+     , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck
      , resourcet, split, stm, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers
      }:
      mkDerivation {
        pname = "memcache-haskell";
-       version = "0.0.10";
-       sha256 = "1k853wc1rqwq4wrsk72qs4gravd7scdgi4cvsjzjg8w0vn0scqm2";
+       version = "0.0.10.1";
+       sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         attoparsec base bytestring containers hashable hashtables mtl
-         network network-conduit resourcet split stm transformers
+         attoparsec base bytestring conduit-extra containers hashable
+         hashtables mtl network resourcet split stm transformers
        ];
        testDepends = [
          base bytestring HUnit network QuickCheck split test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
-       jailbreak = true;
+       description = "Memcache procotol library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -89601,17 +89750,18 @@ self: {
 
   "nested-routes" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
-     , containers, hspec, http-types, lucid, mtl, pred-trie, QuickCheck
-     , quickcheck-instances, semigroups, text, transformers, wai
-     , wai-extra
+     , constraints, containers, hspec, http-types, lucid, mtl
+     , poly-arity, pred-trie, QuickCheck, quickcheck-instances
+     , semigroups, text, transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "0.2.2.2";
-       sha256 = "0cnm6clz7y8kpnsi65i15a0vgv7i2q3150igvvmrs1jz15cxzi8z";
+       version = "0.3";
+       sha256 = "04cgy9hvriq4r8imi23s5lpvbvvdg8a3a51ypmwwgk6vss84jz1l";
        buildDepends = [
-         aeson attoparsec base blaze-html bytestring containers http-types
-         lucid mtl pred-trie semigroups text transformers wai wai-extra
+         aeson attoparsec base blaze-html bytestring constraints containers
+         http-types lucid mtl poly-arity pred-trie semigroups text
+         transformers wai wai-extra
        ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Declarative, compositional Wai responses";
@@ -89773,7 +89923,9 @@ self: {
      mkDerivation {
        pname = "netrc";
        version = "0.2.0.0";
+       revision = "1";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
+       editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd";
        buildDepends = [ base bytestring deepseq parsec ];
        testDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -91848,20 +92000,20 @@ self: {
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
      , either, errors, ghc-prim, hspec, hspec-expectations, http-client
      , http-types, lens, mtl, optparse-applicative, text, time
-     , transformers, unordered-containers, utf8-string, wreq, xmlhtml
+     , transformers, unordered-containers, utf8-string, wreq-sb, xmlhtml
      , yaml
      }:
      mkDerivation {
        pname = "octohat";
-       version = "0.1.4.1";
-       sha256 = "1cc7np4kb03160fbn2bwkbl0xgcnizcgr3yvq8pp47p31k965x54";
+       version = "0.1.4.2";
+       sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base base-compat base16-bytestring base64-bytestring
          bytestring containers cryptohash dotenv either errors ghc-prim
          http-client http-types lens mtl optparse-applicative text time
-         transformers unordered-containers utf8-string wreq xmlhtml yaml
+         transformers unordered-containers utf8-string wreq-sb xmlhtml yaml
        ];
        testDepends = [
          base base-compat dotenv hspec hspec-expectations text transformers
@@ -92160,6 +92312,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "one-time-password" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, cereal, cryptohash
+     , tasty, tasty-hunit, time
+     }:
+     mkDerivation {
+       pname = "one-time-password";
+       version = "1.0.0.1";
+       sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0";
+       buildDepends = [ base byteable bytestring cereal cryptohash time ];
+       testDepends = [
+         base bytestring cryptohash tasty tasty-hunit time
+       ];
+       homepage = "https://github.com/s9gf4ult/one-time-password";
+       description = "HMAC-Based and Time-Based One-Time Passwords";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "oneOfN" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -95960,8 +96129,8 @@ self: {
      }:
      mkDerivation {
        pname = "picoparsec";
-       version = "0.1.2.1";
-       sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci";
+       version = "0.1.2.2";
+       sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9";
        buildDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
@@ -97913,8 +98082,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.1.0";
-       sha256 = "116w1lac70fpqrcnx7xbr25jfl3nsqw1v35famnfxgf6mjirsbqg";
+       version = "1.1.1";
+       sha256 = "0c6ns1zwqanqxd45zly2ms6zg3wx0lzr690pvq1prmf676vw2fj1";
        buildDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta
@@ -98261,8 +98430,8 @@ self: {
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.0.10.2";
-       sha256 = "1wh53dswpn4prkbkn87aqv6vbbf651dwy1avqx261jg3w4hg8i96";
+       version = "0.0.12";
+       sha256 = "0hyghjp1zcprgzq2szkpfpkihr1hhgf70901wm5hfgs6bfvgw2sb";
        buildDepends = [ base semigroups ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Predicative tries";
@@ -98287,8 +98456,8 @@ self: {
      }:
      mkDerivation {
        pname = "prednote";
-       version = "0.34.0.0";
-       sha256 = "09qbzr1rb2nbhwa8mmynv4lskz4l9339sprjy03v2ar06vz8f37k";
+       version = "0.36.0.2";
+       sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb";
        buildDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
@@ -99722,12 +99891,12 @@ self: {
      }) {};
 
   "pseudomacros" = callPackage
-    ({ mkDerivation, base, old-locale, template-haskell, time }:
+    ({ mkDerivation, base, template-haskell, time }:
      mkDerivation {
        pname = "pseudomacros";
-       version = "0.0.1";
-       sha256 = "168vqim5m72yl51w6pi9vxzp324i1gnawrl2zlsayw81s7lf1jp4";
-       buildDepends = [ base old-locale template-haskell time ];
+       version = "0.0.2";
+       sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
+       buildDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101167,8 +101336,8 @@ self: {
      }:
      mkDerivation {
        pname = "rainbow";
-       version = "0.24.0.0";
-       sha256 = "1ksgnxh8j6rrcpkkzwh4qj1p9npanb75xz9wacjxhd91y26zfzdd";
+       version = "0.26.0.2";
+       sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901";
        buildDepends = [ base bytestring lens process text ];
        testDepends = [ base bytestring lens process QuickCheck text ];
        homepage = "https://www.github.com/massysett/rainbow";
@@ -101198,8 +101367,8 @@ self: {
      }:
      mkDerivation {
        pname = "rainbox";
-       version = "0.14.0.0";
-       sha256 = "0fdqw0d1n2br8gm0rdmnmzkn6dwmljkcgz0w1y6wy62cijwqzz52";
+       version = "0.16.0.0";
+       sha256 = "0aihr386m1n5p0d4iym5rvg74ihdm180sm6b4mqmiihhl00lr1p2";
        buildDepends = [ base bytestring containers rainbow text ];
        testDepends = [
          base bytestring containers QuickCheck rainbow tasty
@@ -102301,15 +102470,15 @@ self: {
 
   "redis" = callPackage
     ({ mkDerivation, base, bytestring, concurrent-extra, containers
-     , MonadCatchIO-mtl, mtl, network, old-time, utf8-string
+     , exceptions, mtl, network, old-time, utf8-string
      }:
      mkDerivation {
        pname = "redis";
-       version = "0.13.0.1";
-       sha256 = "0djwih122pp7y0c1lx7ab7n80ra1488hrwgf0iq20gywk8an9wfq";
+       version = "0.14";
+       sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094";
        buildDepends = [
-         base bytestring concurrent-extra containers MonadCatchIO-mtl mtl
-         network old-time utf8-string
+         base bytestring concurrent-extra containers exceptions mtl network
+         old-time utf8-string
        ];
        homepage = "http://hub.darcs.net/ganesh/redis";
        description = "A driver for Redis key-value database";
@@ -102564,6 +102733,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "refined" = callPackage
+    ({ mkDerivation, base, base-prelude, template-haskell }:
+     mkDerivation {
+       pname = "refined";
+       version = "0.1.0.0";
+       sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n";
+       buildDepends = [ base base-prelude template-haskell ];
+       homepage = "https://github.com/nikita-volkov/refined";
+       description = "Refinement types with static and runtime checking";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reflection" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -104487,8 +104668,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.16";
-       sha256 = "1x4kw64mjp4900qnmvakrd7vfqg14h35k0jzai5qh6y88rr3qaf1";
+       version = "0.0.17";
+       sha256 = "01jz3bg6zjrvkrs7mvwvyyzq94j57cgmghzp9rsdlia2r6bd6lcz";
        buildDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -106632,8 +106813,8 @@ self: {
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.1.3.1";
-       sha256 = "0vh48fbfa4drp6wvhnj7yswgd09dabq61b7gpar0l0fviz98y8id";
+       version = "0.2.0";
+       sha256 = "0bqnjnyjvhhj2lh8jr6cris5l4crwyql95rfzrvc95wvkb75jwzv";
        buildDepends = [
          base bytestring curl regex-base regex-tdfa tagsoup text
        ];
@@ -108109,8 +108290,8 @@ self: {
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
-       version = "0.3.2";
-       sha256 = "0v2d5125zyldr7f50zdhvgm1wcp7zbrnas9i2chqsq3s17qkrkm5";
+       version = "0.3.3";
+       sha256 = "0jddjsvkc2fdnz9yny44ikrqwwx500rd0cgh8fz1894c6p6qfgkm";
        buildDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
@@ -109507,8 +109688,8 @@ self: {
      }:
      mkDerivation {
        pname = "shuffle";
-       version = "0.1.3.1";
-       sha256 = "120rc9gzdhad4nqich1mwixzax9bhsm3vv87qkvyarcz0qf80qcx";
+       version = "0.1.3.2";
+       sha256 = "07amjk5l9apxs90klq3ii8gxmywnxqhx4fk2yapmm8l75l8b6kfg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -109518,7 +109699,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/shuffle";
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sieve" = callPackage
@@ -110385,8 +110565,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
-       version = "0.1.0.0";
-       sha256 = "183kqvkp0s55bqm5gr7kiq9lk9qpm3ijwnansl6lpdxclcg9gm8y";
+       version = "0.1.1.0";
+       sha256 = "154jzdxhq5nvr78wlk26fzjs9n2piw8h92dq4n1rqz4wqjkhyg9s";
        buildDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
@@ -110836,6 +111016,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck-series" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text
+     }:
+     mkDerivation {
+       pname = "smallcheck-series";
+       version = "0.2";
+       sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v";
+       buildDepends = [ base bytestring smallcheck text ];
+       testDepends = [ base doctest Glob ];
+       homepage = "https://github.com/jdnavarro/smallcheck-series";
+       description = "Extra SmallCheck series";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smallpt-hs" = callPackage
     ({ mkDerivation, base, vector }:
      mkDerivation {
@@ -111226,13 +111420,12 @@ self: {
      }:
      mkDerivation {
        pname = "snap-cors";
-       version = "1.2.7";
-       sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc";
+       version = "1.2.8";
+       sha256 = "1ycqfx4qv00cxjrddch1wxadrffq55zbv6bhcahan93wq3a5lb7w";
        buildDepends = [
          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;
@@ -112603,6 +112796,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sorting" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "sorting";
+       version = "1.0.0.1";
+       sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
+       buildDepends = [ base ];
+       homepage = "https://github.com/joneshf/sorting";
+       description = "Utils for sorting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sorty" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -112908,8 +113113,8 @@ self: {
     ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.2.0";
-       sha256 = "1a3dmmq1dcz5sanj0cisddk313f89sil89xxbk2l9sjprc1fwrv7";
+       version = "0.2.3.0";
+       sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4";
        buildDepends = [ base binary cereal ghc-prim linear ];
        testDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
@@ -113758,23 +113963,23 @@ self: {
      }) {};
 
   "ssh" = callPackage
-    ({ mkDerivation, asn1-data, base, base64-string, binary, bytestring
-     , cereal, containers, crypto-api, crypto-pubkey-types
-     , cryptohash-cryptoapi, directory, filepath, HsOpenSSL, HUnit
-     , integer-gmp, libssh2, network, process, pseudomacros, QuickCheck
-     , random, RSA, SHA, SimpleAES, split, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, th-lift-instances
-     , transformers
+    ({ mkDerivation, asn1-encoding, asn1-types, base, base64-string
+     , binary, bytestring, cereal, containers, crypto-api
+     , crypto-pubkey-types, cryptohash-cryptoapi, directory, filepath
+     , HsOpenSSL, HUnit, integer-gmp, libssh2, network, process
+     , pseudomacros, QuickCheck, random, RSA, SHA, SimpleAES, split
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , th-lift-instances, transformers
      }:
      mkDerivation {
        pname = "ssh";
-       version = "0.3.0.1";
-       sha256 = "1325af0ij2ys1waghk3f4mr5ndcqbb1k6pjf5m71fk324hb2s9cx";
+       version = "0.3.1";
+       sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj";
        buildDepends = [
-         asn1-data base base64-string binary bytestring cereal containers
-         crypto-api crypto-pubkey-types cryptohash-cryptoapi HsOpenSSL
-         integer-gmp network process random RSA SHA SimpleAES split
-         transformers
+         asn1-encoding asn1-types base base64-string binary bytestring
+         cereal containers crypto-api crypto-pubkey-types
+         cryptohash-cryptoapi HsOpenSSL integer-gmp network process random
+         RSA SHA SimpleAES split transformers
        ];
        testDepends = [
          base bytestring containers directory filepath HUnit libssh2
@@ -113955,12 +114160,16 @@ self: {
      }) {};
 
   "stackage" = callPackage
-    ({ mkDerivation, base, stackage-cli, stackage-update }:
+    ({ mkDerivation, base, stackage-cli, stackage-install
+     , stackage-update, stackage-upload
+     }:
      mkDerivation {
        pname = "stackage";
-       version = "0.7.0.0";
-       sha256 = "0fw910zvm4vgm41jrsfr76x1c5alwvm85m0k9x0hyrwxnd5ci4dj";
-       buildDepends = [ base stackage-cli stackage-update ];
+       version = "0.7.1.0";
+       sha256 = "02z5gkhymgiz7n0mm7j3p10ysi58d9rcz9d2pxakf0hmdsc37xx7";
+       buildDepends = [
+         base stackage-cli stackage-install stackage-update stackage-upload
+       ];
        homepage = "https://www.stackage.org/";
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
@@ -113995,28 +114204,28 @@ self: {
     ({ mkDerivation, aeson, async, base, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
      , data-default-class, directory, filepath, hspec, http-client
-     , http-client-tls, http-conduit, mono-traversable, mtl, old-locale
-     , optparse-applicative, process, QuickCheck, semigroups
-     , stackage-types, stm, streaming-commons, system-fileio
+     , http-client-tls, http-conduit, monad-unlift, mono-traversable
+     , mtl, old-locale, optparse-applicative, optparse-simple, process
+     , QuickCheck, semigroups, stackage-cli, stackage-types
+     , stackage-update, stm, streaming-commons, system-fileio
      , system-filepath, tar, temporary, text, time, transformers
      , unix-compat, utf8-string, xml-conduit, yaml, zlib
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.7.4";
-       revision = "1";
-       sha256 = "181wdsrwr0dlgp969zkqyg231kz3xh8mzii8ikcxx5z0yharn3gk";
-       editedCabalFile = "4e0d029d79d0224ebe84bcf2891b5fd37cdc3178d4acae146d1ba2148bee86b1";
+       version = "0.8.0";
+       sha256 = "1nzbx22y90llcbfv37v119s7psp70rh7gyszar6zfg7wr4plcimb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson async base bytestring Cabal classy-prelude-conduit conduit
          conduit-extra containers data-default-class directory filepath
-         http-client http-client-tls http-conduit mono-traversable mtl
-         old-locale optparse-applicative process semigroups stackage-types
-         stm streaming-commons system-fileio system-filepath tar temporary
-         text time transformers unix-compat utf8-string xml-conduit yaml
-         zlib
+         http-client http-client-tls http-conduit monad-unlift
+         mono-traversable mtl old-locale optparse-applicative
+         optparse-simple process semigroups stackage-cli stackage-types
+         stackage-update stm streaming-commons system-fileio system-filepath
+         tar temporary text time transformers unix-compat utf8-string
+         xml-conduit yaml zlib
        ];
        testDepends = [
          base Cabal classy-prelude-conduit containers hspec http-client
@@ -114028,6 +114237,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-install" = callPackage
+    ({ mkDerivation, async, base, bytestring, directory, filepath
+     , http-client, http-client-tls, process, stm
+     }:
+     mkDerivation {
+       pname = "stackage-install";
+       version = "0.1.0.1";
+       sha256 = "1ryl2b3hd4kbrn4k1brsqqwq14sv0dhsl89zskgmzwrxg32p2m94";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         async base bytestring directory filepath http-client
+         http-client-tls process stm
+       ];
+       homepage = "https://github.com/fpco/stackage-install";
+       description = "Secure download of packages for cabal-install";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, semigroups, text, unordered-containers, vector
@@ -114059,6 +114287,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-upload" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , http-client, http-client-tls, http-types, optparse-applicative
+     , process, stackage-cli, temporary, text
+     }:
+     mkDerivation {
+       pname = "stackage-upload";
+       version = "0.1.0.3";
+       sha256 = "0bg08nmcm9jg4pamsm41y1vw2fy2dy9pxxs36nmbrkn1622x7dkc";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory filepath http-client
+         http-client-tls http-types optparse-applicative process
+         stackage-cli temporary text
+       ];
+       homepage = "https://github.com/fpco/stackage-upload";
+       description = "A more secure version of cabal upload which uses HTTPS";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "standalone-haddock" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , optparse-applicative
@@ -114563,6 +114812,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "step-function" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }:
+     mkDerivation {
+       pname = "step-function";
+       version = "0.1.0.0";
+       sha256 = "0v7mpi680zl5ihzrdda7di790br5jm563kf0r46z40b63lbzzv01";
+       buildDepends = [ base ];
+       testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ];
+       homepage = "https://github.com/jonpetterbergman/step-function";
+       description = "Step functions, staircase functions or piecewise constant functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stepwise" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -118380,6 +118642,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "templater" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, hspec-attoparsec, HUnit
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "templater";
+       version = "0.0.2.0";
+       sha256 = "10dar9n4ccskv163zh3h756mp9ccx04ifgjwnsf8cnab22lng5mb";
+       buildDepends = [ attoparsec base text ];
+       testDepends = [
+         base hspec hspec-attoparsec HUnit QuickCheck text
+       ];
+       homepage = "https://github.com/geraud/templater";
+       description = "Simple string templater";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tempodb" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , HsOpenSSL, HTTP, http-streams, io-streams, mtl, old-locale, text
@@ -118721,8 +119000,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-framework-golden";
-       version = "1.1.3.1";
-       sha256 = "1vmkc16z3gzbq9aibfk3wv7ms7sq7yivaamld63qrzlqaffz1xrw";
+       version = "1.1.3.3";
+       sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36";
        buildDepends = [
          base bytestring filepath mtl process temporary test-framework
        ];
@@ -118912,8 +119191,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-sandbox";
-       version = "0.1.3";
-       sha256 = "0hkpz3l5b1vpnpgagl150g5rdawwf9mwgb7ai0xilj4d7i55gdwl";
+       version = "0.1.4";
+       sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj";
        buildDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
@@ -119392,6 +119671,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-position" = callPackage
+    ({ mkDerivation, base, QuickCheck, regex-applicative }:
+     mkDerivation {
+       pname = "text-position";
+       version = "0.1.0.0";
+       sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       buildDepends = [ base regex-applicative ];
+       testDepends = [ base QuickCheck regex-applicative ];
+       jailbreak = true;
+       homepage = "http://rel4tion.org/projects/text-position/";
+       description = "Handling positions in text and position-tagging it";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "text-printer" = callPackage
     ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -122564,6 +122857,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "twentefp-eventloop-trees" = callPackage
+    ({ mkDerivation, base, eventloop }:
+     mkDerivation {
+       pname = "twentefp-eventloop-trees";
+       version = "0.1.0.1";
+       sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m";
+       buildDepends = [ base eventloop ];
+       description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "twentefp-graphs" = callPackage
     ({ mkDerivation, base, twentefp-eventloop-graphics }:
      mkDerivation {
@@ -122900,8 +123204,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.1.1.3";
-       sha256 = "1c50rirj3wymbh1850c7dm79jyglcn34116vljh5f54f8sv17y96";
+       version = "0.1.1.4";
+       sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -125073,20 +125377,21 @@ self: {
      }) {};
 
   "uri-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens
+     , QuickCheck, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.0.1";
-       sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5";
+       version = "0.1";
+       sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1";
        buildDepends = [ attoparsec base bytestring ];
        testDepends = [
-         attoparsec base bytestring derive HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck
+         attoparsec base bytestring derive HUnit lens QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
-       homepage = "https://travis-ci.org/Soostone/uri-bytestring";
+       homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126012,15 +126317,14 @@ self: {
      }:
      mkDerivation {
        pname = "vado";
-       version = "0.0.3";
-       sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f";
+       version = "0.0.4";
+       sha256 = "0ndhknsqrb0vg5gba2q6dala16m7vbc8x4dga28q3ys0f14h1m6m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ attoparsec base directory filepath process text ];
        testDepends = [
          attoparsec base directory filepath process QuickCheck text
        ];
-       jailbreak = true;
        homepage = "https://github.com/hamishmack/vado";
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
@@ -126870,18 +127174,18 @@ self: {
     ({ mkDerivation, base, bytestring, c2hs, containers, data-default
      , deepseq, directory, filepath, hspec, hspec-expectations, libmpd
      , mtl, ncurses, old-locale, process, QuickCheck, template-haskell
-     , time, transformers, utf8-string, wcwidth
+     , time, time-locale-compat, transformers, utf8-string, wcwidth
      }:
      mkDerivation {
        pname = "vimus";
-       version = "0.2.0";
-       sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h";
+       version = "0.2.1";
+       sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring containers data-default deepseq directory filepath
-         libmpd mtl old-locale process template-haskell time utf8-string
-         wcwidth
+         libmpd mtl old-locale process template-haskell time
+         time-locale-compat utf8-string wcwidth
        ];
        testDepends = [
          base data-default hspec hspec-expectations mtl QuickCheck
@@ -128831,8 +129135,8 @@ self: {
      }:
      mkDerivation {
        pname = "webcrank";
-       version = "0.2";
-       sha256 = "0ws66z1qrlx91arpj3i9nz6lqbz1iwcpbzxdnqrwc1bml7zs2ipj";
+       version = "0.2.0.1";
+       sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr";
        buildDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
          exceptions http-date http-media http-types lens mtl semigroups text
@@ -129482,8 +129786,8 @@ self: {
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.1.2.2";
-       sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7";
+       version = "0.1.2.3";
+       sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz";
        buildDepends = [
          base containers hashable transformers unordered-containers vector
        ];
@@ -132472,8 +132776,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.4";
-       sha256 = "079ny0jdg68kxdp117y1av0d09fhpywbb8v9iyl867vswpb38b08";
+       version = "1.4.5";
+       sha256 = "0agddsicjqcvraa3lcbxwwnk4mapjjd1y4pdp5kg111kaww6nkdn";
        buildDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -133054,6 +133358,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-gitrev" = callPackage
+    ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-gitrev";
+       version = "0.1.0.0";
+       sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
+       buildDepends = [ aeson base gitrev template-haskell yesod-core ];
+       description = "A subsite for displaying git information";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-goodies" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, directory, HTTP
      , old-locale, pandoc, pureMD5, text, time, yesod, yesod-form
@@ -133650,6 +133966,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-transloadit" = callPackage
+    ({ mkDerivation, aeson, base, byteable, bytestring, cryptohash
+     , hspec, lens, lens-aeson, old-locale, shakespeare, text, time
+     , transformers, yesod, yesod-core, yesod-form, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-transloadit";
+       version = "0.1.1.0";
+       sha256 = "0m83hy3j2sg060jv44pcgr99avzg0laq6ydl37pckvyqz27rbw7f";
+       buildDepends = [
+         aeson base byteable bytestring cryptohash lens lens-aeson
+         old-locale shakespeare text time transformers yesod yesod-core
+         yesod-form
+       ];
+       testDepends = [
+         base hspec old-locale text time yesod yesod-form yesod-test
+       ];
+       description = "Transloadit support for Yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-vend" = callPackage
     ({ mkDerivation, base, blaze-html, hamlet, monad-logger, persistent
      , persistent-sqlite, resourcet, text, yesod, yesod-form
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 30035671a327..136566f65f0b 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,6 +1,7 @@
-{ stdenv, lib, ghc, llvmPackages, packages, buildEnv
-, makeWrapper
-, ignoreCollisions ? false, withLLVM ? false }:
+{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper
+, ignoreCollisions ? false, withLLVM ? false
+, postBuild ? ""
+}:
 
 # This wrapper works only with GHC 6.12 or later.
 assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
@@ -89,7 +90,7 @@ buildEnv {
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     $out/bin/${ghcCommand}-pkg check
-  '';
+  '' + postBuild;
 } // {
   preferLocalBuild = true;
   inherit (ghc) version meta;