hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20150922-42-g3ca1747 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/ad0723f0c71afc7b5e86eba1958aed0fd5761c95
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/c7478af457cffe9194a43314b6c0fded1546b275
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/8ec1fc34193fe53e8e257219cb2e4618f82cade5
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/e6bcfb640c367a777c0b398240fe58ef20d141c8

1 files changed, 1289 insertions, 391 deletions

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e246b9ecf9a9..f39fdedb64bf 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2923,6 +2923,8 @@ self: {
        pname = "ChasingBottoms";
        version = "1.3.0.13";
        sha256 = "f40e250db12ab76c31e1ed78ce3d11a84f601ab2290fe946cfe437669a3468b9";
+       revision = "1";
+       editedCabalFile = "1d7d5dafb21bd55a1f5828af6ac380fcb6373a9e9fb55e41ef34efa984e3b5d8";
        libraryHaskellDepends = [
          base containers mtl QuickCheck random syb
        ];
@@ -3864,6 +3866,8 @@ self: {
        pname = "DRBG";
        version = "0.5.4";
        sha256 = "bd617d0b0458acb810f20343d56ca88a0fc50c12c169a5895e6648356566d30e";
+       revision = "1";
+       editedCabalFile = "c331573809a538f82a7ba965c9d800c46f6e4518d6192f081432aec41fa66cc1";
        libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 crypto-api
          cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
@@ -3878,6 +3882,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "DRBG_0_5_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, cipher-aes128
+     , crypto-api, crypto-api-tests, cryptohash-cryptoapi, entropy
+     , HUnit, mtl, parallel, prettyclass, QuickCheck, tagged
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "DRBG";
+       version = "0.5.5";
+       sha256 = "21df3202486cc83c7cc3f867cb139eac9a3f69bd91b5f6b016ae026e03c33bfd";
+       libraryHaskellDepends = [
+         base bytestring cereal cipher-aes128 crypto-api
+         cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
+       ];
+       testHaskellDepends = [
+         base binary bytestring cereal cipher-aes128 crypto-api
+         crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel
+         prettyclass QuickCheck tagged test-framework test-framework-hunit
+       ];
+       jailbreak = true;
+       description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "DSA" = callPackage
     ({ mkDerivation, base, binary, bytestring, crypto-api
      , crypto-pubkey-types, DRBG, ghc-prim, HUnit, integer-gmp
@@ -5273,8 +5302,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "FPretty";
-       version = "1.0";
-       sha256 = "eae596ac1b9ad3de2edc9fb1e8eeb3b047baffb6c6257fd3c237a9d0620d83d1";
+       version = "1.1";
+       sha256 = "b8ac0122e923b0e20cee6ba77ffb07dfeaa96a194cdc1622808e97f443a8eb42";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html";
        description = "Efficient simple pretty printing combinators";
@@ -6326,8 +6355,8 @@ self: {
      }:
      mkDerivation {
        pname = "GPipe";
-       version = "2.1.3";
-       sha256 = "dcfd17d26a380cf57ed4e3d95ee7135230212e43914f7dd2ecd0e6c028aacb7f";
+       version = "2.1.4";
+       sha256 = "07dd9ba595757b458ce78691441b686ab3500cb129a175b185b11d5a6186a509";
        libraryHaskellDepends = [
          base Boolean containers exception-transformers gl hashtables linear
          transformers
@@ -9486,17 +9515,15 @@ self: {
      }) {};
 
   "HaskRel" = callPackage
-    ({ mkDerivation, base, containers, directory, ghc-prim, HList, lens
+    ({ mkDerivation, base, containers, directory, ghc-prim, HList
      , tagged
      }:
      mkDerivation {
        pname = "HaskRel";
-       version = "0.1.0.0";
-       sha256 = "6e15acca665e82e9eb757ac7d648284372a62f2faa563fa81da386d8cbc9d5f8";
-       revision = "2";
-       editedCabalFile = "7366533c524f20f57e05df8c7299156bbc1b302ad2885fe3522ba6bea1680de1";
+       version = "0.1.0.1";
+       sha256 = "737b391cb3063e243acd3d1bee2a3b5e6c0fce8f240f4c4df8c38d44287e6e47";
        libraryHaskellDepends = [
-         base containers directory ghc-prim HList lens tagged
+         base containers directory ghc-prim HList tagged
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
        license = stdenv.lib.licenses.gpl2;
@@ -9592,7 +9619,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HaskellNet" = callPackage
+  "HaskellNet_0_4_5" = callPackage
     ({ mkDerivation, array, base, base64-string, bytestring, cryptohash
      , mime-mail, mtl, network, old-time, pretty, text
      }:
@@ -9607,9 +9634,10 @@ self: {
        homepage = "https://github.com/jtdaugherty/HaskellNet";
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HaskellNet_0_5" = callPackage
+  "HaskellNet" = callPackage
     ({ mkDerivation, array, base, base64-string, bytestring, cryptohash
      , mime-mail, mtl, network, old-time, pretty, text
      }:
@@ -9624,7 +9652,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/HaskellNet";
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellNet-SSL" = callPackage
@@ -11490,8 +11517,8 @@ self: {
   "LambdaHack" = callPackage
     ({ mkDerivation, array, assert-failure, async, base, binary
      , bytestring, containers, data-default, deepseq, directory
-     , enummapset-th, filepath, ghc-prim, gtk, hashable, hsini, keys
-     , miniutter, mtl, old-time, pretty-show, random, stm
+     , enummapset-th, filepath, ghc-prim, gtk, gtk2, hashable, hsini
+     , keys, miniutter, mtl, old-time, pretty-show, random, stm
      , template-haskell, text, transformers, unordered-containers
      , vector, vector-binary-instances, zlib
      }:
@@ -11508,6 +11535,7 @@ self: {
          text transformers unordered-containers vector
          vector-binary-instances zlib
        ];
+       libraryPkgconfigDepends = [ gtk2 ];
        executableHaskellDepends = [
          array assert-failure async base binary bytestring containers
          data-default deepseq directory enummapset-th filepath ghc-prim
@@ -11526,7 +11554,7 @@ self: {
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "LambdaINet" = callPackage
     ({ mkDerivation, base, containers, GLFW, GLFW-task, monad-task, mtl
@@ -11610,6 +11638,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Lambdajudge" = callPackage
+    ({ mkDerivation, base, filepath, hspec, mtl, process, text }:
+     mkDerivation {
+       pname = "Lambdajudge";
+       version = "1.0.0.4";
+       sha256 = "652cc0c857d0fc65d405fdc62bd4e84d8bf18e878a2fbf66d79c087d38d3436d";
+       libraryHaskellDepends = [ base filepath hspec mtl process text ];
+       testHaskellDepends = [ base filepath hspec mtl process text ];
+       jailbreak = true;
+       homepage = "http://venugangireddy.github.io/Lambdajudge/";
+       description = "A library to easily host Haskell based programming competitions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Lambdaya" = callPackage
     ({ mkDerivation, base, mtl, unix }:
      mkDerivation {
@@ -12301,7 +12343,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "MemoTrie" = callPackage
+  "MemoTrie_0_6_2" = callPackage
     ({ mkDerivation, base, void }:
      mkDerivation {
        pname = "MemoTrie";
@@ -12311,6 +12353,19 @@ self: {
        homepage = "http://haskell.org/haskellwiki/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "MemoTrie" = callPackage
+    ({ mkDerivation, base, void }:
+     mkDerivation {
+       pname = "MemoTrie";
+       version = "0.6.3";
+       sha256 = "ca99debcd2cd4349e26e4438e8d896af3a274b8edc859a0216c2cc9e2f7b1334";
+       libraryHaskellDepends = [ base void ];
+       homepage = "https://github.com/conal/MemoTrie";
+       description = "Trie-based memo functions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "MetaHDBC" = callPackage
@@ -17199,8 +17254,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.10.0.0";
-       sha256 = "9f606d7984a87bdae438912ff94ffff9285150908e76c55c5efb5fb709c35678";
+       version = "0.10.0.1";
+       sha256 = "ef80deb37728e89369f34c3a8cc9c4190d8aa50911a08a9e1e0c1993466595d2";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          crypto-random directory focus hashable http-types hvect list-t
@@ -19471,7 +19526,10 @@ self: {
        pname = "Yampa";
        version = "0.9.6";
        sha256 = "e0f9a9c70d67e79f15012f6f4515a97a0ec4a369f86e10eeea738e0896063528";
+       revision = "1";
+       editedCabalFile = "acf73dc58b9dbdb285957308a5453c3b507873f517753340c1df83a9c2625b8e";
        libraryHaskellDepends = [ base random ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -19517,7 +19575,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Yampa" = callPackage
+  "Yampa_0_10_3" = callPackage
     ({ mkDerivation, base, deepseq, random }:
      mkDerivation {
        pname = "Yampa";
@@ -19527,6 +19585,20 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "Yampa" = callPackage
+    ({ mkDerivation, base, deepseq, random }:
+     mkDerivation {
+       pname = "Yampa";
+       version = "0.10.4";
+       sha256 = "6e126b668858e9bedaff8fb2ffe07a4c43341052779f351e05b7ff997a30d790";
+       libraryHaskellDepends = [ base deepseq random ];
+       testHaskellDepends = [ base ];
+       homepage = "http://www.haskell.org/haskellwiki/Yampa";
+       description = "Library for programming hybrid systems";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Yampa-core" = callPackage
@@ -20263,6 +20335,8 @@ self: {
        pname = "acid-state";
        version = "0.12.4";
        sha256 = "4d2db186740e8d33fab5c6fd7ef2364e0f6bc39bdf58be845fb0a57893b86255";
+       revision = "1";
+       editedCabalFile = "a2b63490651e784a60fe3a8c73f877c5f51e08e6df8ff17e7a4c4bd112f1670d";
        libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
@@ -20283,6 +20357,8 @@ self: {
        pname = "acid-state";
        version = "0.13.1";
        sha256 = "114fd57ee31529fcde7b7fcdb70face4095fd0aa879655b1b47ceb1cba6591b3";
+       revision = "1";
+       editedCabalFile = "dbcdc9e45fd8c20f27a82019a8375a9cd81a4568e60f2a4ec8125e3b8d2d5377";
        libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
@@ -21957,16 +22033,16 @@ self: {
      }) {};
 
   "aeson-value-parser" = callPackage
-    ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific, text
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific
+     , success, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.9.0";
-       sha256 = "f53c0bd8a4fedb71ed74a2019b2d601ca3d315ae0db332e4f49d88f2ea68de8f";
+       version = "0.11";
+       sha256 = "894b2465322aeb049857aca34f2c713289edfe9dc93d33df9a5d747862bca88f";
        libraryHaskellDepends = [
-         aeson base-prelude mtl-prelude scientific text unordered-containers
-         vector
+         aeson base-prelude mtl-prelude scientific success text
+         unordered-containers vector
        ];
        homepage = "https://github.com/sannsyn/aeson-value-parser";
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
@@ -22238,8 +22314,8 @@ self: {
      }:
      mkDerivation {
        pname = "airship";
-       version = "0.4.0.0";
-       sha256 = "b6ce74d30bc6b031086deb768faab7c6ded109faae409f2f874e9c3839e8a606";
+       version = "0.4.1.0";
+       sha256 = "6706b25bde3a243ed54020dc6967ee247a2136a59a7665c6a142116ab36e9a51";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring
          bytestring-trie case-insensitive cryptohash directory either
@@ -22252,7 +22328,6 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck text
          transformers wai
        ];
-       jailbreak = true;
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
@@ -22262,12 +22337,12 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.3";
-       sha256 = "f224cc50db525d62a2810c777b5aaacab938ae36aa76d845ba1410100d936c07";
+       version = "4.3.1";
+       sha256 = "bff0ea9f344eef7f90e54613e261c8b45e39b428e580eb56d3eab6f0c20b2584";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
-       homepage = "http://github.com/dsorokin/aivika";
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
        description = "A multi-paradigm simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29275,8 +29350,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.1.0";
-       sha256 = "ecfca08afd198bdace14ac1700a4a9f91cb0a8545a6a959a3712f88e3beb29f6";
+       version = "0.4.2.0";
+       sha256 = "d9cda09ed9404a504c8a772cfbbb1aebb5de98f0dc735eb096077dc527b6ee0f";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -29501,6 +29576,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "atp-haskell" = callPackage
+    ({ mkDerivation, base, containers, HUnit, mtl, parsec, pretty
+     , template-haskell, time
+     }:
+     mkDerivation {
+       pname = "atp-haskell";
+       version = "1.7";
+       sha256 = "d746df532106f4237d23a1f191ea6dcc0211b5f810b923f7556466bb081f860e";
+       libraryHaskellDepends = [
+         base containers HUnit mtl parsec pretty template-haskell time
+       ];
+       testHaskellDepends = [ base containers HUnit time ];
+       homepage = "https://github.com/seereason/atp-haskell";
+       description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "attempt" = callPackage
     ({ mkDerivation, base, failure }:
      mkDerivation {
@@ -35142,7 +35234,7 @@ self: {
 
   "bitspeak" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib
-     , bindings-gobject, gdk2, gtk, pango
+     , bindings-gobject, gdk2, gtk2, pango
      }:
      mkDerivation {
        pname = "bitspeak";
@@ -35153,12 +35245,12 @@ self: {
        executableHaskellDepends = [
          base bindings-DSL bindings-glib bindings-gobject
        ];
-       executablePkgconfigDepends = [ gdk2 gtk pango ];
+       executablePkgconfigDepends = [ gdk2 gtk2 pango ];
        jailbreak = true;
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gdk2 = null; inherit (pkgs.gnome) gtk; 
+     }) {gdk2 = null; gtk2 = pkgs.gnome2.gtk; 
          inherit (pkgs.gnome) pango;};
 
   "bitstream" = callPackage
@@ -35388,6 +35480,24 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "blake2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, hlint
+     , QuickCheck, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "blake2";
+       version = "0.1.0";
+       sha256 = "d4cdb38b973125fdd80a12f335ec536dc5c5d1dfd5611c9ebe46c3bf78841ce5";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring hlint QuickCheck tasty
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/centromere/blake2";
+       description = "A library providing BLAKE2";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "blakesum" = callPackage
     ({ mkDerivation, base, bytestring, text, vector }:
      mkDerivation {
@@ -36316,8 +36426,8 @@ self: {
 
   "bluetile" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, filepath
-     , glade, gtk, mtl, process, random, regex-compat, unix, utf8-string
-     , X11, X11-xft, xmonad, xmonad-contrib
+     , glade, gtk, gtk2, mtl, process, random, regex-compat, unix
+     , utf8-string, X11, X11-xft, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "bluetile";
@@ -36330,11 +36440,12 @@ self: {
          random regex-compat unix utf8-string X11 X11-xft xmonad
          xmonad-contrib
        ];
+       executablePkgconfigDepends = [ gtk2 ];
        homepage = "http://www.bluetile.org/";
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "bluetileutils" = callPackage
     ({ mkDerivation, base, gtk }:
@@ -36889,8 +37000,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.2.2";
-       sha256 = "6664472f3784a4dce3911b22196c2db26400d4a05e60475a44803b0c92fd944a";
+       version = "0.2.3";
+       sha256 = "4f9062ccc4cc4a9756cc1dcf057d96c8c4a587f0405d11fa75619555afe3b402";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37004,7 +37115,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bson" = callPackage
+  "bson_0_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptohash
      , data-binary-ieee754, mtl, network, QuickCheck, test-framework
      , test-framework-quickcheck2, text, time
@@ -37026,6 +37137,30 @@ self: {
        homepage = "http://github.com/mongodb-haskell/bson";
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "bson" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.1";
+       sha256 = "054c24f90a713bedf6288df122db0ca17486c17595bdb45d3442da27d940991f";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         QuickCheck test-framework test-framework-quickcheck2 text time
+       ];
+       doCheck = false;
+       homepage = "http://github.com/mongodb-haskell/bson";
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = "unknown";
      }) {};
 
   "bson-generic" = callPackage
@@ -41215,6 +41350,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cayley-dickson" = callPackage
+    ({ mkDerivation, base, random }:
+     mkDerivation {
+       pname = "cayley-dickson";
+       version = "0.1.4.0";
+       sha256 = "825dc8c04743660142b45095cbcaae371b83936f9a4ffe0a117b1aef4d813063";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base random ];
+       homepage = "https://github.com/lmj/cayley-dickson";
+       description = "Complex numbers, quaternions, octonions, sedenions, etc";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cblrepo" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
      , containers, directory, filepath, mtl, optparse-applicative
@@ -41349,18 +41497,19 @@ self: {
      }) {};
 
   "cellrenderer-cairo" = callPackage
-    ({ mkDerivation, base, c2hs, cairo, glib, gtk, mtl }:
+    ({ mkDerivation, base, c2hs, cairo, glib, gtk, gtk2, mtl }:
      mkDerivation {
        pname = "cellrenderer-cairo";
        version = "1.0.0.0";
        sha256 = "fca3c3c7012a29f72f7bf8912c524d1058e5152eaf051ea65e0ee65c03ce8d15";
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "cereal_0_4_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim }:
@@ -41389,14 +41538,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cereal_0_5_0_0" = callPackage
+  "cereal_0_5_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim
      , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "cereal";
-       version = "0.5.0.0";
-       sha256 = "2c17fd0b8e72be4f32e148e18cd7190424aa631d11d6db8420bbb2faa0202a66";
+       version = "0.5.1.0";
+       sha256 = "30f95a5c30b402e2d9020daef8297e338941f1bbe2084259d92f6bb4015904cb";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim
        ];
@@ -41527,12 +41676,15 @@ self: {
        pname = "certificate";
        version = "1.3.9";
        sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1";
+       revision = "1";
+       editedCabalFile = "6b4b703a1c34a9fa3e0223f3ff2796183c7b9b7351da1ad34478225637e837ba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
        ];
+       jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
@@ -42700,8 +42852,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, parseargs }:
      mkDerivation {
        pname = "ciphersaber2";
-       version = "0.1.0.0";
-       sha256 = "448fa27fa1a0888ac05f7572df88dea1073685a69b1bedb6b83f26fcd82f4dcf";
+       version = "0.1.1.0";
+       sha256 = "7bd5446e37bc24ec0098136d5b46468f0ca184be3c45a07c3c07e1e6074bcc42";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring ];
@@ -42990,14 +43142,13 @@ self: {
     ({ mkDerivation, base, bytestring, directory, safe, strict, time }:
      mkDerivation {
        pname = "clanki";
-       version = "1.2.5";
-       sha256 = "61574eac6e0a4fe0c0dddeaf82f0c27c44e6538d0fbb09900743e0ce5eff2469";
+       version = "1.2.6";
+       sha256 = "97cbfea975eb7a49f86ca5cbad2ece1818fd8dee47740f934c9a0d33ffdfb3a0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring directory safe strict time
        ];
-       jailbreak = true;
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43150,8 +43301,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.6.3";
-       sha256 = "fa43226b3b483ad925fddc75fd8bec799b11e2d0e5cc32d69353b1a82fea5d5c";
+       version = "0.6.4";
+       sha256 = "f53a9f47f4819a75edcfc59597afc5042642e6e8c4c96330135cf50906916bcf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43267,8 +43418,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.6.3";
-       sha256 = "4a44b055e816d3b2cfe71718ee0b8e6b04f11aaf94ef4847b638ecd6f60c9e86";
+       version = "0.6.4";
+       sha256 = "06ea6a319dbdeaec64058b8015e6f0f61a63f359a3c182f9eaa05460c1b8389f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -43613,8 +43764,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.6.2";
-       sha256 = "81ecdf464b508f31251580e8d1408490b9d161e951a26326edd82a5418b19e08";
+       version = "0.6.3";
+       sha256 = "3f3246984a6721118bdc4c6a664642a6034c94e430ea5dcf16f3710f035e8592";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -45636,35 +45787,40 @@ self: {
      }) {};
 
   "coinbase-exchange" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
-     , byteable, bytestring, conduit, conduit-extra, cryptohash, deepseq
-     , exceptions, hashable, http-client, http-client-tls, http-conduit
-     , http-types, mtl, network, old-locale, resourcet, scientific
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text, time
-     , transformers, transformers-base, uuid, uuid-aeson, vector
+    ({ mkDerivation, aeson, aeson-casing, async, base
+     , base64-bytestring, byteable, bytestring, conduit, conduit-extra
+     , cryptohash, deepseq, exceptions, hashable, http-client
+     , http-client-tls, http-conduit, http-types, mtl, network
+     , old-locale, random, resourcet, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text, time, transformers
+     , transformers-base, unordered-containers, uuid, uuid-aeson, vector
      , websockets, wuss
      }:
      mkDerivation {
        pname = "coinbase-exchange";
-       version = "0.2.0.2";
-       sha256 = "c25aff3b565754e96f8032fed9c3b4413f1ea24b116b9e5df0d8edf6dd2d0956";
+       version = "0.3.0.0";
+       sha256 = "930a8971e2e558f1acfcf7ff545a6ca919ec7e11eb9c9b3fa4c50b94c6c5930b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring byteable bytestring
          conduit conduit-extra cryptohash deepseq exceptions hashable
          http-conduit http-types mtl network old-locale resourcet scientific
-         text time transformers-base uuid uuid-aeson vector websockets wuss
+         text time transformers-base unordered-containers uuid uuid-aeson
+         vector websockets wuss
        ];
        executableHaskellDepends = [
          aeson base bytestring conduit conduit-extra http-client
          http-client-tls http-conduit network old-locale resourcet
-         scientific text time transformers uuid websockets wuss
+         scientific text time transformers unordered-containers uuid
+         websockets wuss
        ];
        testHaskellDepends = [
-         base bytestring http-client-tls http-conduit old-locale tasty
-         tasty-hunit tasty-quickcheck tasty-th time transformers uuid
+         aeson async base bytestring http-client-tls http-conduit old-locale
+         random scientific tasty tasty-hunit tasty-quickcheck tasty-th time
+         transformers unordered-containers uuid websockets
        ];
+       jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47077,13 +47233,13 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.7.0";
-       sha256 = "f2ca9f606d34b1faa53f48315deb5d68d2e5019055341010b86b6f6f8470ed92";
+       version = "1.7.1";
+       sha256 = "3aead087a1db0b762b13bf62e11f01673d0a8b4f9d3e489fa18dd7fb5fa2098d";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions process stm
          terminal-size text transformers unix
        ];
-       description = "Ungarble output from several threads";
+       description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -48533,7 +48689,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "consul-haskell" = callPackage
+  "consul-haskell_0_2_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , http-client, http-types, HUnit, lifted-async, lifted-base
      , monad-control, network, stm, tasty, tasty-hunit, text
@@ -48555,6 +48711,31 @@ self: {
        homepage = "https://github.com/alphaHeavy/consul-haskell";
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "consul-haskell" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , connection, either, http-client, http-client-tls, http-types
+     , HUnit, lifted-async, lifted-base, monad-control, network, stm
+     , tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "consul-haskell";
+       version = "0.3";
+       sha256 = "073efdcba614f92e3add447e21e5df032a1f46ec987aa3e12de2353e38121634";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring connection either
+         http-client http-client-tls http-types lifted-async lifted-base
+         monad-control network stm text transformers
+       ];
+       testHaskellDepends = [
+         base http-client HUnit network tasty tasty-hunit text transformers
+       ];
+       doCheck = false;
+       homepage = "https://github.com/alphaHeavy/consul-haskell";
+       description = "A consul client for Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "consumers" = callPackage
@@ -50269,7 +50450,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cql" = callPackage
+  "cql_3_0_6" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
      , network, QuickCheck, tasty, tasty-quickcheck, template-haskell
      , text, time, transformers, uuid, vector
@@ -50289,6 +50470,29 @@ self: {
        homepage = "https://github.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cql" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
+     , network, QuickCheck, tasty, tasty-quickcheck, template-haskell
+     , text, time, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "cql";
+       version = "3.0.7";
+       sha256 = "54f8535ac3fe7abeb31557ec560f8135941346fc1ec8eb7922a9e0eda10fea76";
+       libraryHaskellDepends = [
+         base bytestring cereal Decimal iproute network template-haskell
+         text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         base bytestring cereal Decimal iproute network QuickCheck tasty
+         tasty-quickcheck text time uuid
+       ];
+       homepage = "https://github.com/twittner/cql/";
+       description = "Cassandra CQL binary protocol";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "cql-io" = callPackage
@@ -53560,6 +53764,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-layer" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "data-layer";
+       version = "1.0";
+       sha256 = "638d9fba6de4eb72764392bff6be9a6e75ac41f5b6e2dafd92397b45a58a014b";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/wdanilo/layer";
+       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-layout" = callPackage
     ({ mkDerivation, base, bytestring, vector }:
      mkDerivation {
@@ -57168,6 +57384,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-haddock_0_3_0_8" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring
+     , Cabal, cautious-file, cmdargs, containers, cpphs
+     , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath
+     , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec
+     , QuickCheck, split, strict, tasty, tasty-quickcheck, text
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "diagrams-haddock";
+       version = "0.3.0.8";
+       sha256 = "c6b7df5039d9c9eee6bc097fd5c5f35fb46d213cf40c0b089f4b5ca5d417e000";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base base64-bytestring bytestring cautious-file
+         containers cpphs diagrams-builder diagrams-lib diagrams-svg
+         directory filepath haskell-src-exts lens linear lucid-svg mtl
+         parsec split strict text uniplate
+       ];
+       executableHaskellDepends = [
+         base Cabal cmdargs cpphs directory filepath
+       ];
+       testHaskellDepends = [
+         base containers haskell-src-exts lens parsec QuickCheck tasty
+         tasty-quickcheck
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Preprocessor for embedding diagrams in Haddock documentation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-hsqml" = callPackage
     ({ mkDerivation, base, colour, containers, diagrams-core
      , diagrams-lib, hsqml, lens, text, transformers
@@ -61714,20 +61963,20 @@ self: {
 
   "dynamic-plot" = callPackage
     ({ mkDerivation, async, base, colour, constrained-categories
-     , containers, deepseq, diagrams-cairo, diagrams-core, diagrams-gtk
-     , diagrams-lib, glib, gtk, lens, manifolds, MemoTrie, MonadRandom
-     , mtl, process, random, semigroups, tagged, time, transformers
-     , vector, vector-space
+     , containers, data-default, deepseq, diagrams-cairo, diagrams-core
+     , diagrams-gtk, diagrams-lib, glib, gtk, lens, manifolds, MemoTrie
+     , MonadRandom, mtl, process, random, semigroups, tagged, time
+     , transformers, vector, vector-space
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.1.1.0";
-       sha256 = "bb45bddf6acb16222eef67f415955c148c7bcc26d7c305be1b42548f0519d55d";
+       version = "0.1.1.1";
+       sha256 = "9742e52dae0b13482a996aeb5da6f7982ffef8eccbc26ba1f1d3178a759b93aa";
        libraryHaskellDepends = [
-         async base colour constrained-categories containers deepseq
-         diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk
-         lens manifolds MemoTrie MonadRandom mtl process random semigroups
-         tagged time transformers vector vector-space
+         async base colour constrained-categories containers data-default
+         deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib
+         gtk lens manifolds MemoTrie MonadRandom mtl process random
+         semigroups tagged time transformers vector vector-space
        ];
        jailbreak = true;
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
@@ -61778,24 +62027,24 @@ self: {
      , casadi-bindings-core, cereal, Chart, Chart-gtk, cmdargs, colour
      , containers, data-default-class, directory, distributive, doctest
      , generic-accessors, hmatrix, hmatrix-gsl, HUnit, jacobi-roots
-     , lens, linear, mtl, not-gloss, Plot-ho-matic, process, QuickCheck
-     , reflection, semigroups, spatial-math, stm, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, time
-     , unordered-containers, vector, vector-binary-instances
+     , lens, linear, mtl, mwc-random, not-gloss, Plot-ho-matic, process
+     , QuickCheck, reflection, semigroups, spatial-math, stm
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time, unordered-containers, vector, vector-binary-instances
      , zeromq4-haskell
      }:
      mkDerivation {
        pname = "dynobud";
-       version = "1.8.0.0";
-       sha256 = "8851495866fdaecc175c9e795d7accd8c1dd8423b29b2f1e139ca8c36f1f74e5";
+       version = "1.9.0.0";
+       sha256 = "9430567b64fbd6ac7f06deb07fd300f4829c84d94aefe45c01ab4d3edb7bb866";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary casadi-bindings casadi-bindings-core cereal
          containers data-default-class directory distributive
-         generic-accessors hmatrix hmatrix-gsl jacobi-roots linear mtl
-         Plot-ho-matic process reflection spatial-math time vector
-         vector-binary-instances
+         generic-accessors hmatrix hmatrix-gsl jacobi-roots lens linear mtl
+         mwc-random Plot-ho-matic process reflection spatial-math time
+         vector vector-binary-instances
        ];
        executableHaskellDepends = [
          base bytestring casadi-bindings casadi-bindings-core cereal Chart
@@ -65384,16 +65633,19 @@ self: {
 
   "eventstore" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
-     , containers, network, protobuf, random, sodium, stm, text, time
-     , unordered-containers, uuid
+     , containers, network, protobuf, random, stm, tasty, tasty-hunit
+     , text, time, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.8.0.0";
-       sha256 = "9c13d412db5308ba4db26880041c2cb798fe824781ddb32d145a0432743f3f5c";
+       version = "0.9.0.0";
+       sha256 = "c9630947df7cddc354ccda91e2f39e37d151f4ed30494501220161c27175480c";
        libraryHaskellDepends = [
          aeson async attoparsec base bytestring cereal containers network
-         protobuf random sodium stm text time unordered-containers uuid
+         protobuf random stm text time unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base stm tasty tasty-hunit text time
        ];
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
@@ -65488,6 +65740,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exact-real" = callPackage
+    ({ mkDerivation, base, checkers, directory, doctest, filepath
+     , groups, integer-gmp, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "exact-real";
+       version = "0.3.0.0";
+       sha256 = "4ef5668c15b1094e42a8af1be7721b29e1337bbf03dffb0cb592088a7bc3c6b6";
+       libraryHaskellDepends = [ base integer-gmp ];
+       testHaskellDepends = [
+         base checkers directory doctest filepath groups QuickCheck random
+         tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       description = "Exact real arithmetic";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "exception-mailer" = callPackage
     ({ mkDerivation, base, hslogger, mime-mail, text }:
      mkDerivation {
@@ -69568,6 +69838,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "flat-maybe" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "flat-maybe";
+       version = "0.1.0.0";
+       sha256 = "98ee27978642f7f07e48d7d7567e0cd1dc531a4a6e0e515e3f5cd343e6c9be4f";
+       libraryHaskellDepends = [ base ghc-prim ];
+       homepage = "https://github.com/AndrasKovacs/flat-maybe";
+       description = "Strict Maybe without space and indirection overhead";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flat-mcmc" = callPackage
     ({ mkDerivation, base, monad-par, monad-par-extras, mtl, mwc-random
      , primitive, vector
@@ -72250,6 +72532,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "functional-kmp" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "functional-kmp";
+       version = "0.1.0.0";
+       sha256 = "29de062f7d0d3fec1f6c15143037032bf27a30c313c4aa9befd041f13f70e2d0";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/mniip/functional-kmp";
+       description = "KMP implemented on haskell's built-in cons-cell-based lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "functor-apply" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -73679,6 +73973,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "geo-uk" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, template-haskell
+     , th-lift
+     }:
+     mkDerivation {
+       pname = "geo-uk";
+       version = "0.1.0.1";
+       sha256 = "a92648834307b9ac6dde2a581fbf291b36cbd8d005965e7e64512f8bdfb01e70";
+       libraryHaskellDepends = [
+         array base binary bytestring template-haskell th-lift
+       ];
+       homepage = "https://github.com/tolysz/geo-uk";
+       description = "High precision conversion between GPS and UK Grid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "geocalc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -73729,14 +74039,13 @@ self: {
      }:
      mkDerivation {
        pname = "geodetics";
-       version = "0.0.3";
-       sha256 = "afd1b5f5b3498fbf07d7b82d640f37f8dab0c920ab4b0768a7f00b6c24035d95";
+       version = "0.0.4";
+       sha256 = "237ea075d3cc8566d3694cdcbe1733f5fb74c7fe5e43b3a5fe501fb92e4cb4fe";
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
          array base dimensional HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/PaulJohnson/geodetics";
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
@@ -74079,8 +74388,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.4.1.0";
-       sha256 = "cb63b6278a1f927be6661547f32af6535103a1307109a3441322b6b018bd8c76";
+       version = "0.4.2.0";
+       sha256 = "7efe3f581c502778de324c5817ece023be530552b05d6b7307b19c0000cdc143";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74305,8 +74614,8 @@ self: {
        pname = "ghc-mod";
        version = "5.4.0.0";
        sha256 = "736652a2f63f9e8625c859c94f193ad8ac9f8fe793bbee672b65576309bfb069";
-       revision = "1";
-       editedCabalFile = "c5f3b7fcc8bbaef87fa35c055714581435b82cbf1c1a43241b554c74b4413c48";
+       revision = "3";
+       editedCabalFile = "f6a778dfd7c503544c63dc8967848939d08c5e5adb491e05204fc0c1d1b5ce3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74703,22 +75012,24 @@ self: {
      }) {};
 
   "ghci-ng" = callPackage
-    ({ mkDerivation, array, base, bytestring, directory, filepath, ghc
-     , ghc-paths, haskeline, process, transformers, unix
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, ghc, ghc-paths, haskeline, process, syb, time
+     , transformers, unix
      }:
      mkDerivation {
        pname = "ghci-ng";
-       version = "7.6.3.5";
-       sha256 = "9d846c198b0862e8f198a26b31d053bfd4b47cbf7ad186760a2ee2e0c1def005";
+       version = "10.0.0";
+       sha256 = "a78909a528b79ec14649c528bb47bbec02c535b75b654978a97359e7c9bd39dd";
+       revision = "1";
+       editedCabalFile = "257b623b74af9d15e3b9539156fe411d3b13fb8da9fe6c6d8f84c1f7645d114f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base bytestring directory filepath ghc ghc-paths haskeline
-         process transformers unix
+         array base bytestring containers directory filepath ghc ghc-paths
+         haskeline process syb time transformers unix
        ];
-       jailbreak = true;
-       homepage = "https://github.com/hvr/ghci-ng";
-       description = "Extended GHCi fork";
+       homepage = "https://github.com/chrisdone/ghci-ng";
+       description = "Next generation GHCi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -75132,7 +75443,7 @@ self: {
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = null;};
+     }) {gtk3 = pkgs.gnome2.gtk;};
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, containers, haskell-gi-base
@@ -75499,23 +75810,23 @@ self: {
      }) {};
 
   "git-annex_5_20150727" = callPackage
-    ({ mkDerivation, aeson, async, base, blaze-builder, bloomfilter
-     , bup, byteable, bytestring, case-insensitive, clientsession
-     , containers, crypto-api, cryptohash, curl, data-default, DAV, dbus
-     , directory, dlist, dns, edit-distance, esqueleto, exceptions
-     , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify
-     , hslogger, http-client, http-conduit, http-types, IfElse, json
-     , lsof, MissingH, monad-control, monad-logger, mtl, network
-     , network-info, network-multicast, network-protocol-xmpp
-     , network-uri, old-locale, openssh, optparse-applicative
-     , path-pieces, perl, persistent, persistent-sqlite
-     , persistent-template, process, QuickCheck, random, regex-tdfa
-     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
-     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
-     , template-haskell, text, time, torrent, transformers, unix
-     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
-     , wget, which, xml-types, yesod, yesod-core, yesod-default
-     , yesod-form, yesod-static
+    ({ mkDerivation, aeson, async, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, case-insensitive
+     , clientsession, conduit, conduit-extra, containers, crypto-api
+     , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
+     , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
+     , git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit
+     , http-types, IfElse, json, lsof, MissingH, monad-control
+     , monad-logger, mtl, network, network-info, network-multicast
+     , network-protocol-xmpp, network-uri, old-locale, openssh
+     , optparse-applicative, path-pieces, perl, persistent
+     , persistent-sqlite, persistent-template, process, QuickCheck
+     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-rerun, template-haskell, text, time, torrent, transformers
+     , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
+     , warp-tls, wget, which, xml-types, yesod, yesod-core
+     , yesod-default, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
@@ -75523,16 +75834,21 @@ self: {
        sha256 = "9826836bd0eb4e35be8664862405afbf2ff4dff9a643b2f8ec61c295bd16099f";
        revision = "1";
        editedCabalFile = "a9a36ed856cc4b973682e147a107ade4b55542f832c655445c4f2da570398840";
-       configureFlags = [ "-fassistant" "-fproduction" ];
+       configureFlags = [
+         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
+         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+       ];
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base blaze-builder bloomfilter byteable bytestring
-         case-insensitive clientsession containers crypto-api cryptohash
-         data-default DAV dbus directory dlist dns edit-distance esqueleto
-         exceptions fdo-notify feed filepath gnutls hinotify hslogger
-         http-client http-conduit http-types IfElse json MissingH
-         monad-control monad-logger mtl network network-info
+         aeson async aws base blaze-builder bloomfilter byteable bytestring
+         case-insensitive clientsession conduit conduit-extra containers
+         crypto-api cryptohash data-default DAV dbus directory dlist dns
+         edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
+         hinotify hslogger http-client http-conduit http-types IfElse json
+         MissingH monad-control monad-logger mtl network network-info
          network-multicast network-protocol-xmpp network-uri old-locale
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
@@ -75545,6 +75861,7 @@ self: {
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
        ];
+       jailbreak = true;
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
        installPhase = "make PREFIX=$out CABAL=./Setup install";
@@ -75563,44 +75880,50 @@ self: {
   "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
-     , clientsession, conduit, conduit-extra, containers, crypto-api
-     , cryptonite, curl, data-default, DAV, dbus, directory, dlist, dns
-     , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
-     , git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit
-     , http-types, IfElse, json, lsof, MissingH, monad-control
-     , monad-logger, mtl, network, network-info, network-multicast
-     , network-protocol-xmpp, network-uri, old-locale, openssh
-     , optparse-applicative, path-pieces, perl, persistent
-     , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, template-haskell, text, time, torrent, transformers
-     , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
-     , warp-tls, wget, which, xml-types, yesod, yesod-core
-     , yesod-default, yesod-form, yesod-static
+     , clientsession, concurrent-output, conduit, conduit-extra
+     , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
+     , directory, dlist, dns, edit-distance, esqueleto, exceptions
+     , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify
+     , hslogger, http-client, http-conduit, http-types, IfElse, json
+     , lsof, MissingH, monad-control, monad-logger, mtl, network
+     , network-info, network-multicast, network-protocol-xmpp
+     , network-uri, old-locale, openssh, optparse-applicative
+     , path-pieces, perl, persistent, persistent-sqlite
+     , persistent-template, process, QuickCheck, random, regex-tdfa
+     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
+     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
+     , wget, which, xml-types, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20151102.1";
-       sha256 = "270592b61fe3e46b2b643e3eec2bdd85f7c343e4442ec41ffb2a06baf080bed5";
-       configureFlags = [ "-fassistant" "-fproduction" ];
+       version = "5.20151116";
+       sha256 = "1735577964a1a83a3959e25b6268512e9cd5dbec84b142f2de7b2cd025b97f73";
+       configureFlags = [
+         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
+         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+       ];
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
-         case-insensitive clientsession conduit conduit-extra containers
-         crypto-api cryptonite data-default DAV dbus directory dlist dns
-         edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
-         hinotify hslogger http-client http-conduit http-types IfElse json
-         MissingH monad-control monad-logger mtl network network-info
-         network-multicast network-protocol-xmpp network-uri old-locale
-         optparse-applicative path-pieces persistent persistent-sqlite
-         persistent-template process QuickCheck random regex-tdfa resourcet
-         SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
-         tasty-quickcheck tasty-rerun template-haskell text time torrent
-         transformers unix unix-compat utf8-string uuid wai wai-extra warp
-         warp-tls xml-types yesod yesod-core yesod-default yesod-form
-         yesod-static
+         case-insensitive clientsession concurrent-output conduit
+         conduit-extra containers crypto-api cryptonite data-default DAV
+         dbus directory dlist dns edit-distance esqueleto exceptions
+         fdo-notify feed filepath gnutls hinotify hslogger http-client
+         http-conduit http-types IfElse json MissingH monad-control
+         monad-logger mtl network network-info network-multicast
+         network-protocol-xmpp network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare stm tasty tasty-hunit tasty-quickcheck
+         tasty-rerun template-haskell text time torrent transformers unix
+         unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types
+         yesod yesod-core yesod-default yesod-form yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -75674,6 +75997,34 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "git-fmt" = callPackage
+    ({ mkDerivation, base, bytestring, directory, exceptions, extra
+     , fast-logger, filepath, json, monad-logger, mtl
+     , optparse-applicative, parsec, pretty, process, tasty
+     , tasty-golden, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "git-fmt";
+       version = "0.1.0.2";
+       sha256 = "dbe2f34e4bc55441f32264a44a59273b9341e121d67be64bb593f0d7931536ac";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory exceptions extra filepath json monad-logger mtl
+         optparse-applicative parsec pretty process text transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring extra fast-logger monad-logger optparse-applicative
+         time
+       ];
+       testHaskellDepends = [
+         base bytestring directory extra filepath parsec tasty tasty-golden
+       ];
+       homepage = "https://github.com/hjwylde/git-fmt";
+       description = "Custom git command for formatting code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "git-freq" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, io-streams
      , optparse-applicative, process, text
@@ -79470,8 +79821,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphmod";
-       version = "1.2.6";
-       sha256 = "e3a31527145c236647c5542034b4b5646fbbfcf8e9eb262859556cee09e9e10a";
+       version = "1.2.7";
+       sha256 = "4929cfb35bee8f9562122248a216cb365f9fd307077fce6ec8ec0380348880ce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80352,7 +80703,7 @@ self: {
 
   "gtk_0_13_3" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk, gtk2hs-buildtools, mtl, pango, text
+     , glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
@@ -80361,7 +80712,7 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       libraryPkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        doHaddock = false;
        doCheck = false;
@@ -80369,11 +80720,11 @@ self: {
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtk;};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk_0_13_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk, gtk2hs-buildtools, mtl, pango, text
+     , glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
@@ -80382,7 +80733,7 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       libraryPkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        doHaddock = false;
        doCheck = false;
@@ -80390,11 +80741,11 @@ self: {
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtk;};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk_0_13_6" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk, gtk2hs-buildtools, mtl, pango, text
+     , glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
@@ -80403,18 +80754,18 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       libraryPkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtk;};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk_0_13_7" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk, gtk2hs-buildtools, mtl, pango, text
+     , glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
@@ -80423,18 +80774,18 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       libraryPkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtk;};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk_0_13_8_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk, gtk2hs-buildtools, mtl, pango, text
+     , glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
@@ -80443,18 +80794,18 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       libraryPkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtk;};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers, gio
-     , glib, gtk, gtk2hs-buildtools, mtl, pango, text
+     , glib, gtk2, gtk2hs-buildtools, mtl, pango, text
      }:
      mkDerivation {
        pname = "gtk";
@@ -80463,14 +80814,14 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       libraryPkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        doHaddock = false;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome) gtk;};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk-helpers" = callPackage
     ({ mkDerivation, array, base, gio, glib, gtk, mtl, process
@@ -80595,18 +80946,18 @@ self: {
      }) {};
 
   "gtk-traymanager" = callPackage
-    ({ mkDerivation, base, glib, gtk, x11 }:
+    ({ mkDerivation, base, glib, gtk, gtk2, x11 }:
      mkDerivation {
        pname = "gtk-traymanager";
        version = "0.1.5";
        sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443";
        libraryHaskellDepends = [ base glib gtk ];
-       libraryPkgconfigDepends = [ x11 ];
+       libraryPkgconfigDepends = [ gtk2 x11 ];
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) x11;};
+     }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;};
 
   "gtk2hs-buildtools_0_13_0_3" = callPackage
     ({ mkDerivation, alex, array, base, containers, directory, filepath
@@ -82914,8 +83265,8 @@ self: {
      }:
      mkDerivation {
        pname = "haeredes";
-       version = "0.4.3";
-       sha256 = "87d8f33bba8a699584821269bc16be9a5ee8b4171b9100ed1e1510f76639cd54";
+       version = "0.4.4";
+       sha256 = "bdc2446b176c50d4f0fb5a52aaa7c0f4369999adc50be74935bea59a5f2964ac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82924,7 +83275,7 @@ self: {
        testHaskellDepends = [ base doctest filemanip ];
        homepage = "http://michael.orlitzky.com/code/haeredes.php";
        description = "Confirm delegation of NS and MX records";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.agpl3;
      }) {};
 
   "haggis" = callPackage
@@ -83951,6 +84302,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "handa-opengl" = callPackage
+    ({ mkDerivation, array, base, data-default, GLUT, OpenGL
+     , opengl-dlp-stereo
+     }:
+     mkDerivation {
+       pname = "handa-opengl";
+       version = "0.1.6.1";
+       sha256 = "7af827245496a5a08e6e2491f66f06de3ab961a9d835684d2f5ae8a026886221";
+       libraryHaskellDepends = [
+         array base data-default GLUT OpenGL opengl-dlp-stereo
+       ];
+       homepage = "https://bitbucket.org/bwbush/handa-opengl";
+       description = "Utility functions for OpenGL and GLUT";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "handle-like" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -85996,22 +86363,22 @@ self: {
   "haskell-docs" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
      , containers, cryptohash, directory, filepath, ghc, ghc-paths
-     , haddock-api, monad-loops, process, text, unordered-containers
+     , haddock-api, haddock-library, monad-loops, process, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-docs";
-       version = "4.2.5";
-       sha256 = "023b21ce54c7e6a9188ad3070f6236637b639dd760904b5d40c7e405747faa27";
+       version = "4.2.6";
+       sha256 = "729293f120ddaacab6814f8c6735e3f9ca9fd88c2453e2b887f5a806cd4dbeba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Cabal containers cryptohash
-         directory filepath ghc ghc-paths haddock-api monad-loops process
-         text unordered-containers
+         directory filepath ghc ghc-paths haddock-api haddock-library
+         monad-loops process text unordered-containers
        ];
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "http://github.com/chrisdone/haskell-docs";
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
@@ -86727,6 +87094,7 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
+       jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86743,6 +87111,7 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
+       jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88854,25 +89223,25 @@ self: {
      }) {};
 
   "hath" = callPackage
-    ({ mkDerivation, base, bytestring, cmdargs, dns, MissingH
-     , parallel-io, process, split, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, cmdargs, MissingH, process, split, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "hath";
-       version = "0.2.3";
-       sha256 = "9cb732fb5b1e4857a08ce785b86e3929de31274247b04331c158edea80d7329e";
+       version = "0.3.0";
+       sha256 = "a1d7e9643a4f09395f1af453beffca2b371c4bac6003ba16fc5aa1b41c6177fe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring cmdargs dns MissingH parallel-io split tasty
-         tasty-hunit tasty-quickcheck
+         base cmdargs MissingH split tasty tasty-hunit tasty-quickcheck
        ];
        testHaskellDepends = [
-         base bytestring cmdargs dns MissingH parallel-io process split
-         tasty tasty-hunit tasty-quickcheck
+         base cmdargs MissingH process split tasty tasty-hunit
+         tasty-quickcheck
        ];
+       homepage = "http://michael.orlitzky.com/code/hath.php";
        description = "Hath manipulates network blocks in CIDR notation";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.agpl3;
      }) {};
 
   "hatt" = callPackage
@@ -92359,7 +92728,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hindent" = callPackage
+  "hindent_4_5_5" = callPackage
     ({ mkDerivation, applicative-quoters, base, data-default
      , descriptive, directory, ghc-prim, haskell-src-exts, hspec
      , monad-loops, mtl, text, transformers
@@ -92385,6 +92754,36 @@ self: {
        homepage = "http://www.github.com/chrisdone/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hindent" = callPackage
+    ({ mkDerivation, applicative-quoters, base, data-default
+     , descriptive, directory, ghc-prim, haskell-src-exts, hspec
+     , monad-loops, mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "hindent";
+       version = "4.5.6";
+       sha256 = "db12c11e1c82dfeee3b8a4afe060c5141e33196cfd36ea81e5f2705a14aee085";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default haskell-src-exts monad-loops mtl text
+         transformers
+       ];
+       executableHaskellDepends = [
+         applicative-quoters base descriptive directory ghc-prim
+         haskell-src-exts text
+       ];
+       testHaskellDepends = [
+         base data-default directory haskell-src-exts hspec monad-loops mtl
+         text
+       ];
+       doCheck = false;
+       homepage = "http://www.github.com/chrisdone/hindent";
+       description = "Extensible Haskell pretty printer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -98694,6 +99093,8 @@ self: {
        pname = "hscurses";
        version = "1.4.2.0";
        sha256 = "728533d95eedf42c485ad493031eae5b07cab4b797d1b0ec6576d07208404e57";
+       revision = "1";
+       editedCabalFile = "185f294036aaced6a4cf72c994339286e8e7886f5a327c3ccac898066985c528";
        libraryHaskellDepends = [
          base exceptions mtl old-locale old-time unix
        ];
@@ -101197,8 +101598,8 @@ self: {
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
        pname = "hsshellscript";
-       version = "3.3.3";
-       sha256 = "e1af57076ac6f8e97140b8da55957cfde2b71fe63bdc2cecacfa37d16da8183d";
+       version = "3.3.4";
+       sha256 = "3bd909d227215e0de6d6a42af736ccc21c360b677b9bff5b9c366859f582b54e";
        libraryHaskellDepends = [ base directory parsec random unix ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
@@ -101731,7 +102132,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "html-conduit" = callPackage
+  "html-conduit_1_2_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, hspec, HUnit, resourcet, tagstream-conduit, text
      , transformers, xml-conduit, xml-types
@@ -101750,6 +102151,28 @@ self: {
        homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "html-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , containers, hspec, HUnit, resourcet, tagstream-conduit, text
+     , transformers, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "html-conduit";
+       version = "1.2.1";
+       sha256 = "bb1c76947268fd5661918d02de73132b50f364d92f0d4e331ee0e0c87e0cff29";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra containers resourcet
+         tagstream-conduit text transformers xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec HUnit xml-conduit
+       ];
+       homepage = "https://github.com/snoyberg/xml";
+       description = "Parse HTML documents using xml-conduit datatypes";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "html-email-validate" = callPackage
@@ -103709,6 +104132,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2_1_3_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, containers, directory, doctest, filepath
+     , Glob, hex, hspec, mwc-random, psqueues, stm, text
+     , unordered-containers, vector, word8
+     }:
+     mkDerivation {
+       pname = "http2";
+       version = "1.3.0";
+       sha256 = "b862fce13a3d68e699cbfff1bb3520cfa30cffccd413ddd80f9b5d36a3be60cf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder containers psqueues stm
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory filepath hex text unordered-containers vector
+         word8
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory doctest filepath Glob hex hspec mwc-random
+         psqueues stm text unordered-containers vector word8
+       ];
+       description = "HTTP/2.0 library including frames and HPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "httpd-shed" = callPackage
     ({ mkDerivation, base, network, network-uri }:
      mkDerivation {
@@ -106427,8 +106881,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.9.20";
-       sha256 = "0d9a886bfb137d67c9a2ae8b52be599176bdc08b03f097b6353f90eb0392ad55";
+       version = "0.9.20.1";
+       sha256 = "3613b7ded2358e63df21e96ad8bc966d33dcb26d796771f1d5e9f2267d325c39";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -109272,10 +109726,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.2";
-       sha256 = "1daeb48fb0ec3eddd4cbdfd8b1d3e555e276f58439d583f5286ad2b35faf3928";
-       revision = "1";
-       editedCabalFile = "588978f34a8623e2c05dbc5fe95573c2e01b60cf98c6268d7f064bf2f76a8db2";
+       version = "1.1.3";
+       sha256 = "62385b4372ea61aeb41b7e7bb808a89adf1bbbf4d9c7127a6eb019a8b75e7142";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115500,38 +115952,39 @@ self: {
 
   "language-puppet" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, Diff, directory, either, exceptions, filecache
-     , formatting, Glob, hashable, hruby, hslogger, hslua, hspec, HUnit
-     , lens, lens-aeson, memory, mtl, operational, optparse-applicative
-     , parallel-io, parsec, parsers, pcre-utils, process, random
-     , regex-pcre-builtin, scientific, servant, servant-client, split
-     , stm, strict-base-types, temporary, text, time, transformers, unix
+     , base16-bytestring, bifunctors, bytestring, case-insensitive
+     , containers, cryptonite, Diff, directory, either, exceptions
+     , filecache, formatting, Glob, hashable, hruby, hslogger, hslua
+     , hspec, HUnit, lens, lens-aeson, megaparsec, memory, mtl
+     , operational, optparse-applicative, parallel-io, parsec, parsers
+     , pcre-utils, process, random, regex-pcre-builtin, scientific
+     , semigroups, servant, servant-client, split, stm
+     , strict-base-types, temporary, text, time, transformers, unix
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.4";
-       sha256 = "b131617644354e332fd1bc5eeec02f038abf5fb44b6e5d0d0485d9e622ea7800";
+       version = "1.1.4.1";
+       sha256 = "9081e2da9a4d046d034d59cc277bfb1bbf16b1fd6f925aef6d44674228423c97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory either exceptions
-         filecache formatting hashable hruby hslogger hslua lens lens-aeson
-         memory mtl operational parsec parsers pcre-utils process random
-         regex-pcre-builtin scientific servant servant-client split stm
-         strict-base-types text time transformers unix unordered-containers
-         vector yaml
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bifunctors
+         bytestring case-insensitive containers cryptonite directory either
+         exceptions filecache formatting hashable hruby hslogger hslua lens
+         lens-aeson megaparsec memory mtl operational parsec parsers
+         pcre-utils process random regex-pcre-builtin scientific semigroups
+         servant servant-client split stm strict-base-types text time
+         transformers unix unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring containers Diff either Glob
-         hslogger hspec lens mtl optparse-applicative parallel-io parsec
+         hslogger hspec lens megaparsec mtl optparse-applicative parallel-io
          regex-pcre-builtin servant-client strict-base-types text
          unordered-containers vector yaml
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
+         ansi-wl-pprint base either Glob hspec HUnit lens megaparsec
          strict-base-types temporary text unix unordered-containers vector
        ];
        jailbreak = true;
@@ -115836,8 +116289,8 @@ self: {
      }:
      mkDerivation {
        pname = "latex-formulae-hakyll";
-       version = "0.1.0.0";
-       sha256 = "fa990f5ebde658ceb621b9de60d65f9c09ecf5257db2db8ae70b03c943903b98";
+       version = "0.2.0.0";
+       sha256 = "54fdac8793f69b97b3a5cd6e758a5f21afe2066d5414b5cb26af60d386d3ba96";
        libraryHaskellDepends = [
          base hakyll latex-formulae-image latex-formulae-pandoc lrucache
          pandoc-types
@@ -115870,8 +116323,8 @@ self: {
      }:
      mkDerivation {
        pname = "latex-formulae-pandoc";
-       version = "0.2.0.1";
-       sha256 = "8750e2fbff3df30d7dc1e738e2ba959fad0eb58480104621aecd70840a327da6";
+       version = "0.2.0.2";
+       sha256 = "a59da804cc67510a3f6347a98b3e7376a72debe21d2f92872dba3951799df167";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120494,20 +120947,21 @@ self: {
      }) {};
 
   "logic-classes" = callPackage
-    ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl
-     , pretty, PropLogic, safecopy, set-extra, syb, template-haskell
+    ({ mkDerivation, applicative-extras, atp-haskell, base, containers
+     , HUnit, mtl, parsec, pretty, PropLogic, safe, safecopy, set-extra
+     , syb, template-haskell
      }:
      mkDerivation {
        pname = "logic-classes";
-       version = "1.5.3";
-       sha256 = "82707e7131c779d8a49065c1b30a03626ea8554fefc9972a11552de5b420527e";
+       version = "1.7";
+       sha256 = "6af3404b06900e7e2f5a56b96182af2bf7764fe0ab680b9611cd34ff52a82f11";
        libraryHaskellDepends = [
-         applicative-extras base containers HUnit mtl pretty PropLogic
-         safecopy set-extra syb template-haskell
+         applicative-extras atp-haskell base containers HUnit mtl parsec
+         pretty PropLogic safe safecopy set-extra syb template-haskell
        ];
        testHaskellDepends = [
-         applicative-extras base containers HUnit mtl pretty PropLogic
-         set-extra syb
+         applicative-extras atp-haskell base containers HUnit mtl pretty
+         PropLogic safe set-extra syb
        ];
        homepage = "https://github.com/seereason/logic-classes";
        description = "Framework for propositional and first order logic, theorem proving";
@@ -120630,10 +121084,8 @@ self: {
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.0.1.0";
-       sha256 = "082cf73496f78034faf3cf3ce59fd1c5c5bd1a5b8c629b5337d414912dd4a746";
-       revision = "1";
-       editedCabalFile = "fb4ef5bbb88c8068978b2914e86c507e6b47d5e120e00be6ea697b7d0db218e6";
+       version = "0.1.0.0";
+       sha256 = "be1a72e80ca1f3471b1b630f0407fa6e152ce6410ea7aee86fabda002dff12d0";
        libraryHaskellDepends = [
          arithmoi base constraints containers data-default deepseq
          MonadRandom mtl numeric-prelude QuickCheck random reflection repa
@@ -121247,6 +121699,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid-svg_0_6_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
+     mkDerivation {
+       pname = "lucid-svg";
+       version = "0.6.0.0";
+       sha256 = "3d9d43bd40c33931e6f6a5ab6a5153dd598045434bd219e8f3c9e6af65f65f58";
+       libraryHaskellDepends = [
+         base blaze-builder lucid text transformers
+       ];
+       homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
+       description = "DSL for SVG using lucid for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucienne" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bson
      , bytestring, compact-string-fix, feed, happstack, happstack-server
@@ -121328,14 +121795,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "luminance_0_6_0_5" = callPackage
+  "luminance_0_7" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.6.0.5";
-       sha256 = "2dd5fce0374e01c0310ed00c130f8318074b89e2bd318998258e3abc3dd53853";
+       version = "0.7";
+       sha256 = "1c93e98032e678b5066de177fa4a423a2248eba837cde75668c2a7acaec49e21";
        libraryHaskellDepends = [
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
@@ -121366,14 +121833,14 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "luminance-samples_0_6_0_1" = callPackage
+  "luminance-samples_0_7" = callPackage
     ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
      , luminance, mtl, resourcet, transformers
      }:
      mkDerivation {
        pname = "luminance-samples";
-       version = "0.6.0.1";
-       sha256 = "76b5c5d819e015b635166a436027a0924c1c59b05576c44481e1b3c2124e8900";
+       version = "0.7";
+       sha256 = "443f255f4a036f4519f97676a5a5cfa6be02eeecefd1fdbc28f0161034774c36";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122997,8 +123464,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.5.1";
-       sha256 = "12117662e62796ac16c38e707b8cd5da3e40e542cf2caae99f72f3fafb3c34d8";
+       version = "0.1.5.2";
+       sha256 = "388d3711ac1f6ff15264c34d5920ce899efd2834363a9028c18facea01e0c1e2";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-space void
@@ -123289,10 +123756,10 @@ self: {
      }:
      mkDerivation {
        pname = "markup";
-       version = "3.0.0";
-       sha256 = "2495c69daa4b75be45e5607c7dfbc5caafac34ed82eab1f8ee835af4ab72cdf4";
+       version = "3.1.0";
+       sha256 = "c7510643483861dafc9c9a8c41ceaa2f02f85870930cf4563899c49307780d3d";
        revision = "1";
-       editedCabalFile = "b9f36bbdca34f4e226d974e6c446738f22cd36e31ec301417ada0d2b55bb39ae";
+       editedCabalFile = "afb6565079dbae62dda5e69e61c9ef1d0617558ba6792c3e93f3788f8d05a3ab";
        libraryHaskellDepends = [
          base blaze-html blaze-markup clay comonad lucid mmorph
          monad-control monad-logger mtl path-extra resourcet text
@@ -124080,6 +124547,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "medium-sdk-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default-class
+     , either, http-client, servant-client, servant-server, text, time
+     }:
+     mkDerivation {
+       pname = "medium-sdk-haskell";
+       version = "0.1.0.0";
+       sha256 = "4dbe2ba6d20729a3cd7bb3af8ff881dec791a01485e1a010881dea0f1fb9e00a";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default-class either http-client
+         servant-client servant-server text time
+       ];
+       jailbreak = true;
+       description = "Haskell SDK for communicating with the Medium API";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "meep" = callPackage
     ({ mkDerivation, base, bifunctors, doctest, hspec
      , hspec-expectations-lens, lens, QuickCheck, semigroupoids
@@ -129090,8 +129574,8 @@ self: {
      }:
      mkDerivation {
        pname = "mtl-unleashed";
-       version = "0.6";
-       sha256 = "acbe3906f3928587893e9b28ca13d2100995ee6cf5f401e3e34b0dcfacb6bbbe";
+       version = "0.6.1";
+       sha256 = "330d0193940de75b851d55d2b2e92e9a3b62fd3396e37a093610320545fa0a44";
        libraryHaskellDepends = [
          base contravariant lens mtl profunctors tagged transformers
          transformers-compat
@@ -130636,8 +131120,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
-       version = "0.1.0.1";
-       sha256 = "58762c566ccc1b1a0c9cd4431a3a9a53aeffa949c7e7dd368fb1d2508e810baf";
+       version = "0.2.0.0";
+       sha256 = "369b871a2a41195d5c3e6349690cbc62bbaf39d4467d8db6ec3a5f17f52839da";
        libraryHaskellDepends = [ base containers template-haskell ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
@@ -131399,8 +131883,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "6.0.0.1";
-       sha256 = "6d1d4ac4cd11443ecc36ecead0d71426750c65651767caf3d7e4c962462d2fdc";
+       version = "6.1.0";
+       sha256 = "9eddbc6ce2fa029a54f27c753bc28c7093f8a351a5ae6d4fec11b6ec6d4fd8b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135275,16 +135759,16 @@ self: {
 
   "opaleye-trans" = callPackage
     ({ mkDerivation, base, mtl, opaleye, postgresql-simple
-     , product-profunctors, transformers-base
+     , product-profunctors, transformers, transformers-base
      }:
      mkDerivation {
        pname = "opaleye-trans";
-       version = "0.2.0";
-       sha256 = "74de349dfb8be2dac06bc26ae24956c933a2f7c736290aa89bf9730704043918";
+       version = "0.3.0";
+       sha256 = "1f709b8402d9a9b395cdeb89cd23d111c9883f992f33599cb1d4f1a5ab159dce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base mtl opaleye postgresql-simple product-profunctors
+         base mtl opaleye postgresql-simple product-profunctors transformers
          transformers-base
        ];
        executableHaskellDepends = [
@@ -135360,8 +135844,8 @@ self: {
     ({ mkDerivation, base, constraints, mtl, syntactic, tagged }:
      mkDerivation {
        pname = "open-typerep";
-       version = "0.3.1";
-       sha256 = "fa7bb0604e0d8868678fc2d1bf2f66f915e8c1e6d29159c823ade0ef0ecca3f3";
+       version = "0.3.3";
+       sha256 = "bca107a946e61174bec6ab05e98bbd5757bcf20bf4621717d420c89de54f7897";
        libraryHaskellDepends = [ base constraints mtl syntactic tagged ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
@@ -135464,15 +135948,17 @@ self: {
      }) {};
 
   "opengl-dlp-stereo" = callPackage
-    ({ mkDerivation, base, GLUT, OpenGL, vector }:
+    ({ mkDerivation, base, data-default, GLUT, OpenGL, vector }:
      mkDerivation {
        pname = "opengl-dlp-stereo";
-       version = "0.1.2.6";
-       sha256 = "fe5b2ead68fdab4c76a35c9d00254a82e5c9468ea79eeed522a6c2b2c6b577d4";
+       version = "0.1.4.1";
+       sha256 = "adaeeaa628dbd57c8b63ca4614464815f55e810c36c483cd0bd6f3be6880652b";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base OpenGL vector ];
-       executableHaskellDepends = [ base GLUT OpenGL vector ];
+       libraryHaskellDepends = [ base data-default GLUT OpenGL vector ];
+       executableHaskellDepends = [
+         base data-default GLUT OpenGL vector
+       ];
        homepage = "https://bitbucket.org/bwbush/opengl-dlp-stereo";
        description = "Library and example for using DLP stereo in OpenGL";
        license = stdenv.lib.licenses.mit;
@@ -135482,8 +135968,8 @@ self: {
     ({ mkDerivation, base, data-default, GLUT, OpenGL }:
      mkDerivation {
        pname = "opengl-spacenavigator";
-       version = "0.1.2.0";
-       sha256 = "427c68b13a26a942ae6caf90699cef822b507527c465eae8cd8866b6de902e55";
+       version = "0.1.4.2";
+       sha256 = "2f6063bfc11c3cbfc3c6feedcb124debd40ae6e02d67dea8b8e9024e545da44e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-default GLUT OpenGL ];
@@ -137308,7 +137794,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc" = callPackage
+  "pandoc_1_15_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq-generics, Diff
@@ -137352,6 +137838,7 @@ self: {
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc_1_15_1_1" = callPackage
@@ -137401,6 +137888,99 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pandoc_1_15_2" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , cmark, containers, data-default, deepseq-generics, Diff
+     , directory, executable-path, extensible-exceptions, filemanip
+     , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
+     , HTTP, http-client, http-client-tls, http-types, HUnit
+     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
+     , parsec, process, QuickCheck, random, scientific, SHA, syb
+     , tagsoup, temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "1.15.2";
+       sha256 = "9c6ffe77006513306b35daa7256c1625c6eaf2e16a8de8fe5248f20015c3d335";
+       configureFlags = [ "-fhttps" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring binary blaze-html blaze-markup
+         bytestring cmark containers data-default deepseq-generics directory
+         extensible-exceptions filemanip filepath ghc-prim haddock-library
+         highlighting-kate hslua HTTP http-client http-client-tls http-types
+         JuicyPixels mtl network network-uri old-time pandoc-types parsec
+         process random scientific SHA syb tagsoup temporary texmath text
+         time unordered-containers vector xml yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
+       ];
+       testHaskellDepends = [
+         ansi-terminal base bytestring containers Diff directory
+         executable-path filepath highlighting-kate HUnit pandoc-types
+         process QuickCheck syb test-framework test-framework-hunit
+         test-framework-quickcheck2 text zip-archive
+       ];
+       doCheck = false;
+       homepage = "http://pandoc.org";
+       description = "Conversion between markup formats";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pandoc" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , cmark, containers, data-default, deepseq-generics, Diff
+     , directory, executable-path, extensible-exceptions, filemanip
+     , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
+     , HTTP, http-client, http-client-tls, http-types, HUnit
+     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
+     , parsec, process, QuickCheck, random, scientific, SHA, syb
+     , tagsoup, temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "1.15.2.1";
+       sha256 = "60bcb0e65ecb63953dd26d5aacf1a5df83700d116062ffaeffe9edbc9be6df59";
+       configureFlags = [ "-fhttps" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring binary blaze-html blaze-markup
+         bytestring cmark containers data-default deepseq-generics directory
+         extensible-exceptions filemanip filepath ghc-prim haddock-library
+         highlighting-kate hslua HTTP http-client http-client-tls http-types
+         JuicyPixels mtl network network-uri old-time pandoc-types parsec
+         process random scientific SHA syb tagsoup temporary texmath text
+         time unordered-containers vector xml yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
+       ];
+       testHaskellDepends = [
+         ansi-terminal base bytestring containers Diff directory
+         executable-path filepath highlighting-kate HUnit pandoc-types
+         process QuickCheck syb test-framework test-framework-hunit
+         test-framework-quickcheck2 text zip-archive
+       ];
+       doCheck = false;
+       homepage = "http://pandoc.org";
+       description = "Conversion between markup formats";
+       license = "GPL";
+     }) {};
+
   "pandoc-citeproc_0_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
@@ -137566,19 +138146,20 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time, vector
-     , xml-conduit, yaml
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.8.0.1";
-       sha256 = "f9e1edb8ac529d4177feb0c374cf2b31f03dfcb53eabc342adb43d5aeaa37269";
+       version = "0.8.1.3";
+       sha256 = "aa15ff9cbb9c1cca504943c94cd891e23944cb0106172886821cb048a9726c7d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time vector xml-conduit yaml
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
        ];
        executableHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring containers directory
@@ -137664,18 +138245,18 @@ self: {
      }) {};
 
   "pandoc-placetable" = callPackage
-    ({ mkDerivation, base, bytestring, explicit-exception, http-conduit
-     , pandoc-types, spreadsheet
+    ({ mkDerivation, base, explicit-exception, http-conduit
+     , pandoc-types, spreadsheet, utf8-string
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.2";
-       sha256 = "1d8c5ac645812b0357d7b51e0d636c720638b70847869ede6bb02a4b309ded97";
+       version = "0.3";
+       sha256 = "81ed103e20c68a7a0dd29653fee6044f63792144f3f317f87409c779c3088e18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring explicit-exception http-conduit pandoc-types
-         spreadsheet
+         base explicit-exception http-conduit pandoc-types spreadsheet
+         utf8-string
        ];
        homepage = "https://github.com/mb21/pandoc-placetable";
        description = "Pandoc filter to include CSV files";
@@ -138347,10 +138928,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "parsec2";
-       version = "1.0.0";
-       sha256 = "696a33471ac635447b4be2529a8bc2d20fd9ed4e42eb172d4ea4b60b5a590547";
+       version = "1.0.1";
+       sha256 = "9e0834db335562955515970bcc65938700d1cc0ab1159396d75a80b8ae29be1c";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.uu.nl/~daan/parsec.html";
+       homepage = "https://github.com/aslatter/parsec2";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138541,6 +139122,8 @@ self: {
        pname = "parsers";
        version = "0.12.3";
        sha256 = "c29058e385d6235d3222aa1fde08399ed7ef24a8b8eb0691c2c4dfe1d1ad9fa3";
+       revision = "1";
+       editedCabalFile = "a3ba295c6c3541e45a98f0b7f1d4ccc811817d77e09b50fbdad4a98a5c74405f";
        libraryHaskellDepends = [
          attoparsec base base-orphans charset containers parsec scientific
          text transformers unordered-containers
@@ -138810,17 +139393,17 @@ self: {
      }) {};
 
   "patches-vector" = callPackage
-    ({ mkDerivation, base, doctest, edit-distance-vector, microlens
-     , QuickCheck, vector
+    ({ mkDerivation, base, criterion, doctest, edit-distance-vector
+     , microlens, QuickCheck, vector
      }:
      mkDerivation {
        pname = "patches-vector";
-       version = "0.1.4.4";
-       sha256 = "44eb961a4e4d8424b73080c3003bd31a66a89cf73a0bc0db6322d76f3751e782";
+       version = "0.1.5.0";
+       sha256 = "c220b914475430e7cae141e8d574c10b08c78d82977df40e6cf6e7cbe74ad113";
        libraryHaskellDepends = [
          base edit-distance-vector microlens vector
        ];
-       testHaskellDepends = [ base doctest QuickCheck ];
+       testHaskellDepends = [ base criterion doctest QuickCheck vector ];
        homepage = "https://github.com/liamoc/patches-vector";
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
@@ -138844,12 +139427,12 @@ self: {
      }) {};
 
   "path-extra" = callPackage
-    ({ mkDerivation, base, path }:
+    ({ mkDerivation, base, exceptions, path }:
      mkDerivation {
        pname = "path-extra";
-       version = "0.0.2";
-       sha256 = "8c5048018f855e72c0aadd6a6539a533c96dc9260a22ec2cc21c92598db17408";
-       libraryHaskellDepends = [ base path ];
+       version = "0.0.3";
+       sha256 = "55043bb37a3aaecd162d336c19483b3fb36397fa6cd48a182caf876502638b59";
+       libraryHaskellDepends = [ base exceptions path ];
        description = "Chris Done's path library, enriched with URL-related goodies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140304,7 +140887,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent" = callPackage
+  "persistent_2_2_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, http-api-data, lifted-base
@@ -140335,6 +140918,41 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
+  "persistent" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-html, blaze-markup, bytestring, conduit, containers
+     , exceptions, fast-logger, hspec, http-api-data, lifted-base
+     , monad-control, monad-logger, mtl, old-locale, path-pieces
+     , resource-pool, resourcet, scientific, silently, tagged
+     , template-haskell, text, time, transformers, transformers-base
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "persistent";
+       version = "2.2.2.1";
+       sha256 = "3ec5e17662d84fe6cf58cd5cd356285a42fd995edbd73b703aa718c5638a8a4a";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html blaze-markup
+         bytestring conduit containers exceptions fast-logger http-api-data
+         lifted-base monad-control monad-logger mtl old-locale path-pieces
+         resource-pool resourcet scientific silently tagged template-haskell
+         text time transformers transformers-base unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         conduit containers fast-logger hspec http-api-data lifted-base
+         monad-control monad-logger mtl old-locale path-pieces resource-pool
+         resourcet scientific tagged template-haskell text time transformers
+         unordered-containers vector
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Type-safe, multi-backend data serialization";
+       license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -140861,7 +141479,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-postgresql" = callPackage
+  "persistent-postgresql_2_2_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-control, monad-logger, persistent
      , postgresql-libpq, postgresql-simple, resourcet, text, time
@@ -140879,6 +141497,28 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
+  "persistent-postgresql" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-control, monad-logger, persistent
+     , postgresql-libpq, postgresql-simple, resourcet, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "persistent-postgresql";
+       version = "2.2.1.1";
+       sha256 = "b7f45537194d11e0efb9648d721cc6836df8730acd225bd090e7c740034812a8";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers
+         monad-control monad-logger persistent postgresql-libpq
+         postgresql-simple resourcet text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using postgresql";
+       license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -142161,6 +142801,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinch" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , hashable, hspec, hspec-discover, QuickCheck, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pinch";
+       version = "0.1.0.1";
+       sha256 = "ed3ddee8deb594279d6759170144d23a445a49e93c5562da13322d6005ef58c7";
+       revision = "1";
+       editedCabalFile = "59a14772df78b19d44944e872c557184b631b29dcd60c478fceb33a7bc8e9696";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq hashable text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec hspec-discover QuickCheck text
+         unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/abhinav/pinch";
+       description = "An alternative implementation of Thrift for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipe-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
@@ -152002,6 +152667,8 @@ self: {
        pname = "regex-applicative-text";
        version = "0.1.0.0";
        sha256 = "6f01deddcbba44441b12f7b4048e143f938a65e0c518f0c211e530a661a632d7";
+       revision = "1";
+       editedCabalFile = "4298f6496454e2fed4f26f304aaa1b1fe54ad433596f42b9f1aaba2a38e2b691";
        libraryHaskellDepends = [ base regex-applicative text ];
        homepage = "https://github.com/phadej/regex-applicative-text#readme";
        description = "regex-applicative on text";
@@ -152767,8 +153434,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.6.0.0";
-       sha256 = "2b310981f78613fcb3f884430c3dbb13d3e9804890d9f664c51f499b09f3bcc5";
+       version = "0.6.2.0";
+       sha256 = "e29f1b1c4ce3f10eb5a486bcc28e218f71ab2f814714efe55983975ad17fd721";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -152783,18 +153450,18 @@ self: {
      }) {};
 
   "relational-query-HDBC" = callPackage
-    ({ mkDerivation, base, containers, convertible, HDBC, HDBC-session
-     , names-th, persistable-record, relational-query
-     , relational-schemas, template-haskell
+    ({ mkDerivation, base, containers, convertible, dlist, HDBC
+     , HDBC-session, names-th, persistable-record, relational-query
+     , relational-schemas, template-haskell, transformers
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.1.0.1";
-       sha256 = "23c9296e772ab840936e6bf9916e3949726ab168de4d0a81b31505fcc08f726c";
+       version = "0.3.0.0";
+       sha256 = "9dce30437fb801db01b69e117d2418bfdcd5f7545dc687735baf80bfe5454774";
        libraryHaskellDepends = [
-         base containers convertible HDBC HDBC-session names-th
+         base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
-         template-haskell
+         template-haskell transformers
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC instance of relational-query and typed query interface for HDBC";
@@ -155308,6 +155975,8 @@ self: {
        pname = "retry";
        version = "0.6";
        sha256 = "f269db0c9f4943249cd8a0a2a0a05183da41afe4ca34bb627935985134fec2e7";
+       revision = "1";
+       editedCabalFile = "08f3ff261b1f52787e49e0a6bb585db0b0820393715eb510ab8a937173076b42";
        libraryHaskellDepends = [
          base data-default-class exceptions transformers
        ];
@@ -155322,6 +155991,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "retry_0_7_0_1" = callPackage
+    ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit
+     , QuickCheck, random, stm, time, transformers
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.7.0.1";
+       sha256 = "7ab82a1ba52eaf2a98186ff853d26fa0f54f676939739b2d2bd8735e0406486a";
+       libraryHaskellDepends = [
+         base data-default-class exceptions random transformers
+       ];
+       testHaskellDepends = [
+         base data-default-class exceptions hspec HUnit QuickCheck random
+         stm time transformers
+       ];
+       homepage = "http://github.com/Soostone/retry";
+       description = "Retry combinators for monadic actions that may fail";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "retryer" = callPackage
     ({ mkDerivation, base, optparse-applicative, process }:
      mkDerivation {
@@ -159032,6 +159722,21 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "sdl2-cairo-image" = callPackage
+    ({ mkDerivation, base, cairo, convertible, JuicyPixels, linear
+     , sdl2, sdl2-cairo, vector
+     }:
+     mkDerivation {
+       pname = "sdl2-cairo-image";
+       version = "1.0.0.2";
+       sha256 = "c5a8adee53ed011132f8bbefc554505a3758577afc653ddb8b6f0f8ef61c9b76";
+       libraryHaskellDepends = [
+         base cairo convertible JuicyPixels linear sdl2 sdl2-cairo vector
+       ];
+       description = "An image loading and rendering library for sdl2 / sdl2-cairo";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sdl2-compositor" = callPackage
     ({ mkDerivation, base, lens, linear, lrucache, QuickCheck, sdl2
      , sdl2-ttf, StateVar, stm, text, transformers
@@ -162831,26 +163536,30 @@ self: {
      }) {};
 
   "shelduck" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, hastache, hspec
-     , lens, lens-aeson, random, regex-compat, shelly, Spock, stm, text
-     , time, transformers, uuid, wreq
+    ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
+     , directory, exceptions, hastache, hspec, http-client, lens
+     , lens-aeson, mtl, random, regex-compat, shelly, Spock, stm, text
+     , time, transformers, unix, unordered-containers, uuid, wreq, yesod
      }:
      mkDerivation {
        pname = "shelduck";
-       version = "0.1.4.0";
-       sha256 = "6316862fddc69f0fe890646da4fa8e2f6dd581ab063e425d1e15fe79b312cd87";
+       version = "0.2.0.0";
+       sha256 = "3e63b7e155ae45eb3bd7756e7afbcbfa34c5e4481ef50a6687ab82947192ffc1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring hastache lens lens-aeson random shelly
-         Spock stm text time transformers uuid wreq
+         aeson aeson-pretty async base bytestring directory exceptions
+         hastache http-client lens lens-aeson mtl random shelly Spock stm
+         text time transformers unordered-containers uuid wreq yesod
        ];
        executableHaskellDepends = [
-         aeson async base bytestring hastache lens lens-aeson random shelly
-         Spock stm text time transformers uuid wreq
+         aeson aeson-pretty async base bytestring directory exceptions
+         hastache http-client lens lens-aeson mtl random shelly Spock stm
+         text time transformers unix unordered-containers uuid wreq yesod
        ];
        testHaskellDepends = [
-         aeson base hspec lens regex-compat stm text transformers wreq
+         aeson base hspec http-client lens mtl regex-compat stm text
+         transformers wreq
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
@@ -165369,8 +166078,8 @@ self: {
      }:
      mkDerivation {
        pname = "smsaero";
-       version = "0.4";
-       sha256 = "0069050ab5427a44b89d12aead64205d04e5ac421cf39acf1ee19a835a3a690a";
+       version = "0.4.1";
+       sha256 = "8b6904d906ce541ce637bb9421162d3a6cedf6e54f8ec99e2bf72ec68c75efc5";
        libraryHaskellDepends = [
          aeson base either lens servant servant-client servant-docs text
          time
@@ -167211,10 +167920,9 @@ self: {
     ({ mkDerivation, base, haste-compiler }:
      mkDerivation {
        pname = "sneathlane-haste";
-       version = "1";
-       sha256 = "921b8f4a400a6c665d33c2ef19f0666c4b507700addd2dc0868b6f185440c254";
+       version = "2";
+       sha256 = "9614de5868379336bbc0eb5e0d013a8c7a2178373abb5ecd153d74988f57dc7b";
        libraryHaskellDepends = [ base haste-compiler ];
-       jailbreak = true;
        homepage = "http://sneathlane.com";
        description = "A compositional web UI library, which draws to a Canvas element";
        license = stdenv.lib.licenses.bsd2;
@@ -168821,6 +169529,8 @@ self: {
        pname = "sql-words";
        version = "0.1.3.1";
        sha256 = "c9ce5f8402cdfc610e3d58774ad5c3aedaa6f4d0e7724937ecd97a654351b59d";
+       revision = "1";
+       editedCabalFile = "6de32c6b306d3b438564e263deb20c68698a5cdaa198a3d711ee768954608e17";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
@@ -169567,6 +170277,29 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
+  "stack-hpc-coveralls" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , directory-tree, docopt, filepath, hlint, hpc, hspec, http-client
+     , lens, lens-aeson, process, pureMD5, safe, text, utf8-string, wreq
+     }:
+     mkDerivation {
+       pname = "stack-hpc-coveralls";
+       version = "0.0.0.4";
+       sha256 = "945fb715462291faf93de5d79fa783587b585fd47563e1c4d46a99cc1c8064dc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory directory-tree filepath
+         hpc http-client lens lens-aeson process pureMD5 safe text
+         utf8-string wreq
+       ];
+       executableHaskellDepends = [ aeson base bytestring docopt ];
+       testHaskellDepends = [ base hlint hspec ];
+       homepage = "http://github.com/rubik/stack-hpc-coveralls";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "stack-prism" = callPackage
     ({ mkDerivation, base, profunctors, tagged, template-haskell
      , transformers
@@ -172046,8 +172779,8 @@ self: {
        pname = "strict-concurrency";
        version = "0.2.4.1";
        sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89";
-       revision = "1";
-       editedCabalFile = "e9b8d4599f2eae037bb3b6008284513dbb50af7d3ab42e617b76577bdea656a1";
+       revision = "2";
+       editedCabalFile = "70e871fd6fd7dffa2dc373fda3a062e9b9efde6cbab873b250ff5731ca1a7850";
        libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
@@ -172973,6 +173706,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "success" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2";
+       sha256 = "ed1d8271c71e49250540b4796b7f94bf3fa2094b30eeee210aaa316ddbc7ea59";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "suffixarray" = callPackage
     ({ mkDerivation, base, HUnit, vector }:
      mkDerivation {
@@ -173797,6 +174542,8 @@ self: {
        pname = "symbol";
        version = "0.2.4";
        sha256 = "d074a7741f6ce0f2a604e4467c1c46e1acc2b707db107b3458395e646a9b8831";
+       revision = "1";
+       editedCabalFile = "452caa71d01d9f17eb4f3e9c5ae94c9210ae67af1ff5f4b6e308290980394b05";
        libraryHaskellDepends = [ base containers deepseq ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A 'Symbol' type for fast symbol comparison";
@@ -173917,18 +174664,17 @@ self: {
      }) {Synt = null;};
 
   "syntactic" = callPackage
-    ({ mkDerivation, base, constraints, containers, data-hash, deepseq
-     , mtl, QuickCheck, safe, tagged, tasty, tasty-golden
-     , tasty-quickcheck, tasty-th, template-haskell, tree-view
-     , utf8-string
+    ({ mkDerivation, base, containers, data-hash, deepseq, mtl
+     , QuickCheck, tagged, tasty, tasty-golden, tasty-quickcheck
+     , tasty-th, template-haskell, tree-view, utf8-string
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "2.1";
-       sha256 = "2386362ff4009245f7d198d68d445e8c87f66ad61a63f3cdd6b80cc17b084be4";
+       version = "3.0";
+       sha256 = "36b4807059d606536fa3210ebaafbc443b2f5b473520a3d038fb18591d04cd4c";
        libraryHaskellDepends = [
-         base constraints containers data-hash deepseq mtl safe tagged
-         template-haskell tree-view
+         base containers data-hash deepseq mtl tagged template-haskell
+         tree-view
        ];
        testHaskellDepends = [
          base containers QuickCheck tagged tasty tasty-golden
@@ -174980,7 +175726,7 @@ self: {
 
   "taffybar" = callPackage
     ({ mkDerivation, base, cairo, containers, dbus, dyre
-     , enclosed-exceptions, filepath, gtk, gtk-traymanager
+     , enclosed-exceptions, filepath, gtk, gtk-traymanager, gtk2
      , HStringTemplate, HTTP, mtl, network, network-uri, old-locale
      , parsec, process, safe, split, stm, text, time, time-locale-compat
      , transformers, utf8-string, X11, xdg-basedir, xmonad
@@ -174999,14 +175745,15 @@ self: {
          time-locale-compat transformers utf8-string X11 xdg-basedir xmonad
          xmonad-contrib
        ];
+       libraryPkgconfigDepends = [ gtk2 ];
        executableHaskellDepends = [
          base dyre filepath gtk safe xdg-basedir
        ];
+       executablePkgconfigDepends = [ gtk2 ];
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "tag-bits" = callPackage
     ({ mkDerivation, base, ghc-prim }:
@@ -178540,6 +179287,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-cas" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell }:
+     mkDerivation {
+       pname = "th-cas";
+       version = "0.1.0";
+       sha256 = "6caab40db7a8aba41760c1b4ef884f52de0905ff8865dd7f6ab7ca5446b9653f";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       homepage = "https://github/junjihashimoto/th-cas";
+       description = "Compile-time CAS(Computer Algebra System)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "th-context" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-default
      , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
@@ -178548,8 +179308,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-context";
-       version = "0.22";
-       sha256 = "a4378d392ad346f960f2609cc9eae9f7693549b763478b616fc2b2fe5b59f97f";
+       version = "0.23";
+       sha256 = "54b65f7692f211426c7f3fc1751d938d756fee64f2970ebe6db30476f95c219f";
        libraryHaskellDepends = [
          base containers data-default haskell-src-exts lens mtl
          mtl-unleashed syb template-haskell th-desugar th-orphans
@@ -178827,6 +179587,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "th-kinds-fork" = callPackage
+    ({ mkDerivation, base, containers, mtl, template-haskell
+     , th-orphans
+     }:
+     mkDerivation {
+       pname = "th-kinds-fork";
+       version = "0.2";
+       sha256 = "fce4c9c8f8ca4c00acd2674319901fd2a21f2742644cdbb919cfb23a87122131";
+       libraryHaskellDepends = [
+         base containers mtl template-haskell th-orphans
+       ];
+       description = "Automated kind inference in Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-lift_0_7" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -178921,7 +179696,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "th-orphans" = callPackage
+  "th-orphans_0_12_2" = callPackage
     ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift
      , th-reify-many
      }:
@@ -178935,9 +179710,10 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "th-orphans_0_13_0" = callPackage
+  "th-orphans" = callPackage
     ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift
      , th-reify-many
      }:
@@ -178951,7 +179727,6 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-printf" = callPackage
@@ -179143,8 +179918,8 @@ self: {
        pname = "these";
        version = "0.6.1.0";
        sha256 = "a8e9e677b72ab4ea4e922b860abdd5f61ac69cb66e7c9f060f08ac94110f2d0d";
-       revision = "1";
-       editedCabalFile = "93c9372ddb67e8888cdc0069b8ce1bef36df21d8f00c11bb084686c5d571cf8e";
+       revision = "2";
+       editedCabalFile = "40a48f80ea0b180829df3b2eef9c29947f3567998d24e4efff75a1fd9949b0e0";
        libraryHaskellDepends = [
          base bifunctors containers data-default-class hashable mtl
          profunctors semigroupoids semigroups transformers
@@ -179527,8 +180302,8 @@ self: {
 
   "tianbar" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, containers
-     , dbus, directory, gtk, gtk-traymanager, happstack-server, network
-     , network-uri, process, random, split, text, transformers
+     , dbus, directory, gtk, gtk-traymanager, gtk2, happstack-server
+     , network, network-uri, process, random, split, text, transformers
      , utf8-string, webkit, xdg-basedir, xmonad, xmonad-contrib
      }:
      mkDerivation {
@@ -179545,11 +180320,12 @@ self: {
          happstack-server network network-uri process random split text
          transformers webkit xdg-basedir
        ];
+       executablePkgconfigDepends = [ gtk2 ];
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {gtk2 = pkgs.gnome2.gtk;};
 
   "tic-tac-toe" = callPackage
     ({ mkDerivation, base, glade, gtk, haskell98 }:
@@ -180416,8 +181192,8 @@ self: {
      }:
      mkDerivation {
        pname = "tip-lib";
-       version = "0.2";
-       sha256 = "5048689942474028e79331167612c45bff53a9e07c834809ac061b7f44b1dabd";
+       version = "0.2.1";
+       sha256 = "007beb1850acd1aeb370c831f9e801e580e96d295b5b3750db47e8e658c207f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181832,6 +182608,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "treersec" = callPackage
+    ({ mkDerivation, base, haste-compiler, sneathlane-haste }:
+     mkDerivation {
+       pname = "treersec";
+       version = "1";
+       sha256 = "220e4863d0ca51e1d5372e7bb1c97528ff0262d8083413183fb56068fe2cc32a";
+       libraryHaskellDepends = [ base haste-compiler sneathlane-haste ];
+       homepage = "http://sneathlane.com/treersec";
+       description = "Structure Editing Combinators";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "treeviz" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
      mkDerivation {
@@ -182335,8 +183123,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.5.0.1";
-       sha256 = "cc1e6e18e9c6ec09e4ad313246a20096e7a152359ac09fc891a2a31b051e1080";
+       version = "1.5.1";
+       sha256 = "acfae333308f70fbf8511141ef4cb19505f4b10012bfcf3a686c299a8ac6ec60";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -182430,10 +183218,9 @@ self: {
     ({ mkDerivation, base, HList, OneTuple }:
      mkDerivation {
        pname = "tuple-hlist";
-       version = "0.2.0.0";
-       sha256 = "749d77749930145d46614455bfa7ca45a6bcb5f261036321616343fb4cad357c";
+       version = "0.2.0.1";
+       sha256 = "886472d2043cc29e7eba49277ccabc731e7f46763f3ec77a77a4f9208a15729b";
        libraryHaskellDepends = [ base HList OneTuple ];
-       jailbreak = true;
        homepage = "http://github.com/dudebout/tuple-hlist";
        description = "Functions to convert between tuples and HLists";
        license = "unknown";
@@ -183715,8 +184502,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-unary";
-       version = "0.2.19";
-       sha256 = "7943e65e883264f6a51399f549738458931e6edd900f6737d2cc6c7e6fc51712";
+       version = "0.2.21";
+       sha256 = "93ed75c592bfd4916cd89654ed15ea6d7df1fd83bf9e91f43c6e343a403ca627";
        libraryHaskellDepends = [
          applicative-numbers base constraints newtype ty vector-space
        ];
@@ -183740,6 +184527,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "typed-spreadsheet" = callPackage
+    ({ mkDerivation, async, base, foldl, gtk3, microlens, stm, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "typed-spreadsheet";
+       version = "1.0.0";
+       sha256 = "33b26da746888e599e45762b05d159972010e340a18d690272a83dd55b0bbe82";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base foldl gtk3 microlens stm text transformers
+       ];
+       executableHaskellDepends = [ base text ];
+       description = "Typed and composable spreadsheets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "typed-wire" = callPackage
     ({ mkDerivation, base, containers, directory, file-embed, filepath
      , gitrev, mtl, optparse-applicative, parsec, text
@@ -185985,8 +186790,8 @@ self: {
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "4.0.0.1";
-       sha256 = "01651fc809c8fc8ce62e0bc473a40877b698b4f589cafe3216ef0799cc187671";
+       version = "5.0.0";
+       sha256 = "424212a0665d259f81770afa10a1bbb258bfdb1e551de433bab0c37c27cfab14";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control monad-logger mtl path-extra
          resourcet transformers transformers-base
@@ -186484,8 +187289,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "uu-tc";
-       version = "2009.2.2";
-       sha256 = "3eff63797417db600c89652622742dc03c0f01ab45c4fbb7e55bd977f210eb68";
+       version = "2015.1.1";
+       sha256 = "8f82237e6fd473dd6702e22fb48b3f14ca6c9fe0fe2d4e1b0e1f6756e3d1a70f";
        libraryHaskellDepends = [ base ];
        description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
@@ -188201,9 +189006,9 @@ self: {
      }:
      mkDerivation {
        pname = "versions";
-       version = "1.0.1";
-       sha256 = "f4a573dac612543d0cce24338cd127a7cb17c98cfdc3bd353792f21584e083ed";
-       libraryHaskellDepends = [ base parsec semigroups text text-show ];
+       version = "1.0.2";
+       sha256 = "739275e9d1d286786c2b9f62c1aa96beebb28912005e80f37acb56048ae6dc9e";
+       libraryHaskellDepends = [ base parsec semigroups text ];
        testHaskellDepends = [
          base either extra semigroups tasty tasty-hunit text text-show
        ];
@@ -190818,7 +191623,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "wai-routing" = callPackage
+  "wai-routing_0_12_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
      , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
@@ -190840,6 +191645,31 @@ self: {
        homepage = "https://github.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-routing" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-conversion, case-insensitive, containers, cookie
+     , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
+     , wai, wai-predicates, wai-route
+     }:
+     mkDerivation {
+       pname = "wai-routing";
+       version = "0.12.2";
+       sha256 = "ad89d0d778d6dcd3725b11b685de5ec2c1cc1cd977b6ec6f030d5edb62bf1189";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-conversion case-insensitive
+         cookie http-types transformers wai wai-predicates wai-route
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring bytestring-conversion
+         case-insensitive containers http-types tasty tasty-hunit
+         tasty-quickcheck wai wai-predicates
+       ];
+       homepage = "https://github.com/twittner/wai-routing/";
+       description = "Declarative routing for WAI";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "wai-session" = callPackage
@@ -191795,8 +192625,8 @@ self: {
        pname = "warp";
        version = "3.1.2";
        sha256 = "b845179b3ec3e78d94408da61fdc9195807adaa25646205769e9a2b0b6ab48f9";
-       revision = "1";
-       editedCabalFile = "0bbd8d6f551265bc7c6a02597b5c38b0df86d80762478862166af662533aa872";
+       revision = "2";
+       editedCabalFile = "c2b806e76b7fa1b075ab35cb9a806b25984296d0f7639c1486a6f5ca3373e85b";
        libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          containers ghc-prim hashable http-date http-types http2 iproute
@@ -191923,6 +192753,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_1_9" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network
+     , old-locale, process, QuickCheck, simple-sendfile, stm
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.1.9";
+       sha256 = "53cd0f79fb164f6c79c31f23ffb8cd0037d47ea3c7cd1448f9cb84fe9150dd82";
+       libraryHaskellDepends = [
+         array auto-update base blaze-builder bytestring bytestring-builder
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network old-locale process QuickCheck
+         simple-sendfile stm streaming-commons text time transformers unix
+         unix-compat vault wai word8
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -195488,8 +196352,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.6";
-       sha256 = "69941191e5be3671555670f1894cdd30a44e8e9b303561fee87c5f84f9bbe251";
+       version = "0.4.0";
+       sha256 = "6cfa37a5d13d326fadd838939df457412eb752e81877e6f128b75b8e101b50db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201160,6 +202024,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-csp" = callPackage
+    ({ mkDerivation, base, hspec, network-uri, semigroups, text, yesod
+     , yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-csp";
+       version = "0.1.1.0";
+       sha256 = "02338c3b027e18381f098d450b2431ea1127ec49c77fc6e25fcab36f0a84ca94";
+       libraryHaskellDepends = [
+         base network-uri semigroups text yesod yesod-core
+       ];
+       testHaskellDepends = [
+         base hspec network-uri semigroups yesod yesod-test
+       ];
+       description = "Add CSP headers to Yesod apps";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-datatables" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default
      , HUnit, monad-control, persistent, persistent-sqlite
@@ -202838,22 +203720,22 @@ self: {
 
   "yesod-transloadit" = callPackage
     ({ mkDerivation, aeson, base, byteable, bytestring, containers
-     , cryptohash, hspec, lens, lens-aeson, old-locale, shakespeare
-     , text, time, transformers, unordered-containers, yesod, yesod-core
-     , yesod-form, yesod-test
+     , cryptohash, hspec, lens, lens-aeson, mime, network-uri
+     , old-locale, shakespeare, text, time, transformers
+     , unordered-containers, yesod, yesod-core, yesod-form, yesod-test
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.4.3.0";
-       sha256 = "65e691950b094f4aa4373d8d819f121bde14c806dc6e6960a46718fa6e4da844";
+       version = "0.7.1.0";
+       sha256 = "f04e7b1e46c2a62685d48fad9d7616e6774daa0df07d7d54a1d7cfb5d428ade2";
        libraryHaskellDepends = [
-         aeson base byteable bytestring cryptohash lens lens-aeson
-         old-locale shakespeare text time transformers unordered-containers
-         yesod yesod-core yesod-form
+         aeson base byteable bytestring cryptohash lens lens-aeson mime
+         network-uri old-locale shakespeare text time transformers
+         unordered-containers yesod yesod-core yesod-form
        ];
        testHaskellDepends = [
-         aeson base containers hspec old-locale text yesod yesod-form
-         yesod-test
+         aeson base containers hspec mime network-uri old-locale text yesod
+         yesod-form yesod-test
        ];
        description = "Transloadit support for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -204010,6 +204892,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zipkin" = callPackage
+    ({ mkDerivation, base, bytestring, mersenne-random-pure64, mtl
+     , safe
+     }:
+     mkDerivation {
+       pname = "zipkin";
+       version = "0.1.0.0";
+       sha256 = "16c92701223c1df16f23638ea51e35ddb5720e715bf4a43ac835884b723f1be6";
+       libraryHaskellDepends = [
+         base bytestring mersenne-random-pure64 mtl safe
+       ];
+       homepage = "https://github.com/srijs/haskell-zipkin";
+       description = "Zipkin-style request tracing monad";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "zipper" = callPackage
     ({ mkDerivation, base, multirec }:
      mkDerivation {