hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/3a04b0b2d4ed8e895e538e9b8f395b3c6ae4db60
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e505b113f6eed7cc2682269767c6599904138a32
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e72964a5535ea93cb5ce89d4f3bfb39e18b4e1b7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/14a3a2d00efd5d46196dd8fce8c0565cb439c913

1 files changed, 1007 insertions, 106 deletions

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 72a545083449..e24b039d786b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -776,6 +776,8 @@ self: {
        pname = "Agda";
        version = "2.4.2.5";
        sha256 = "959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee";
+       revision = "1";
+       editedCabalFile = "85d09d8a607a351be092c5e168c35b8c303b20765ceb0f01cd34956c44ba7f5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7713,8 +7715,8 @@ self: {
     ({ mkDerivation, array, base, X11 }:
      mkDerivation {
        pname = "HGL";
-       version = "3.2.0.5";
-       sha256 = "8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d";
+       version = "3.2.2";
+       sha256 = "16a355c102ba057b8c9df363bfc65f6cf24a2d3fd9296cae911ab68eef0d762a";
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
@@ -9103,7 +9105,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "HTTP_4000_3_1" = callPackage
+  "HTTP_4000_3_2" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -9111,8 +9113,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTTP";
-       version = "4000.3.1";
-       sha256 = "0223366708cb318767d2dce84a5f923c5fbfe88d7c4c4f30ad7b824d4e98215c";
+       version = "4000.3.2";
+       sha256 = "15ee93db252703f87c114bf848eda04ed0c8e3d7411aeb9dc911201aa4f756ae";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -13315,6 +13317,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "MonadRandom_0_4_2_1" = callPackage
+    ({ mkDerivation, base, mtl, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.4.2.1";
+       sha256 = "635871e4f20bb01c6476a0361cc7069b6242d86c87524b0b8b3fad60ebf1fa6d";
+       libraryHaskellDepends = [
+         base mtl random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -18108,6 +18126,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "StateVar_1_1_0_3" = callPackage
+    ({ mkDerivation, base, stm, transformers }:
+     mkDerivation {
+       pname = "StateVar";
+       version = "1.1.0.3";
+       sha256 = "b494e6895185826cef9c67be54bb73beb2b76ad69a963c5d7e83da59dc0eac2f";
+       libraryHaskellDepends = [ base stm transformers ];
+       homepage = "https://github.com/haskell-opengl/StateVar";
+       description = "State variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "StateVar-transformer" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -22116,6 +22147,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "adjunctions_4_3" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, contravariant
+     , distributive, free, mtl, profunctors, semigroupoids, semigroups
+     , tagged, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "adjunctions";
+       version = "4.3";
+       sha256 = "b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc";
+       libraryHaskellDepends = [
+         array base comonad containers contravariant distributive free mtl
+         profunctors semigroupoids semigroups tagged transformers
+         transformers-compat void
+       ];
+       homepage = "http://github.com/ekmett/adjunctions/";
+       description = "Adjunctions and representable functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "adobe-swatch-exchange" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , language-css, mtl, pretty
@@ -34403,6 +34454,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bifunctors_5_2" = callPackage
+    ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
+     , semigroups, tagged, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.2";
+       sha256 = "46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14";
+       libraryHaskellDepends = [
+         base comonad containers semigroups tagged template-haskell
+         transformers
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/bifunctors/";
+       description = "Bifunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bighugethesaurus" = callPackage
     ({ mkDerivation, base, HTTP, split }:
      mkDerivation {
@@ -34722,8 +34795,8 @@ self: {
     ({ mkDerivation, base, binary }:
      mkDerivation {
        pname = "binary-enum";
-       version = "0.1.0.0";
-       sha256 = "9d35688cc9b761993567385230fa5514b6e7ff2ef06da0fa421a8689e05553f7";
+       version = "0.1.2.0";
+       sha256 = "15e7d259293db928980579cc8898dc6d545ffeaa5be97635cb93bb65a6a68688";
        libraryHaskellDepends = [ base binary ];
        homepage = "https://github.com/tolysz/binary-enum";
        description = "Simple wrappers around enum types";
@@ -37026,6 +37099,7 @@ self: {
        testHaskellDepends = [
          base containers directory process shake stm text time unix vector
        ];
+       doCheck = false;
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
@@ -38552,7 +38626,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "brick" = callPackage
+  "brick_0_3_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
      , deepseq, lens, template-haskell, text, text-zipper, transformers
      , vector, vty
@@ -38573,17 +38647,18 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "brick_0_4" = callPackage
+  "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
      , deepseq, lens, template-haskell, text, text-zipper, transformers
      , vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.4";
-       sha256 = "138fbf408e26ad7cf0dbc9a490e79965a84a9dbd33fa2016791ae295f08f3526";
+       version = "0.4.1";
+       sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38596,7 +38671,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brillig" = callPackage
@@ -39223,8 +39297,8 @@ self: {
   "bustle_0_5_2" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
-     , parsec, pcap, process, QuickCheck, setlocale, test-framework
-     , test-framework-hunit, text, time
+     , parsec, pcap, process, QuickCheck, setlocale, system-glib
+     , test-framework, test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
@@ -39232,6 +39306,7 @@ self: {
        sha256 = "659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90";
        isLibrary = false;
        isExecutable = true;
+       libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
          gtk3 hgettext mtl pango parsec pcap process setlocale text time
@@ -39245,13 +39320,13 @@ self: {
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {system-glib = pkgs.glib;};
 
   "bustle" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
-     , parsec, pcap, process, QuickCheck, setlocale, test-framework
-     , test-framework-hunit, text, time
+     , parsec, pcap, process, QuickCheck, setlocale, system-glib
+     , test-framework, test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
@@ -39259,6 +39334,7 @@ self: {
        sha256 = "9e525611cfb0c0715969b0ea77c2f63aaf7bc6ad70c9cf889a1655b66c0c24fd";
        isLibrary = false;
        isExecutable = true;
+       libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
          gtk3 hgettext mtl pango parsec pcap process setlocale text time
@@ -39272,7 +39348,7 @@ self: {
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {system-glib = pkgs.glib;};
 
   "butterflies" = callPackage
     ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
@@ -39490,6 +39566,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytes_0_15_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, containers
+     , directory, doctest, filepath, hashable, mtl, scientific, text
+     , time, transformers, transformers-compat, unordered-containers
+     , void
+     }:
+     mkDerivation {
+       pname = "bytes";
+       version = "0.15.2";
+       sha256 = "0bfaaf70154d3622be1ee620dd75e9c93cf4d4a21544d83f281d01439f261f34";
+       libraryHaskellDepends = [
+         base binary bytestring cereal containers hashable mtl scientific
+         text time transformers transformers-compat unordered-containers
+         void
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "https://github.com/ekmett/bytes";
+       description = "Sharing code for serialization between binary and cereal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "byteset" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -48591,6 +48689,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "comonad_5" = callPackage
+    ({ mkDerivation, base, containers, contravariant, directory
+     , distributive, doctest, filepath, semigroups, tagged, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "comonad";
+       version = "5";
+       sha256 = "78e5b19da5b701d14ceb2ca19191cc6205b2024ff2f71b754f5e949faa19cb2a";
+       libraryHaskellDepends = [
+         base containers contravariant distributive semigroups tagged
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/comonad/";
+       description = "Comonads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "comonad-extras" = callPackage
     ({ mkDerivation, array, base, comonad, containers, distributive
      , semigroupoids, transformers
@@ -49516,6 +49634,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concurrent-supply_0_1_8" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hashable }:
+     mkDerivation {
+       pname = "concurrent-supply";
+       version = "0.1.8";
+       sha256 = "ccf827dcd221298ae93fad6021c63a06707456de0671706b44f1f2fed867f21f";
+       libraryHaskellDepends = [ base ghc-prim hashable ];
+       testHaskellDepends = [ base containers ];
+       homepage = "http://github.com/ekmett/concurrent-supply/";
+       description = "A fast concurrent unique identifier supply with a pure API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-utilities" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50606,6 +50738,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "configurator-export" = callPackage
+    ({ mkDerivation, base, configurator, pretty, semigroups, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "configurator-export";
+       version = "0.1.0.0";
+       sha256 = "8efbda4c0e912ebf834099667b8df8e260fbeb35e765de00a5bbf9498c7eeb92";
+       libraryHaskellDepends = [
+         base configurator pretty semigroups text unordered-containers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/mstksg/configurator-export";
+       description = "Pretty printer and exporter for configurations from the \"configurator\" library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "confsolve" = callPackage
     ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
      , system-filepath, text, time, unordered-containers
@@ -50916,6 +51065,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "constraints_0_8" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.8";
+       sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/constraints/";
+       description = "Constraint manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -51391,6 +51558,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "contravariant_1_4" = callPackage
+    ({ mkDerivation, base, semigroups, StateVar, transformers
+     , transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "contravariant";
+       version = "1.4";
+       sha256 = "e1666df1373ed784baa7d1e8e963bbc2d1f3c391578ac550ae74e7399173ee84";
+       libraryHaskellDepends = [
+         base semigroups StateVar transformers transformers-compat void
+       ];
+       homepage = "http://github.com/ekmett/contravariant/";
+       description = "Contravariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "contravariant-extras" = callPackage
     ({ mkDerivation, base, base-prelude, contravariant
      , template-haskell, tuple-th
@@ -55147,26 +55331,28 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , directory, filepath, FindBin, hashable, haskeline, html, HTTP
-     , HUnit, mmap, mtl, network, network-uri, old-locale, old-time
-     , parsec, process, QuickCheck, random, regex-applicative
-     , regex-compat-tdfa, sandi, shelly, split, tar, terminfo
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, transformers, transformers-compat, unix, unix-compat
-     , utf8-string, vector, zip-archive, zlib
+     , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process
+     , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi
+     , shelly, split, tar, terminfo, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-compat, unix, unix-compat, utf8-string
+     , vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
        version = "2.10.2";
        sha256 = "6337d3fac04711fa2ef5813558b409c59166c5599b0c9d68c418d21cdccfb327";
+       revision = "1";
+       editedCabalFile = "ef15936009bbe7f50614dfc66bcb182d28129b353e312e82ae301b0517af24fe";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist directory filepath hashable
-         haskeline html HTTP mmap mtl network network-uri old-locale
-         old-time parsec process random regex-applicative regex-compat-tdfa
-         sandi tar terminfo text time transformers transformers-compat unix
+         haskeline html HTTP mmap mtl network network-uri old-time parsec
+         process random regex-applicative regex-compat-tdfa sandi tar
+         terminfo text time transformers transformers-compat unix
          unix-compat utf8-string vector zip-archive zlib
        ];
        librarySystemDepends = [ curl ];
@@ -55178,7 +55364,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text unix-compat
          zip-archive zlib
        ];
-       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -57140,7 +57325,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbus" = callPackage
+  "dbus_0_10_11" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
      , process, QuickCheck, random, text, transformers, unix, vector
@@ -57163,9 +57348,10 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbus_0_10_12" = callPackage
+  "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
      , process, QuickCheck, random, text, transformers, unix, vector
@@ -57188,7 +57374,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-client" = callPackage
@@ -59223,6 +59408,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-builder_0_7_2_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bytestring, cmdargs
+     , diagrams-cairo, diagrams-lib, diagrams-postscript
+     , diagrams-rasterific, diagrams-svg, directory, exceptions
+     , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens
+     , lucid-svg, mtl, split, transformers
+     }:
+     mkDerivation {
+       pname = "diagrams-builder";
+       version = "0.7.2.2";
+       sha256 = "f489b766b89a70700d213df0270e4962e0597928c339e41e02d6b90c9d32567d";
+       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-orphans cmdargs diagrams-lib directory exceptions
+         filepath hashable haskell-src-exts hint lens mtl split transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs diagrams-cairo diagrams-lib
+         diagrams-postscript diagrams-rasterific diagrams-svg directory
+         filepath JuicyPixels lens lucid-svg
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "hint-based build service for the diagrams graphics EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-cairo_1_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, cairo, colour, containers
      , data-default-class, diagrams-core, diagrams-lib, directory
@@ -59780,7 +59994,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core" = callPackage
+  "diagrams-core_1_3_0_4" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -59796,9 +60010,10 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core_1_3_0_5" = callPackage
+  "diagrams-core" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -59814,7 +60029,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -60199,7 +60413,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-lib" = callPackage
+  "diagrams-lib_1_3_0_8" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -60221,9 +60435,10 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-lib_1_3_0_9" = callPackage
+  "diagrams-lib" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -60245,7 +60460,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -61891,18 +62105,18 @@ self: {
 
   "discrimination" = callPackage
     ({ mkDerivation, array, base, containers, contravariant, deepseq
-     , ghc-prim, primitive, profunctors, promises, semigroups
-     , transformers, vector, void
+     , ghc-prim, hashable, primitive, profunctors, promises, semigroups
+     , transformers, transformers-compat, vector, void
      }:
      mkDerivation {
        pname = "discrimination";
-       version = "0.1";
-       sha256 = "818e170c2cbd1447e3d1552bc59d5c1a995ffbf690246ab2863f302c3dbcad85";
+       version = "0.2.1";
+       sha256 = "b431a43f635af98df8677a44c0e76726b95d12ea338e47db248aa3bbc3be2ccf";
        libraryHaskellDepends = [
-         array base containers contravariant deepseq ghc-prim primitive
-         profunctors promises semigroups transformers vector void
+         array base containers contravariant deepseq ghc-prim hashable
+         primitive profunctors promises semigroups transformers
+         transformers-compat vector void
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/discrimination/";
        description = "Fast generic linear-time sorting, joins and container construction";
        license = stdenv.lib.licenses.bsd3;
@@ -62855,6 +63069,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_5_0_2" = callPackage
+    ({ mkDerivation, base, base-orphans, directory, doctest, filepath
+     , tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.5.0.2";
+       sha256 = "f884996f491fe5b275b7dda2cebdadfecea0d7788a142546e0271e9575cc1609";
+       libraryHaskellDepends = [
+         base base-orphans tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/distributive/";
+       description = "Distributive functors -- Dual to Traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diversity_0_7_1_1" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -64133,6 +64366,7 @@ self: {
        testHaskellDepends = [
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
+       doCheck = false;
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65549,6 +65783,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "effect-handlers_0_1_0_7" = callPackage
+    ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
+     , kan-extensions, mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "effect-handlers";
+       version = "0.1.0.7";
+       sha256 = "42649d2d1b02759e4c455cf36eb968a1496b8de83a3ffbeb1e1d7e6a9efa41f5";
+       libraryHaskellDepends = [ base free kan-extensions mtl ];
+       testHaskellDepends = [
+         base hspec hspec-discover HUnit QuickCheck
+       ];
+       homepage = "https://github.com/edofic/effect-handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "effect-monad" = callPackage
     ({ mkDerivation, base, ghc-prim, type-level-sets }:
      mkDerivation {
@@ -67892,6 +68144,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_1_1" = callPackage
+    ({ mkDerivation, base, safe, transformers, transformers-compat
+     , unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.1.1";
+       sha256 = "28002b14fd33135870ed8fad398aeef3c43f1cfb2501ad2e4d9d72f0a3bf19d3";
+       libraryHaskellDepends = [
+         base safe transformers transformers-compat unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersatz_0_2_6_1" = callPackage
     ({ mkDerivation, array, base, blaze-builder, blaze-textual
      , bytestring, containers, data-default, data-reify, directory
@@ -68129,7 +68397,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto" = callPackage
+  "esqueleto_2_4_1" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -68151,9 +68419,10 @@ self: {
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto_2_4_2" = callPackage
+  "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -68175,7 +68444,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -68905,7 +69173,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exceptions" = callPackage
+  "exceptions_0_8_0_2" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework
      , test-framework-quickcheck2, transformers, transformers-compat
      }:
@@ -68925,9 +69193,10 @@ self: {
        homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exceptions_0_8_1" = callPackage
+  "exceptions" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-quickcheck2, transformers
      , transformers-compat
@@ -68944,6 +69213,28 @@ self: {
          test-framework-quickcheck2 transformers transformers-compat
        ];
        jailbreak = true;
+       doCheck = false;
+       homepage = "http://github.com/ekmett/exceptions/";
+       description = "Extensible optionally-pure exceptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "exceptions_0_8_2_1" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
+     , test-framework, test-framework-quickcheck2, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "exceptions";
+       version = "0.8.2.1";
+       sha256 = "c435877ff2f04a1855e50c78bbcbf8c89f3dc42837e440956500599f6d851035";
+       libraryHaskellDepends = [
+         base mtl stm template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck stm template-haskell test-framework
+         test-framework-quickcheck2 transformers transformers-compat
+       ];
        homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
@@ -70429,7 +70720,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fay" = callPackage
+  "fay_0_23_1_10" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -70458,9 +70749,10 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fay_0_23_1_12" = callPackage
+  "fay" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -70487,7 +70779,6 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base_0_19_4_1" = callPackage
@@ -73565,8 +73856,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.3.0.1";
-       sha256 = "121f25a6cc82de7edc7718b4a244803b0a71973784b5a8e01680aabacdc0ad43";
+       version = "0.4.0.0";
+       sha256 = "7e975cca6e57dc947abdc776a90fb94cee9f30fc8a0f395570c9665d23e53644";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -73583,8 +73874,8 @@ self: {
     ({ mkDerivation, base, bytestring, fltkhs }:
      mkDerivation {
        pname = "fltkhs-fluid-examples";
-       version = "0.0.0.2";
-       sha256 = "1152b9d4e25df28011abd695fa066a798b11839c34d31eb5ccd2820587eaa3b7";
+       version = "0.0.0.3";
+       sha256 = "29d569819feafbe4aa9deb6c78a2e3189780e1cbb4aa350a3e32aa18b6435bf0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
@@ -73593,6 +73884,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fltkhs-hello-world" = callPackage
+    ({ mkDerivation, base, fltkhs }:
+     mkDerivation {
+       pname = "fltkhs-hello-world";
+       version = "0.0.0.2";
+       sha256 = "c7f8e729ba129ba983624da2d8696629c3e476b80ae5ea76a28e1a37ceedade1";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base fltkhs ];
+       homepage = "http://github.com/deech/fltkhs-hello-world";
+       description = "Fltkhs template project";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fluent-logger" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, exceptions
@@ -73903,6 +74209,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
+     , primitive, profunctors, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.1.3";
+       sha256 = "af81eb42e6530f6f0ba992965c337d89483d755b50c7c94b12325dd793435474";
+       libraryHaskellDepends = [
+         base bytestring comonad containers mwc-random primitive profunctors
+         text transformers vector
+       ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
      , histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -74999,7 +75322,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "free" = callPackage
+  "free_4_12_1" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, distributive
      , exceptions, mtl, prelude-extras, profunctors, semigroupoids
      , semigroups, template-haskell, transformers
@@ -75015,9 +75338,10 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "free_4_12_2" = callPackage
+  "free" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, prelude-extras, profunctors
      , semigroupoids, semigroups, template-haskell, transformers
@@ -75035,6 +75359,26 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "free_4_12_4" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, containers
+     , distributive, exceptions, mtl, prelude-extras, profunctors
+     , semigroupoids, semigroups, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "free";
+       version = "4.12.4";
+       sha256 = "c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784";
+       libraryHaskellDepends = [
+         base bifunctors comonad containers distributive exceptions mtl
+         prelude-extras profunctors semigroupoids semigroups
+         template-haskell transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/free/";
+       description = "Monads for free";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -77418,7 +77762,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "geniplate-mirror" = callPackage
+  "geniplate-mirror_0_7_1" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
@@ -77428,9 +77772,10 @@ self: {
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "geniplate-mirror_0_7_2" = callPackage
+  "geniplate-mirror" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
@@ -77440,7 +77785,6 @@ self: {
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniserver" = callPackage
@@ -79486,7 +79830,7 @@ self: {
        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";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
@@ -79499,7 +79843,7 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex" = callPackage
+  "git-annex_5_20151218" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -79552,19 +79896,20 @@ self: {
        ];
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex_6_20160114" = callPackage
+  "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -79617,13 +79962,12 @@ self: {
        ];
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
@@ -80669,6 +81013,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "gl_0_7_8" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, fixed, half
+     , hxt, mesa, split, transformers
+     }:
+     mkDerivation {
+       pname = "gl";
+       version = "0.7.8";
+       sha256 = "4ee12e21d759399f56932a14d5aa7e4266c387fa834103680011a0914b9e8db6";
+       libraryHaskellDepends = [
+         base containers directory filepath fixed half hxt split
+         transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       description = "Complete OpenGL raw bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "gl-capture" = callPackage
     ({ mkDerivation, base, bytestring, OpenGL }:
      mkDerivation {
@@ -83727,6 +84089,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphs_0_7" = callPackage
+    ({ mkDerivation, array, base, containers, transformers
+     , transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "graphs";
+       version = "0.7";
+       sha256 = "eea656ac6092eac99bafc0b7817efa34529b895408fc1267a5b573fb332f6f4c";
+       libraryHaskellDepends = [
+         array base containers transformers transformers-compat void
+       ];
+       homepage = "http://github.com/ekmett/graphs";
+       description = "A simple monadic graph library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "graphtype" = callPackage
     ({ mkDerivation, base, containers, dotgen, haskell-src-exts
      , haskell98, uniplate
@@ -86640,10 +87019,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-diff";
-       version = "0.1.0.0";
-       sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d";
-       revision = "1";
-       editedCabalFile = "eddc65fed41375eaa4ce2aa729bd35364d558d7e33b23fcafca58dd6ce3cff1c";
+       version = "0.1.0.1";
+       sha256 = "251410eafa7672c817ef5b697798770b37795e9699e42059aeba9e4b82b4d002";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88232,6 +88609,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "half_0_2_2_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "half";
+       version = "0.2.2.3";
+       sha256 = "85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/ekmett/half";
+       description = "Half-precision floating-point";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "halfs" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, filepath, fingertree, HFuse, mtl, QuickCheck, random
@@ -88785,7 +89175,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-authenticate" = callPackage
+  "happstack-authenticate_2_3_2" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -88812,6 +89202,36 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-authenticate" = callPackage
+    ({ mkDerivation, acid-state, aeson, authenticate, base
+     , base64-bytestring, boomerang, bytestring, containers
+     , data-default, email-validate, filepath, happstack-hsp
+     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
+     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
+     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
+     , shakespeare, text, time, unordered-containers, userid, web-routes
+     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "happstack-authenticate";
+       version = "2.3.3";
+       sha256 = "e8bd1802370ad1d6f3099eb1a6ab4310a52aaaac1a7b0644d574dc71ee7c55d0";
+       libraryHaskellDepends = [
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack Authentication Library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -89896,7 +90316,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hashable" = callPackage
+  "hashable_1_2_3_3" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
      , QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unix
@@ -89917,9 +90337,10 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hashable_1_2_4_0" = callPackage
+  "hashable" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
      , QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unix
@@ -89938,7 +90359,6 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras_0_2_0_1" = callPackage
@@ -89998,6 +90418,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable-extras_0_2_3" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
+     , filepath, hashable, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "hashable-extras";
+       version = "0.2.3";
+       sha256 = "03e0303a50e265d8682402152c90e199d0f4685a1e553bf20a380652d6f06b6a";
+       libraryHaskellDepends = [
+         base bifunctors bytestring hashable transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/analytics/hashable-extras/";
+       description = "Higher-rank Hashable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-generics" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -92053,8 +92492,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.3.3";
-       sha256 = "3de776ff49e739f760ac37d296e4f0f5e9857624a454ca0cc18f85ae4ddbd01f";
+       version = "1.4.3";
+       sha256 = "73b49427676a19a55bc8c86deee8b1864cdbd39f15b74d811d7b8cc8ac1f3d9b";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -94008,7 +94447,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haxr" = callPackage
+  "haxr_3000_11_1_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base64-bytestring
      , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams
      , http-types, io-streams, mtl, mtl-compat, network, network-uri
@@ -94027,9 +94466,10 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haxr_3000_11_1_3" = callPackage
+  "haxr" = callPackage
     ({ mkDerivation, array, base, base-compat, base64-bytestring
      , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams
      , http-types, io-streams, mtl, mtl-compat, network, network-uri
@@ -94048,7 +94488,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxr-th" = callPackage
@@ -95117,6 +95556,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heaps_0_3_3" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath }:
+     mkDerivation {
+       pname = "heaps";
+       version = "0.3.3";
+       sha256 = "04e358d3e6d8ca7786749b6d3945e18159506f8b21ca48b1913c771dcaae1537";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/heaps/";
+       description = "Asymptotically optimal Brodal/Okasaki heaps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heapsort" = callPackage
     ({ mkDerivation, array, base, QuickCheck }:
      mkDerivation {
@@ -105399,6 +105853,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_2_2" = callPackage
+    ({ mkDerivation, base, directory, hspec-core, hspec-discover
+     , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.2.2";
+       sha256 = "91310e6feb10c31b23ec2739422f8ed25ed43bc606bd355cb034a66bb297c9d9";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
+         transformers
+       ];
+       testHaskellDepends = [
+         base directory hspec-core hspec-meta stringbuilder
+       ];
+       jailbreak = true;
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -105665,6 +106142,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_2_2" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, deepseq
+     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
+     , quickcheck-io, random, setenv, silently, tf-random, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.2.2";
+       sha256 = "01344835b8de81371087d187dbdb1011eea2c7e41132ed4edad643136d464398";
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv tf-random time transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations hspec-meta
+         HUnit process QuickCheck quickcheck-io random setenv silently
+         tf-random time transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-discover_2_1_2" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
@@ -105801,6 +106303,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_2_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.2.2";
+       sha256 = "4279c668ee8b537ad8192db47ba4a2c30fd49a90f6f5858bd7d2c835e752e81f";
+       isLibrary = true;
+       isExecutable = true;
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
+       doHaddock = false;
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations_0_6_1" = callPackage
     ({ mkDerivation, base, hspec, HUnit, markdown-unlit, silently }:
      mkDerivation {
@@ -106049,6 +106568,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-meta_2_2_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
+     , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
+     , random, setenv, time, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-meta";
+       version = "2.2.1";
+       sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv time transformers
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       homepage = "http://hspec.github.io/";
+       description = "A version of Hspec which is used to test Hspec itself";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-monad-control" = callPackage
     ({ mkDerivation, base, hspec-core, monad-control, transformers
      , transformers-base
@@ -114022,7 +114563,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "inline-c" = callPackage
+  "inline-c_0_5_5_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
      , containers, cryptohash, directory, filepath, gsl, gslcblas
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
@@ -114048,9 +114589,10 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
-  "inline-c_0_5_5_2" = callPackage
+  "inline-c" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
      , containers, cryptohash, directory, filepath, gsl, gslcblas
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
@@ -114076,7 +114618,6 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
   "inline-c-cpp" = callPackage
@@ -114632,6 +115173,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "intervals_0_7_2" = callPackage
+    ({ mkDerivation, array, base, directory, distributive, doctest
+     , filepath, ghc-prim, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "intervals";
+       version = "0.7.2";
+       sha256 = "0dd04a7dfd0ac6b364c66b78dafa48739c5116253078d4023e104f5e99d5fe28";
+       libraryHaskellDepends = [ array base distributive ghc-prim ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "http://github.com/ekmett/intervals";
+       description = "Interval Arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , cryptohash, directory, filepath, hscurses, mtl, network-fancy
@@ -118424,6 +118983,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kan-extensions_5_0_1" = callPackage
+    ({ mkDerivation, adjunctions, array, base, comonad, containers
+     , contravariant, distributive, free, mtl, semigroupoids, tagged
+     , transformers
+     }:
+     mkDerivation {
+       pname = "kan-extensions";
+       version = "5.0.1";
+       sha256 = "01de9fe57064a125ecb1d1161519df27043c2058ca246bbd5cd2d73c899ba0e2";
+       libraryHaskellDepends = [
+         adjunctions array base comonad containers contravariant
+         distributive free mtl semigroupoids tagged transformers
+       ];
+       homepage = "http://github.com/ekmett/kan-extensions/";
+       description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kangaroo" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -118465,6 +119043,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
+       revision = "1";
+       editedCabalFile = "6f3238173ad5a0fbdd82c2b73e96b4c43f17fa45f76f7249e6e925ed7eef9a97";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -119474,6 +120054,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keys_3_11" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, free, hashable
+     , semigroupoids, semigroups, transformers, transformers-compat
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "keys";
+       version = "3.11";
+       sha256 = "0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2";
+       libraryHaskellDepends = [
+         array base comonad containers free hashable semigroupoids
+         semigroups transformers transformers-compat unordered-containers
+       ];
+       homepage = "http://github.com/ekmett/keys/";
+       description = "Keyed functors and containers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "keystore" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools
      , asn1-encoding, asn1-types, base, base64-bytestring, byteable
@@ -122021,7 +122620,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift" = callPackage
+  "language-thrift_0_6_2_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -122044,7 +122643,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift_0_7_0_0" = callPackage
+  "language-thrift" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -123055,6 +123654,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens_4_13_1" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , comonad, containers, contravariant, deepseq, directory
+     , distributive, doctest, exceptions, filepath, free
+     , generic-deriving, ghc-prim, hashable, hlint, HUnit
+     , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck
+     , reflection, semigroupoids, semigroups, simple-reflect, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text, transformers
+     , transformers-compat, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.13.1";
+       sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b";
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring comonad containers
+         contravariant distributive exceptions filepath free ghc-prim
+         hashable kan-extensions mtl parallel profunctors reflection
+         semigroupoids semigroups tagged template-haskell text transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving hlint HUnit mtl nats parallel QuickCheck
+         semigroups simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/lens/";
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-action_0_1_0_1" = callPackage
     ({ mkDerivation, base, comonad, contravariant, directory, doctest
      , filepath, lens, mtl, profunctors, semigroupoids, semigroups
@@ -128108,7 +128743,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {objc = null;};
 
-  "luminance" = callPackage
+  "luminance_0_9_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -128123,9 +128758,10 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "luminance_0_9_1_1" = callPackage
+  "luminance" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -128140,6 +128776,23 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "luminance_0_9_1_2" = callPackage
+    ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
+     , mtl, resourcet, semigroups, transformers, vector, void
+     }:
+     mkDerivation {
+       pname = "luminance";
+       version = "0.9.1.2";
+       sha256 = "fd9d9b75c8bfff765eafc10023a709f10027928ea300932b82762e4543c10d5f";
+       libraryHaskellDepends = [
+         base containers contravariant dlist gl linear mtl resourcet
+         semigroups transformers vector void
+       ];
+       homepage = "https://github.com/phaazon/luminance";
+       description = "Type-safe, type-level and stateless graphics framework";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -128163,6 +128816,26 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "luminance-samples_0_9_1" = callPackage
+    ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
+     , luminance, mtl, resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "luminance-samples";
+       version = "0.9.1";
+       sha256 = "e3c67132470eb7e5f9b16c291dd686c5e281a25e66dd2e8ffc307230897895f7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base contravariant GLFW-b JuicyPixels linear luminance mtl
+         resourcet transformers
+       ];
+       homepage = "https://github.com/phaazon/luminance-samples";
+       description = "Luminance samples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lushtags" = callPackage
     ({ mkDerivation, base, haskell-src-exts, text, vector }:
      mkDerivation {
@@ -131288,6 +131961,8 @@ self: {
        pname = "memoize";
        version = "0.7";
        sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb";
+       revision = "1";
+       editedCabalFile = "4dccaf9fbeff4ff6207a78541ec3a6592db9c732fc65aa8bef1c5d8ff9c1f9f2";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A memoization library";
        license = stdenv.lib.licenses.bsd3;
@@ -133138,6 +133813,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_0_5" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.0.5";
+       sha256 = "6ae92f8c9e0aa767ecce520833ac46d3cf293931050650dc8896be16fb16da9d";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -134406,6 +135093,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-products_4_0_1" = callPackage
+    ({ mkDerivation, base, semigroupoids }:
+     mkDerivation {
+       pname = "monad-products";
+       version = "4.0.1";
+       sha256 = "02bfe1db2ae1a5cff19f73736a219605b1f0649f6af44ca848d09160a7946cea";
+       libraryHaskellDepends = [ base semigroupoids ];
+       homepage = "http://github.com/ekmett/monad-products";
+       description = "Monad products";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-ran" = callPackage
     ({ mkDerivation, base, ghc-prim, mtl }:
      mkDerivation {
@@ -134760,6 +135460,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monadic-arrays_0_2_2" = callPackage
+    ({ mkDerivation, array, base, stm, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monadic-arrays";
+       version = "0.2.2";
+       sha256 = "667714c6100272b48c4377cf2e2984b67a4445521a2a2e9c37539128c7e276a0";
+       libraryHaskellDepends = [
+         array base stm transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/monadic-arrays/";
+       description = "Boxed and unboxed arrays for monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monadiccp" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, pretty, random }:
      mkDerivation {
@@ -152076,6 +152793,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pointed_5" = callPackage
+    ({ mkDerivation, base, comonad, containers, data-default-class
+     , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged
+     , transformers, transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pointed";
+       version = "5";
+       sha256 = "8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17";
+       libraryHaskellDepends = [
+         base comonad containers data-default-class hashable kan-extensions
+         semigroupoids semigroups stm tagged transformers
+         transformers-compat unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/pointed/";
+       description = "Pointed and copointed data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pointedlist" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -154117,6 +154855,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prelude-extras_0_4_0_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "prelude-extras";
+       version = "0.4.0.3";
+       sha256 = "09bb087f0870a353ec1e7e1a08017b9a766d430d956afb88ca000a6a876bf877";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/ekmett/prelude-extras";
+       description = "Higher order versions of Prelude classes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prelude-generalize" = callPackage
     ({ mkDerivation, base, comonad, logict, transformers }:
      mkDerivation {
@@ -154782,6 +155533,8 @@ self: {
        pname = "process-extras";
        version = "0.3.3.4";
        sha256 = "77d550a6aa270e41f55193025201f70410b8728028c72450837e329e3f3dd8b2";
+       revision = "1";
+       editedCabalFile = "2ab4fd50b430fda365a8d22012f2ad28ce27a96346c5ff7f7683bb5cbc85e761";
        libraryHaskellDepends = [
          base bytestring deepseq ListLike process text
        ];
@@ -154798,12 +155551,32 @@ self: {
        pname = "process-extras";
        version = "0.3.3.5";
        sha256 = "da546fabdb83755618cdd10cbe6510d995d1834a130a1d0342856fd80fd9dea1";
+       revision = "1";
+       editedCabalFile = "beaa9e19a781212403fe07d03b9aabf7d2ef482d9b7e9c51c1f2e8a1efb7e7a0";
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
+       homepage = "https://github.com/seereason/process-extras";
+       description = "Process extras";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "process-extras_0_3_3_6" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text
+     }:
+     mkDerivation {
+       pname = "process-extras";
+       version = "0.3.3.6";
+       sha256 = "a1638f8bf59873a271f86a948f9355a55f6f84bc580e7a0e673ca250ed966ed1";
+       revision = "1";
+       editedCabalFile = "b04a582a1803030f005ac9bc2f82f3eca132ce1a51661613a2986435bf7259ad";
        libraryHaskellDepends = [
          base bytestring deepseq ListLike process text
        ];
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -155231,6 +156004,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profunctors_5_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , contravariant, distributive, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "profunctors";
+       version = "5.2";
+       sha256 = "87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad contravariant distributive
+         tagged transformers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/profunctors/";
+       description = "Profunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "progress" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -155506,8 +156298,8 @@ self: {
     ({ mkDerivation, base, primitive }:
      mkDerivation {
        pname = "promises";
-       version = "0.2";
-       sha256 = "501daa14749b03ca3150946323cc111c1b260e48c43f9da0cbdb8de4e4ffec39";
+       version = "0.3";
+       sha256 = "bf7c901915c122e7ab270f4c90cf02e83a703bf78f246948dc2452dcd294f260";
        libraryHaskellDepends = [ base primitive ];
        homepage = "http://github.com/ekmett/promises/";
        description = "Lazy demand-driven promises";
@@ -157615,6 +158407,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.11";
        sha256 = "02962005e51d77b84e94dd0a8f3f1be89af6e8099d25e6c0bf417f364c323a10";
+       revision = "1";
+       editedCabalFile = "b87744a86ad200cf18eb3df19a1729cd93df3e87eea5e861881135e03d9c4f4c";
        libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck text
          time unordered-containers
@@ -162427,6 +163221,26 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "resolve-trivial-conflicts_0_3_2_2" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
+     , filepath, mtl, optparse-applicative, process, unix
+     }:
+     mkDerivation {
+       pname = "resolve-trivial-conflicts";
+       version = "0.3.2.2";
+       sha256 = "2d68535d32943a6640845c86de751ab5185c687a2604c3435e4d757a2a263c1b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal base base-compat Diff directory filepath mtl
+         optparse-applicative process unix
+       ];
+       homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
+       description = "Remove trivial conflict markers in a git repository";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "resource-effect" = callPackage
     ({ mkDerivation, base, containers, extensible-effects, HUnit, mtl
      , QuickCheck, test-framework, test-framework-hunit
@@ -166703,7 +167517,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbv" = callPackage
+  "sbv_5_9" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
@@ -166728,9 +167542,10 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbv_5_11" = callPackage
+  "sbv" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
@@ -166755,7 +167570,6 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbvPlugin" = callPackage
@@ -168744,6 +169558,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroupoids_5_0_1" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , containers, contravariant, directory, distributive, doctest
+     , filepath, semigroups, tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "semigroupoids";
+       version = "5.0.1";
+       sha256 = "0ce989b8b0dc02ebe9aa19c47982a6bc802b8dc973c39c7ac40ea7a21cdbd616";
+       revision = "1";
+       editedCabalFile = "94d9167b701f148cb429e6746dd2bbb3b6559521b7fc2e98ce47339ad09af9f2";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad containers contravariant
+         distributive semigroups tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/semigroupoids";
+       description = "Semigroupoids: Category sans id";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroupoids-syntax" = callPackage
     ({ mkDerivation, base, comonad, containers, contravariant
      , directory, distributive, doctest, filepath, QuickCheck
@@ -170866,8 +171702,8 @@ self: {
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
        pname = "set-cover";
-       version = "0.0.5";
-       sha256 = "a3a4b4f2099780fe5652036346d7dae2bf1db4a56e77e663ca6964312dec7c99";
+       version = "0.0.6";
+       sha256 = "6b1554247fda64306c4d47957b00794e06e0744f9996d287dbdb6612774179f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers utility-ht ];
@@ -171093,8 +171929,8 @@ self: {
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.0.0";
-       sha256 = "e90495a6fd7993cd4f943a5a9e2759304a9f055a8cea0c2bc2f94645bc150a1e";
+       version = "1.1.0";
+       sha256 = "e784db96a9fdcf1fe5f48adfc62e8b4ef9795bf4558769c149f244ed5ef9415c";
        libraryHaskellDepends = [
          array base containers mtl scientific semigroups split stack-prism
          template-haskell text wl-pprint-text
@@ -172389,6 +173225,8 @@ self: {
        pname = "shelltestrunner";
        version = "1.3.5";
        sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829";
+       revision = "1";
+       editedCabalFile = "4ccce28f099594a89bbb8ff9c8f6408955b4be02a01eb2d552e1ce7165dce3aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -172396,7 +173234,6 @@ self: {
          pretty-show process regex-tdfa safe test-framework
          test-framework-hunit utf8-string
        ];
-       jailbreak = true;
        homepage = "http://joyful.com/shelltestrunner";
        description = "A tool for testing command-line programs";
        license = "GPL";
@@ -172905,8 +173742,8 @@ self: {
      }:
      mkDerivation {
        pname = "sign";
-       version = "0.4.2";
-       sha256 = "2ce6cc3b2803f11ad03abaf5ca0b11b37aa131f3867d8f3a741f0b9b51d67659";
+       version = "0.4.3";
+       sha256 = "77855b6953a17cdba1459efc5241b7174cd628629583245ced96684dfd1f7544";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -177817,6 +178654,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "speculation_1_5_0_3" = callPackage
+    ({ mkDerivation, base, ghc-prim, stm, transformers }:
+     mkDerivation {
+       pname = "speculation";
+       version = "1.5.0.3";
+       sha256 = "73bf641a87e0d28a2ba233922db936e0776c3dc24ed421f6f963f015e2eb4d3f";
+       libraryHaskellDepends = [ base ghc-prim stm transformers ];
+       homepage = "http://github.com/ekmett/speculation";
+       description = "A framework for safe, programmable, speculative parallelism";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "speculation-transformers" = callPackage
     ({ mkDerivation, speculation }:
      mkDerivation {
@@ -179435,8 +180285,8 @@ self: {
        pname = "stack";
        version = "1.0.0";
        sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
-       revision = "5";
-       editedCabalFile = "a0067126d4f6e5ed16ca552886c9010f9bc4813b582736313e6d5e78a7ed581c";
+       revision = "6";
+       editedCabalFile = "d2de14a5f76d0d1b7ff78d1a7647a429e4151ffdda57fa3b061a0c5641272931";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186820,6 +187670,27 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "tellbot_0_6_0_11" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, containers
+     , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "tellbot";
+       version = "0.6.0.11";
+       sha256 = "0589e73acc704ef0b38e59b98caba0faba9aef9802672f50efc1fcb7c0287c9f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bifunctors bytestring containers http-conduit mtl network
+         regex-pcre split tagsoup text time transformers
+       ];
+       homepage = "https://github.com/phaazon/tellbot";
+       description = "IRC tellbot";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "template" = callPackage
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
@@ -187311,6 +188182,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "terntup" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "terntup";
+       version = "0.0.1";
+       sha256 = "ffbb4c7dd4ccf56628360671a31745125a52f8131254fc98f2041e32bbe93ff7";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "a ternary library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "terrahs" = callPackage
     ({ mkDerivation, base, haskell98, old-time, terralib4c, translib }:
      mkDerivation {
@@ -192114,14 +193002,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers_0_5_0_0" = callPackage
+  "transformers_0_5_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.5.0.0";
-       sha256 = "720541fc11ed72737c7059f47836361edb05f6eadcd535fffbee8801f3d03feb";
-       revision = "1";
-       editedCabalFile = "b85ec9307ae228bde57c06b96bf25e4518d22ad40daccf285cf7d1f31c1dc2ab";
+       version = "0.5.0.2";
+       sha256 = "3fb9c00cae4b0531a05d29c8d21de775352b97c8ab1091f35e9acdbee28facc6";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -192219,6 +193105,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-compat_0_5_1_4" = callPackage
+    ({ mkDerivation, base, ghc-prim, transformers }:
+     mkDerivation {
+       pname = "transformers-compat";
+       version = "0.5.1.4";
+       sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f";
+       libraryHaskellDepends = [ base ghc-prim transformers ];
+       homepage = "http://github.com/ekmett/transformers-compat/";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transformers-compose" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -195667,6 +196566,8 @@ self: {
        pname = "unique";
        version = "0";
        sha256 = "e3fb171b7b1787683863934df0fc082fb47c0da6972bb1839c2ee8ceb64a0a90";
+       revision = "1";
+       editedCabalFile = "68933757e4bd3e7f53f226bd344f8ee980e86fe74eed20fa19edb5867c51035f";
        libraryHaskellDepends = [ base ghc-prim hashable ];
        homepage = "http://github.com/ekmett/unique/";
        description = "Fully concurrent unique identifiers";