about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix3
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix578
2 files changed, 415 insertions, 166 deletions
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 61cccad75bad..ac24848b8fe0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -281,4 +281,7 @@ self: super: {
   # Won't work with LLVM 3.5.
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
+  # Ugly hack to trigger a rebuild to fix the broken package on Hydra.
+  crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1";
+
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ae94120305ba..1eb15af14ee1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3191,26 +3191,24 @@ self: {
      }) {};
 
   "DSH" = callPackage
-    ({ mkDerivation, aeson, algebra-dag, algebra-sql, ansi-wl-pprint
-     , base, bytestring, containers, dlist, either, HDBC
-     , HDBC-postgresql, HUnit, kure, mtl, pretty, QuickCheck, semigroups
-     , set-monad, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
+    ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base
+     , bytestring, containers, Decimal, dlist, either, hashable, HUnit
+     , kure, mtl, process, QuickCheck, random, semigroups
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "DSH";
-       version = "0.10.0.2";
-       sha256 = "02a8gfn5ji2n606ak1gs4syk0c97zvyi4146w5zy6gn21g4d3fa7";
+       version = "0.12.0.0";
+       sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson algebra-dag algebra-sql ansi-wl-pprint base bytestring
-         containers dlist either HDBC HDBC-postgresql kure mtl pretty
-         semigroups set-monad template-haskell text
-       ];
-       testDepends = [
-         base containers HDBC HDBC-postgresql HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         dlist either hashable HUnit kure mtl process QuickCheck random
+         semigroups template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -7178,26 +7176,27 @@ self: {
   "HTF" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base
      , base64-bytestring, bytestring, containers, cpphs, Diff, directory
-     , filepath, haskell-lexer, haskell-src, HUnit, lifted-base
-     , monad-control, mtl, old-time, pretty, process, QuickCheck, random
-     , regex-compat, temporary, text, time, unix, unordered-containers
-     , vector, xmlgen
+     , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl
+     , old-time, pretty, process, QuickCheck, random, regex-compat
+     , template-haskell, temporary, text, time, unix
+     , unordered-containers, vector, xmlgen
      }:
      mkDerivation {
        pname = "HTF";
-       version = "0.12.2.4";
-       sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m";
+       version = "0.13.0.0";
+       sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson array base base64-bytestring bytestring containers cpphs Diff
-         directory haskell-lexer haskell-src HUnit lifted-base monad-control
-         mtl old-time pretty process QuickCheck random regex-compat text
-         time unix vector xmlgen
+         directory haskell-src HUnit lifted-base monad-control mtl old-time
+         pretty process QuickCheck random regex-compat text time unix vector
+         xmlgen
        ];
        testDepends = [
          aeson aeson-pretty base bytestring directory filepath HUnit mtl
-         process random regex-compat temporary text unordered-containers
+         process random regex-compat template-haskell temporary text
+         unordered-containers
        ];
        homepage = "https://github.com/skogsbaer/HTF/";
        description = "The Haskell Test Framework";
@@ -8227,7 +8226,9 @@ self: {
      mkDerivation {
        pname = "HostAndPort";
        version = "0.1.0";
+       revision = "1";
        sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8";
+       editedCabalFile = "5ad1783e80502877a1de17cb92308dd9e0cc003a1302c5d4c09103b1c98bd627";
        buildDepends = [ base parsec ];
        testDepends = [ base doctest hspec ];
        homepage = "https://github.com/bacher09/hostandport";
@@ -18049,8 +18050,8 @@ self: {
      }:
      mkDerivation {
        pname = "algebra-dag";
-       version = "0.1.0.0";
-       sha256 = "0sl3lsbjhnmnq49zf1irnijp7wfxixsv21vfknshi5hkl9757i89";
+       version = "0.1.1.1";
+       sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9";
        buildDepends = [
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
@@ -18061,20 +18062,20 @@ self: {
 
   "algebra-sql" = callPackage
     ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base
-     , bytestring, containers, dlist, errors, fgl, filepath, ghc-prim
-     , mtl, multiset, parsec, pretty, process, template-haskell
-     , transformers
+     , bytestring, containers, Decimal, dlist, errors, fgl, filepath
+     , ghc-prim, mtl, multiset, parsec, pretty, process
+     , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "algebra-sql";
-       version = "0.1.0.1";
-       sha256 = "0das62ykwgyvj8qhk44i93b0w66wshdrdaylhvks03232pgpf8yp";
+       version = "0.3.0.0";
+       sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson algebra-dag ansi-wl-pprint base bytestring containers dlist
-         errors fgl filepath ghc-prim mtl multiset parsec pretty process
-         template-haskell transformers
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         dlist errors fgl filepath ghc-prim mtl multiset parsec pretty
+         process template-haskell text time transformers
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -20274,8 +20275,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.9.0.3";
-       sha256 = "1zki720s444qq22hxsbqmanpv379894l7xhql8p1fq8cdwmfj541";
+       version = "0.9.0.4";
+       sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -20289,7 +20290,6 @@ self: {
          transformers unix utf8-string
        ];
        extraLibraries = [ libXScrnSaver ];
-       jailbreak = true;
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -23045,6 +23045,18 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "base-noprelude" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-noprelude";
+       version = "4.8.0.0";
+       sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl";
+       buildDepends = [ base ];
+       homepage = "https://github.com/hvr/base-noprelude";
+       description = "\"base\" package sans \"Prelude\" module";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
@@ -25723,6 +25735,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bitx-bitcoin" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Decimal, hspec
+     , http-conduit, network, record, split, text, time
+     }:
+     mkDerivation {
+       pname = "bitx-bitcoin";
+       version = "0.1.0.0";
+       sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2";
+       buildDepends = [
+         aeson base bytestring Decimal http-conduit network record split
+         text time
+       ];
+       testDepends = [ aeson base bytestring hspec record time ];
+       description = "A Haskell library for working with the BitX bitcoin exchange";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "bk-tree" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -27533,8 +27562,8 @@ self: {
     ({ mkDerivation, alex, array, base, bytestring }:
      mkDerivation {
        pname = "bytestring-lexing";
-       version = "0.4.3.2";
-       sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05";
+       version = "0.4.3.3";
+       sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0";
        buildDepends = [ array base bytestring ];
        buildTools = [ alex ];
        homepage = "http://code.haskell.org/~wren/";
@@ -28119,7 +28148,6 @@ self: {
        testDepends = [ base ];
        description = "Simple interface to Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install_1_18_1_0" = callPackage
@@ -29501,6 +29529,7 @@ self: {
        testDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -30167,6 +30196,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cg" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+     , directory, filepath, hashable, mtl, parallel, parsec, process
+     , split, text, unordered-containers, utf8-string, void
+     }:
+     mkDerivation {
+       pname = "cg";
+       version = "0.0.9.0";
+       sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring cereal containers deepseq directory filepath
+         hashable mtl parallel parsec process split text
+         unordered-containers utf8-string void
+       ];
+       description = "Parser for categorial grammars";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "cgen" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
      , regex-posix, safe, template-haskell
@@ -32568,8 +32617,8 @@ self: {
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.3.0.4";
-       sha256 = "1fk3cw37ng80mw6nxv089sadzyf2s0m90c5rz936qpda06rqng08";
+       version = "0.3.0.6";
+       sha256 = "1slgh54kvf01y991pqi51kj6lfq05l5gp8dkhwcya1l9gilfazr4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -38626,8 +38675,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-or";
-       version = "1.0.0.4";
-       sha256 = "17plwr0ayll8na73vhdsfxk86dnds4rpj8v6nww7shb6vk5v3hf5";
+       version = "1.0.0.5";
+       sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A data type for non-exclusive disjunction";
@@ -41880,8 +41929,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.5.3";
-       sha256 = "1jp85dd7scizs03cslrbgmaly735l2rv9yl5hq573xj3mjwmv5nz";
+       version = "0.5.4";
+       sha256 = "1yx2vspnpa478bn7n82ii6m6x0z43xwbr5995l3mm64sd0nmxp2s";
        buildDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport
@@ -43296,6 +43345,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dsh-sql" = callPackage
+    ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring
+     , bytestring-lexing, containers, Decimal, DSH, either, HDBC
+     , HDBC-odbc, HUnit, mtl, process, QuickCheck, random, semigroups
+     , set-monad, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, vector
+     }:
+     mkDerivation {
+       pname = "dsh-sql";
+       version = "0.2.0.0";
+       sha256 = "0f7r844d0jwn4vyfnj8nvksss16rwva63hsy22m2viv98nyyfyi2";
+       buildDepends = [
+         aeson algebra-dag algebra-sql base bytestring bytestring-lexing
+         containers Decimal DSH either HDBC HDBC-odbc mtl process random
+         semigroups set-monad template-haskell text vector
+       ];
+       testDepends = [
+         base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc
+         HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text vector
+       ];
+       description = "SQL backend for Database Supported Haskell (DSH)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dsmc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, entropy
      , hslogger, mwc-random, parallel, primitive, repa, strict
@@ -43809,6 +43883,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dynamic-pp" = callPackage
+    ({ mkDerivation, ansi-terminal, base, blaze-builder, bytestring
+     , Cabal, hashable, HUnit-Plus, unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "dynamic-pp";
+       version = "0.1.0";
+       sha256 = "1i01k8c75yxdmxz3db4kajpqbgl8lcbfsp9rb9q2kzbk44fc2zpc";
+       buildDepends = [
+         ansi-terminal base blaze-builder bytestring Cabal hashable
+         unordered-containers utf8-string
+       ];
+       testDepends = [
+         ansi-terminal base blaze-builder bytestring Cabal hashable
+         HUnit-Plus unordered-containers utf8-string
+       ];
+       homepage = "https://github.com/emc2/dynamic-pp";
+       description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dynamic-state" = callPackage
     ({ mkDerivation, base, binary, bytestring, hashable
      , unordered-containers
@@ -44546,14 +44641,13 @@ self: {
      }:
      mkDerivation {
        pname = "either";
-       version = "4.4";
-       sha256 = "06519qw6y8ah168p2i03q1hmmrbmbai39fm6bna8rkp8zwlbkxww";
+       version = "4.4.1";
+       sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci";
        buildDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
          transformers-base
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/either/";
        description = "An either monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -45688,8 +45782,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-tools";
-       version = "2.6";
-       sha256 = "0ncyam72y5jvad73mbrcsv8y1hl5yybrx59vc8gxsyiy9mbrvs6v";
+       version = "2.7";
+       sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -46485,8 +46579,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exact-combinatorics";
-       version = "0.2.0.7";
-       sha256 = "05q31mh5x6i90n3ddxyqnhhjga7vbsbi947iywyqi53h2z2iw8f7";
+       version = "0.2.0.8";
+       sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient exact computation of combinatoric functions";
@@ -47402,13 +47496,12 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.7.1.0";
-       sha256 = "0dh0vqcwapia5kdcyr7j2qnz28bxnyxb8zmfz32zj5cgyf4635wc";
+       version = "0.7.2.0";
+       sha256 = "1zsghi7883y4ygl0iammfh1dmnsnh3x4ly77jhxg8xz8saw7dbir";
        buildDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
        ];
-       jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -52303,13 +52396,12 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-heap-view";
-       version = "0.5.3";
-       sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0";
+       version = "0.5.4";
+       sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1";
        buildDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
        testDepends = [ base deepseq ];
-       jailbreak = true;
        postInstall = ''
          ensureDir "$out/share/ghci"
          ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
@@ -55604,8 +55696,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.13.6";
-       sha256 = "1xj3vafk6rhy5nifixsp72n88i0idlknggcq1w626jfszx5anx2c";
+       version = "0.13.7";
+       sha256 = "1mrrd8hkpyhk40x9yg2b62i1d5d72p8g561wrhp80cd8f654cfij";
        buildDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
@@ -55881,8 +55973,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.13.6";
-       sha256 = "12fsbl56gf8inxvg7jqad2j689gpwp4bwznyz153y6xzgqs7vaq0";
+       version = "0.13.7";
+       sha256 = "15jgv5ci79r36jy6h5hq04zffryx5bbv2sknxnydn0cxng6kvgr9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -62740,6 +62832,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hein" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , http-conduit, process, transformers
+     }:
+     mkDerivation {
+       pname = "hein";
+       version = "0.1.0.2";
+       sha256 = "10g07m73iaq9v17hv2wx0mmza8vmlakyjjqfhb4rgf73pikfhvsf";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring directory filepath http-conduit process
+         transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/khanage/heineken";
+       description = "An extensible build helper for haskell, in the vein of leiningen";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , bytestring, containers, directory, directory-tree, dlist, errors
@@ -68688,6 +68800,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hscuid" = callPackage
+    ({ mkDerivation, base, containers, formatting, hostname, random
+     , text, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "hscuid";
+       version = "1.0.0";
+       sha256 = "19py373zmfmfr52grvv4gimm4i0gnsiy6xxp60m8b6bb4cbiyj75";
+       buildDepends = [
+         base formatting hostname random text time transformers unix
+       ];
+       testDepends = [ base containers ];
+       homepage = "https://github.com/eightyeight/hscuid";
+       description = "Collision-resistant IDs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hscurses" = callPackage
     ({ mkDerivation, base, exceptions, mtl, old-locale, old-time, unix
      }:
@@ -69237,6 +69366,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) lua;};
 
+  "hslua_0_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit, lua
+     , text
+     }:
+     mkDerivation {
+       pname = "hslua";
+       version = "0.4.0";
+       sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
+       buildDepends = [ base bytestring ];
+       testDepends = [ base bytestring hspec hspec-contrib HUnit text ];
+       extraLibraries = [ lua ];
+       configureFlags = [ "-fsystem-lua" ];
+       description = "A Lua language interpreter embedding in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) { inherit (pkgs) lua;};
+
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
      , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
@@ -73066,8 +73211,11 @@ self: {
      mkDerivation {
        pname = "iconv";
        version = "0.4.1.2";
+       revision = "1";
        sha256 = "0sd7by7idcnw368mdc1rs3j4xwbzdvgvkd5p1bwgw7wcd272c142";
+       editedCabalFile = "dec449ecde9679a092fc8513cec0bfe72031aa309b9b9795db572a726a976451";
        buildDepends = [ base bytestring ];
+       jailbreak = true;
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77308,8 +77456,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonschema-gen";
-       version = "0.3.0.0";
-       sha256 = "0jjqn5y5rxgm92y26p00kd5rkh4z1kyavj0v5axpbs9a9a08aplx";
+       version = "0.3.0.1";
+       sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d";
        buildDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
@@ -77317,7 +77465,6 @@ self: {
        testDepends = [
          aeson base bytestring containers process tagged text
        ];
-       jailbreak = true;
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
@@ -80429,10 +80576,9 @@ self: {
     ({ mkDerivation, base, lens, QuickCheck, transformers }:
      mkDerivation {
        pname = "lens-properties";
-       version = "4.7";
-       sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik";
+       version = "4.11";
+       sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w";
        buildDepends = [ base lens QuickCheck transformers ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
@@ -80598,8 +80744,8 @@ self: {
      }:
      mkDerivation {
        pname = "lexer-applicative";
-       version = "1.1";
-       sha256 = "1yl4404w5pmmpa1l7j4zlm5lg24jglxff04qdc757bd1r0bklbw1";
+       version = "2.1";
+       sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj";
        buildDepends = [ base regex-applicative srcloc ];
        testDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
@@ -82156,8 +82302,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "list-extras";
-       version = "0.4.1.3";
-       sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s";
+       version = "0.4.1.4";
+       sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Common not-so-common functions for lists";
@@ -82240,6 +82386,7 @@ self: {
          transformers-base
        ];
        testDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
@@ -83064,8 +83211,8 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "logfloat";
-       version = "0.13.3";
-       sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp";
+       version = "0.13.3.1";
+       sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s";
        buildDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
@@ -85377,7 +85524,9 @@ self: {
      mkDerivation {
        pname = "matrix";
        version = "0.3.4.3";
+       revision = "1";
        sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg";
+       editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace";
        buildDepends = [ base deepseq loop primitive vector ];
        testDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A native implementation of matrix operations";
@@ -85931,8 +86080,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.4";
-       sha256 = "1n7w11w3c9qag17nx6ssp2ni2kym980dwrwdrpdf7668n1jkcjvr";
+       version = "0.5";
+       sha256 = "0lz3w1faxlgyx0sc7nk5wg83zfks5595mxmlrspmbd4d85jk4nvh";
        buildDepends = [ base bytestring deepseq ghc-prim ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -86138,8 +86287,8 @@ self: {
      }:
      mkDerivation {
        pname = "metrics";
-       version = "0.2.1.0";
-       sha256 = "1q3j4ssij3v688yhn0zzs1bvyp21p0vnp2760qbvha1a7g0m8gif";
+       version = "0.3.0.0";
+       sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg";
        buildDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
@@ -86845,8 +86994,8 @@ self: {
      }:
      mkDerivation {
        pname = "minst-idx";
-       version = "0.1.2.1";
-       sha256 = "149128cags685m463p92vzri9cr501dby2vs0aqmrka8sg0py7j9";
+       version = "0.1.2.2";
+       sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv";
        buildDepends = [ base binary bytestring vector ];
        testDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/minst-idx/";
@@ -87489,12 +87638,11 @@ self: {
      }:
      mkDerivation {
        pname = "monad-journal";
-       version = "0.7";
-       sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2";
+       version = "0.7.1";
+       sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr";
        buildDepends = [
          base either monad-control mtl transformers transformers-base
        ];
-       jailbreak = true;
        homepage = "http://github.com/phaazon/monad-journal";
        description = "Pure logger typeclass and monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -89205,8 +89353,8 @@ self: {
      }:
      mkDerivation {
        pname = "muesli";
-       version = "0.1.0.1";
-       sha256 = "10dyk5yz911lfdf11iizmpinha7h09gd7yrg67wjsb6myyvwbdg5";
+       version = "0.1.1.0";
+       sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w";
        buildDepends = [
          base bytestring cereal containers directory filepath hashable mtl
          psqueues time
@@ -90666,6 +90814,7 @@ self: {
        sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy";
        buildDepends = [ base base-prelude parsec template-haskell ];
        testDepends = [ base-prelude HTF ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
@@ -91203,8 +91352,8 @@ self: {
      }:
      mkDerivation {
        pname = "network";
-       version = "2.6.1.0";
-       sha256 = "0nx85kvrzjm258qr5blphli44gipc7nvxgvbyq8ifv42ll6w6jdj";
+       version = "2.6.2.0";
+       sha256 = "0szkzllpc6vs72fz7nykf5y7vc8mvqfv6h4sshfwmdazl2zv03n5";
        buildDepends = [ base bytestring unix ];
        testDepends = [
          base bytestring HUnit test-framework test-framework-hunit
@@ -91258,6 +91407,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-anonymous-tor" = callPackage
+    ({ mkDerivation, attoparsec, base, base32string, bytestring
+     , exceptions, hexstring, hspec, hspec-attoparsec
+     , hspec-expectations, network, network-attoparsec, network-simple
+     , socks, text, transformers
+     }:
+     mkDerivation {
+       pname = "network-anonymous-tor";
+       version = "0.9.0";
+       sha256 = "02ywcdjrrjivzmzj22nxx81xkcxplhcaxpz21196r3kni8qhi0h0";
+       buildDepends = [
+         attoparsec base base32string bytestring exceptions hexstring
+         network network-attoparsec network-simple socks text transformers
+       ];
+       testDepends = [
+         attoparsec base base32string bytestring exceptions hspec
+         hspec-attoparsec hspec-expectations network network-simple socks
+         text transformers
+       ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Haskell API for Tor 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
@@ -95013,8 +95186,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.1.0";
-       sha256 = "1z6q9sb5h0bbvkdlv6abvhgz0cgw4vixs3pv531l9jpkmvfri8r4";
+       version = "0.1.2.0";
+       sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -98136,8 +98309,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-vector";
-       version = "0.6.1";
-       sha256 = "12a50i6fhvri76sr0h3fz9ds5yvnapdyx4n3rcxz2rk543mdvhsp";
+       version = "0.6.2";
+       sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn";
        buildDepends = [
          base monad-primitive pipes primitive transformers vector
        ];
@@ -98722,8 +98895,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "pointless-fun";
-       version = "1.1.0.5";
-       sha256 = "17gzh3w5j05l6ig1sdjqrl7br17zzpy9yh5k2lck0gjl5prcjclw";
+       version = "1.1.0.6";
+       sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Some common point-free combinators";
@@ -99453,6 +99626,7 @@ self: {
          base-prelude bytestring HTF postgresql-libpq QuickCheck
          quickcheck-instances scientific text time uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -100066,8 +100240,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-safeenum";
-       version = "0.1.1.1";
-       sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
+       version = "0.1.1.2";
+       sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
@@ -101456,6 +101630,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "publicsuffix" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, hspec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "publicsuffix";
+       version = "0.20150507";
+       sha256 = "1n1wns0n48rqva5zz4kyj84rw0lf7ih612cp0dhsdk9jgc1kapsj";
+       buildDepends = [ base bytestring filepath template-haskell text ];
+       testDepends = [ base hspec text ];
+       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
+       description = "The publicsuffix list exposed as proper Haskell types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "publicsuffixlist" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , HUnit, idna, text, utf8-string
@@ -103400,8 +103589,8 @@ self: {
      }:
      mkDerivation {
        pname = "razom-text-util";
-       version = "0.1.0.0";
-       sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m";
+       version = "0.1.1.0";
+       sha256 = "1zmqfjbhvszf2ky6556q1311x23y1h0v90yqaa1mynn8lqhplgkv";
        buildDepends = [ base regex-applicative smaoin text-position ];
        testDepends = [ base QuickCheck regex-applicative smaoin ];
        homepage = "http://rel4tion.org/projects/razom-text-util/";
@@ -104030,8 +104219,8 @@ self: {
      }:
      mkDerivation {
        pname = "redis";
-       version = "0.14";
-       sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094";
+       version = "0.14.1";
+       sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b";
        buildDepends = [
          base bytestring concurrent-extra containers exceptions mtl network
          old-time utf8-string
@@ -105112,8 +105301,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.4.0.1";
-       sha256 = "00ysy5lg0mpv5b1vcjlfi6nx72df3iqz5nmrfsrr0k7i65xp1fzi";
+       version = "0.5.0.0";
+       sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -106116,8 +106305,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-stringmap";
-       version = "0.2.0.5";
-       sha256 = "0xnvzwwaxfl2iphpicprn0wvlfk3cg6vz53kl2gv1fi322jcjv3b";
+       version = "0.2.0.6";
+       sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6";
        buildDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -107415,10 +107604,9 @@ self: {
      }:
      mkDerivation {
        pname = "rss";
-       version = "3000.2.0.4";
-       sha256 = "1kq7bk3kl48699n2ri15im5ds8cd2pmcjglh06br1knxkli80kbq";
+       version = "3000.2.0.5";
+       sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1";
        buildDepends = [ base HaXml network network-uri old-locale time ];
-       jailbreak = true;
        homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
@@ -108976,6 +109164,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scotty_0_10_0" = callPackage
+    ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
+     , case-insensitive, data-default-class, directory, hspec, hspec-wai
+     , http-types, lifted-base, monad-control, mtl, network
+     , regex-compat, text, transformers, transformers-base
+     , transformers-compat, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "scotty";
+       version = "0.10.0";
+       sha256 = "0r1k96cf5nykgg987hfqfayyix23rjfn73njqqsfxjiai1dgrnzn";
+       buildDepends = [
+         aeson base blaze-builder bytestring case-insensitive
+         data-default-class http-types monad-control mtl network
+         regex-compat text transformers transformers-base
+         transformers-compat wai wai-extra warp
+       ];
+       testDepends = [
+         async base data-default-class directory hspec hspec-wai http-types
+         lifted-base network text wai
+       ];
+       homepage = "https://github.com/scotty-web/scotty";
+       description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scotty-binding-play" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl
      , scotty, template-haskell, text, transformers
@@ -109556,12 +109770,12 @@ self: {
      }) {};
 
   "securemem" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, ghc-prim }:
+    ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }:
      mkDerivation {
        pname = "securemem";
-       version = "0.1.7";
-       sha256 = "14mmis2y9xf3jzmf6s6g7g8ixgbrx99x0b422zv4ix3vpx2lj57r";
-       buildDepends = [ base byteable bytestring ghc-prim ];
+       version = "0.1.8";
+       sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2";
+       buildDepends = [ base byteable bytestring ghc-prim memory ];
        homepage = "http://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
        license = stdenv.lib.licenses.bsd3;
@@ -110176,24 +110390,24 @@ self: {
 
   "servant" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
-     , bytestring-conversion, case-insensitive, doctest, filemanip
-     , hspec, http-media, http-types, network-uri, parsec, QuickCheck
-     , quickcheck-instances, string-conversions, text, url
+     , bytestring-conversion, case-insensitive, directory, doctest
+     , filemanip, filepath, hspec, http-media, http-types, network-uri
+     , parsec, QuickCheck, quickcheck-instances, string-conversions
+     , text, url
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5";
-       editedCabalFile = "b9f6399d21ba876a4e30cb8e48cb040a972fe82dbac93c62691dc6eae530c25b";
+       version = "0.4.1";
+       sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
          string-conversions text
        ];
        testDepends = [
-         aeson attoparsec base bytestring doctest filemanip hspec parsec
-         QuickCheck quickcheck-instances string-conversions text url
+         aeson attoparsec base bytestring directory doctest filemanip
+         filepath hspec parsec QuickCheck quickcheck-instances
+         string-conversions text url
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
@@ -110204,8 +110418,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.0.0";
-       sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an";
+       version = "0.4.1";
+       sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp";
        buildDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -110221,10 +110435,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm";
-       editedCabalFile = "9a7ca5856ef66a4345f4732e7ca5680f55502b899bbe1e2f1397b0e55d33ad37";
+       version = "0.4.1";
+       sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -110247,8 +110459,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.0";
-       sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m";
+       version = "0.4.1";
+       sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110262,6 +110474,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-ede" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ede, either, filepath
+     , http-media, http-types, semigroups, servant, servant-server, text
+     , transformers, unordered-containers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-ede";
+       version = "0.4";
+       sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring ede either filepath http-media http-types
+         semigroups servant servant-server text transformers
+         unordered-containers wai warp
+       ];
+       homepage = "http://github.com/alpmestan/servant-ede";
+       description = "Combinators for rendering EDE templates in servant web applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-jquery" = callPackage
     ({ mkDerivation, aeson, base, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
@@ -110269,8 +110502,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.0";
-       sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5";
+       version = "0.4.1";
+       sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110289,8 +110522,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.0.0";
-       sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl";
+       version = "0.4.1";
+       sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0";
        buildDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -110379,28 +110612,26 @@ self: {
   "servant-server" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, directory, doctest, either, exceptions
-     , filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network
-     , network-uri, parsec, QuickCheck, safe, servant, split
+     , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
+     , network, network-uri, parsec, QuickCheck, safe, servant, split
      , string-conversions, system-filepath, temporary, text
      , transformers, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx";
-       editedCabalFile = "2e024f79e857aa5ad15cf171c1883b99eb45e901ec888eb68d9c6099c88bbbe8";
+       version = "0.4.1";
+       sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson attoparsec base bytestring either http-types mmorph mtl
-         network-uri safe servant split string-conversions system-filepath
-         text transformers wai wai-app-static warp
+         aeson attoparsec base bytestring either filepath http-types mmorph
+         mtl network-uri safe servant split string-conversions
+         system-filepath text transformers wai wai-app-static warp
        ];
        testDepends = [
          aeson base bytestring bytestring-conversion directory doctest
-         either exceptions filemanip hspec hspec-wai http-types mtl network
-         parsec QuickCheck servant string-conversions temporary text
+         either exceptions filemanip filepath hspec hspec-wai http-types mtl
+         network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
        jailbreak = true;
@@ -114458,10 +114689,8 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.1.0.1";
-       revision = "1";
-       sha256 = "06c5vrpwrlp1ab8axvbmrar382d780a8m6zqvvjb6zjahgd5cl32";
-       editedCabalFile = "ef4027263ba8c3069f127839a7bace4b09d6d78714183b3faab935919c57e09c";
+       version = "0.2.0.0";
+       sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw";
        buildDepends = [ base bytestring ];
        testDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
@@ -116905,8 +117134,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-chans";
-       version = "3.0.0.3";
-       sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk";
+       version = "3.0.0.4";
+       sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
        buildDepends = [ base stm ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
@@ -118632,12 +118861,13 @@ self: {
      }:
      mkDerivation {
        pname = "syb-with-class";
-       version = "0.6.1.5";
-       sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn";
+       version = "0.6.1.6";
+       revision = "1";
+       sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n";
+       editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c";
        buildDepends = [
          array base bytestring containers template-haskell
        ];
-       jailbreak = true;
        description = "Scrap Your Boilerplate With Class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122186,6 +122416,7 @@ self: {
          base containers HTF list-extras loch-th placeholders
          template-haskell th-expand-syns
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/th-instance-reification";
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
@@ -123158,6 +123389,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "time-qq" = callPackage
+    ({ mkDerivation, base, hspec, old-locale, template-haskell, time }:
+     mkDerivation {
+       pname = "time-qq";
+       version = "0.0.0.1";
+       sha256 = "11ib2i7693jvszbgzd2673953pklxphd0mhwkf67q47d6b5spdpq";
+       buildDepends = [ base old-locale template-haskell time ];
+       testDepends = [ base hspec ];
+       homepage = "https://github.com/christian-marie/time-qq";
+       description = "Quasi-quoter for UTCTime times";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "time-recurrence" = callPackage
     ({ mkDerivation, base, data-ordlist, HUnit, mtl, old-locale
      , test-framework, test-framework-hunit, time
@@ -124767,7 +125011,9 @@ self: {
      mkDerivation {
        pname = "ttrie";
        version = "0.1.2";
+       revision = "1";
        sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
+       editedCabalFile = "60673b32699d1b010c285811c892a1aa7b8890733083c82148ecd033b4db1222";
        buildDepends = [ atomic-primops base hashable primitive stm ];
        testDepends = [
          base containers hashable QuickCheck stm test-framework
@@ -126782,8 +127028,8 @@ self: {
     ({ mkDerivation, base, containers, logict, mtl }:
      mkDerivation {
        pname = "unification-fd";
-       version = "0.10.0";
-       sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b";
+       version = "0.10.0.1";
+       sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
        buildDepends = [ base containers logict mtl ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Simple generic unification algorithms";
@@ -127113,8 +127359,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "unix-bytestring";
-       version = "0.3.7.2";
-       sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s";
+       version = "0.3.7.3";
+       sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
        buildDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Unix/Posix-specific functions for ByteStrings";
@@ -127554,8 +127800,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.1";
-       sha256 = "19nqdv61bsp470m94vq9cdpcyw1q9rwfplmpj09dd5pkmp7f6m8s";
+       version = "0.1.2";
+       sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf";
        buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
          attoparsec base bytestring derive HUnit lens QuickCheck
@@ -130548,8 +130794,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.9.1.0";
-       sha256 = "1niszz8v8x4qkzssc5pmhpqsq3v9ad4gscx0dxxxpfz76fcs4f1k";
+       version = "0.10.0.0";
+       sha256 = "1sjlajp79j9mj0xaz9srzvai86il95vzq7668ydzj9hllllf04bk";
        buildDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -131554,8 +131800,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkit";
-       version = "0.13.1.2";
-       sha256 = "090gp3700dafb30jdf1bw1vcn7rj7cs4h0glbi5rqp2ssg5f78kc";
+       version = "0.13.1.3";
+       sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306";
        buildDepends = [ base bytestring cairo glib gtk mtl pango text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ webkit ];
@@ -131584,8 +131830,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkitgtk3";
-       version = "0.13.1.2";
-       sha256 = "11b9n7q5xljjfnpfbh91kzs568y7nqdys5rm518cr4an20mbi47l";
+       version = "0.13.1.3";
+       sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk";
        buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ webkit ];
@@ -132900,8 +133146,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509";
-       version = "1.5.0.1";
-       sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba";
+       version = "1.5.1";
+       sha256 = "1mxg3bill1zqxdn6x0ayf8dja7y3xqikjaj9dhwf22y24vsj6v2n";
        buildDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          crypto-pubkey-types cryptohash directory filepath hourglass mtl pem