summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/hackage-packages.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-10-09 20:30:53 +0200
committerPeter Simons <simons@cryp.to>2015-10-12 15:39:37 +0200
commit214955dd04724755a7481c2f3740b390b084a7d4 (patch)
tree0b739e6a0951f127f48d5eb9df0d859872a7b89a /pkgs/development/haskell-modules/hackage-packages.nix
parent124bca6dc1da20b8fb283c8537be50579700aed1 (diff)
downloadnixlib-214955dd04724755a7481c2f3740b390b084a7d4.tar
nixlib-214955dd04724755a7481c2f3740b390b084a7d4.tar.gz
nixlib-214955dd04724755a7481c2f3740b390b084a7d4.tar.bz2
nixlib-214955dd04724755a7481c2f3740b390b084a7d4.tar.lz
nixlib-214955dd04724755a7481c2f3740b390b084a7d4.tar.xz
nixlib-214955dd04724755a7481c2f3740b390b084a7d4.tar.zst
nixlib-214955dd04724755a7481c2f3740b390b084a7d4.zip
hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-18-g943a6d6 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/b50d1833baf9a50c2afa5f0aa38a87c6eaf74b06
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/370eb30278fbb6c690a2b32fd2939365934b6415
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/0d493eae3616d7da684f1b6bf35709bc4408a5c0
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/6fbf34ed626be44ccc8e4ee3a7a24efd6a825f68
Diffstat (limited to 'pkgs/development/haskell-modules/hackage-packages.nix')
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1353
1 files changed, 1052 insertions, 301 deletions
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cd564344b4db..89650860b21e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5748,6 +5748,22 @@ self: {
        license = "LGPL";
      }) {};
 
+  "Fractaler" = callPackage
+    ({ mkDerivation, base, FTGL, GLFW-b, OpenGLRaw, parallel, random
+     , time
+     }:
+     mkDerivation {
+       pname = "Fractaler";
+       version = "3";
+       sha256 = "ae0c81e8b34cac290c08fefa7d30c5172fb41edbb51c8fa7bc807c5e5aa6d240";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base FTGL GLFW-b OpenGLRaw parallel random time
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Frames" = callPackage
     ({ mkDerivation, base, ghc-prim, pipes, primitive, readable
      , template-haskell, text, transformers, vector, vinyl
@@ -8899,7 +8915,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HaTeX" = callPackage
+  "HaTeX_3_16_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, matrix, parsec
      , QuickCheck, tasty, tasty-quickcheck, text, transformers
      , wl-pprint-extras
@@ -8918,6 +8934,28 @@ self: {
        homepage = "http://wrongurl.net/haskell/HaTeX";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HaTeX" = callPackage
+    ({ mkDerivation, base, bytestring, containers, matrix, parsec
+     , QuickCheck, tasty, tasty-quickcheck, text, transformers
+     , wl-pprint-extras
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.16.2.0";
+       sha256 = "e829ab2354d0647142bacc16edb56802e427a1f12c018550a7ff8989ac3a5b5b";
+       libraryHaskellDepends = [
+         base bytestring containers matrix parsec QuickCheck text
+         transformers wl-pprint-extras
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck text
+       ];
+       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
+       description = "The Haskell LaTeX library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -11472,7 +11510,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ListLike" = callPackage
+  "ListLike_4_2_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist, fmlist
      , HUnit, QuickCheck, random, text, vector
      }:
@@ -11490,6 +11528,27 @@ self: {
        homepage = "http://software.complete.org/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ListLike" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist, fmlist
+     , HUnit, QuickCheck, random, text, vector
+     }:
+     mkDerivation {
+       pname = "ListLike";
+       version = "4.2.1";
+       sha256 = "d6542ae5bef685e3571cd46b018c5adac2b6c854f72777ddd35a6823bcf08859";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist fmlist text vector
+       ];
+       testHaskellDepends = [
+         array base bytestring containers dlist fmlist HUnit QuickCheck
+         random text vector
+       ];
+       homepage = "http://software.complete.org/listlike";
+       description = "Generic support for list-like structures";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ListTree" = callPackage
@@ -11823,8 +11882,8 @@ self: {
      }:
      mkDerivation {
        pname = "MagicHaskeller";
-       version = "0.9.6.4.1";
-       sha256 = "4f4accf24ea3fd9e9fb4281184d95343cb4951e44256c289b242617643f60587";
+       version = "0.9.6.4.2";
+       sha256 = "a0db9cb06c346a8b9b1a23c8f69e9950928337fe3dbaa545ad4eaadcf25c5a5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -22469,8 +22528,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.3.2.1";
-       sha256 = "a2f3f3c3f3c5ddbfbfb2b988aa293e620bf03afd0776bbcd01a25a955e882704";
+       version = "1.3.3.1";
+       sha256 = "27d9a615e8a92c8ced1c15519881632ccc4cceb33c6bb3a3a196fbe4fe18211e";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-conduit ini lens mmorph monad-control mtl resourcet
@@ -22530,8 +22589,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.3.2";
-       sha256 = "a3b2fe18285a88407e615fa84d43b5e13a4a02981ecc96c39e2c9da73ba3e0be";
+       version = "1.3.3.1";
+       sha256 = "041574babec4fc0a203ac406e94bcbaca58aaf0b85675c96559c1f12f4151908";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22590,8 +22649,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.3.2";
-       sha256 = "1f4137bd919888f48bf799314687c10791b6bf26a0615c59747f5e55abb8204b";
+       version = "1.3.3.1";
+       sha256 = "f3bab8e79227fefacbf57026df6458d390ebef26b4614080bdf19109c281ca57";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22650,8 +22709,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.3.2";
-       sha256 = "4f9a2771c209b18d06aeadb09e2ba27306be86ab3c19afa7c4d0694d9b1546f3";
+       version = "1.3.3.1";
+       sha256 = "0e9aaba03d4cc1376531f733a8420fbeb152bbf02c93f87380e9acafe7e29d9a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22710,8 +22769,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.3.2";
-       sha256 = "61689abecadea5daf9180167c196c84923faa08e8a901ed71bf4b2258a22cec6";
+       version = "1.3.3.1";
+       sha256 = "08f6a0753b99bae50dd180d148f922ab6a9ec7dcac63d03b7be927f25d5fd3ed";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22770,8 +22829,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.3.2";
-       sha256 = "30f3fe563cdd99c9ed54c1eb1f0232ba1f811f86afde90d7af1bf7fd4b945333";
+       version = "1.3.3.1";
+       sha256 = "dc28e155c14c9d3c2a80fdd678022572141b95e0d046413f02576af37d6c3448";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22830,8 +22889,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.3.2";
-       sha256 = "335007f8e9b8e0cce2aa7ff5e67f084eb1988d75b478a8d6ea1c1305586fed82";
+       version = "1.3.3.1";
+       sha256 = "59107a12c03c4141756c528149d5de75a979b49292eae19ec2e283abab32af19";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22890,8 +22949,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.3.2";
-       sha256 = "4098c3e1a482ec8849fe7f0bf69d35ae5d468e7c08509130a409d01c0b10d8af";
+       version = "1.3.3.1";
+       sha256 = "198dc20a1952fad99ea4f9a889de6bed901581aa89dd49ba37e0acd864cede3c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -22950,8 +23009,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.3.2";
-       sha256 = "a5549acb91707edb087864ab91afae05b6310b80ec95bcbeddb848e9aaed165e";
+       version = "1.3.3.1";
+       sha256 = "29cc7465272e0de75b87aaff10f04485801183502f0355c59f46041b7ae8bbe3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23010,8 +23069,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.3.2";
-       sha256 = "2f4df966c2f6c64bb535601835edd70fbe3d255b29199938f9ac0dcbe5b7b481";
+       version = "1.3.3.1";
+       sha256 = "c368fdeb5196f880c168bc611f4e2dbd5a7287d1c1001a71d5f132280faacb65";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23028,8 +23087,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.3.2";
-       sha256 = "6266925666ddd3e2b2999ed589303d000340a91398c1aec01e2330f77d41f6c2";
+       version = "1.3.3.1";
+       sha256 = "3491e980696cb106c4d2fc6d154b1d9d10909e9bd4550edfa017e4b4ae8ba4e4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23088,8 +23147,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.3.2";
-       sha256 = "8d8da39a232b9a2d723c8fb70c5df3e5dd186b7d52855c22f680b57ac34f77ff";
+       version = "1.3.3.1";
+       sha256 = "107082997acf929b39299ba2e0f469ea57bdf75aef8430269c396199d0e961ad";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23106,8 +23165,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.3.2";
-       sha256 = "30693141f4f1df8a9b70434f22e080fe2571adda0a40badcd2a4e99d24f71300";
+       version = "1.3.3.1";
+       sha256 = "fb56978365d97a1cf8d663639b909394df035726ec988564c9aa5a271539683a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23166,8 +23225,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.3.2";
-       sha256 = "44c0e8072764d879d7bf86c9df4f8d8ab2a4d312c0061d5c9dfe50fdf286e742";
+       version = "1.3.3.1";
+       sha256 = "f85a01b2559ea16185513c1882067eae2749083667aefdaf2e56df9855fac2ef";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23226,8 +23285,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.3.2";
-       sha256 = "abfe58c62ec55f7fe1979d1d3fad0091eb9b800180e2aee80bcbf9af51bc0110";
+       version = "1.3.3.1";
+       sha256 = "f7295b707efc5b2df6936df227021b10dd13b79537038073897b919b0df10e8e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23286,8 +23345,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.3.2";
-       sha256 = "54e68f187a3023c06f831ede63ef1e05df01c81e699d73072f39de50894060f7";
+       version = "1.3.3.1";
+       sha256 = "8959b2d5f38cb04015e82a30bb898be619f39114103b98e629baeb18dd12708c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23400,8 +23459,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.3.2";
-       sha256 = "cf51156498ed0ac956b9448c9cdc3cff6330ee67542ef5a2aa3a757c075e288c";
+       version = "1.3.3.1";
+       sha256 = "97cff5c193b02afc6b71e058bce76577382f52894f88f3b66344c2531d72db68";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-conduit
@@ -23467,8 +23526,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.3.2";
-       sha256 = "5c9e97ace29cfbf2193aa9da79d0ab861c8e05a81d7c08f2537ebcaac9c812a7";
+       version = "1.3.3.1";
+       sha256 = "de5692b7d72e3eb66a29a5b10c4e8a83fc4014121d4a1478281601c130ea4647";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23485,8 +23544,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.3.2";
-       sha256 = "d26047cbb12c44d3e8f06c0d392d464dd8acd049038f98023093e739a7b728c6";
+       version = "1.3.3.1";
+       sha256 = "3b341f588739d82556b092f8f2a96321be321a30d4450d905a168baf8899122a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23545,8 +23604,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.3.2";
-       sha256 = "d76e47b983e29da82d15f1bfed7912c0d890c07ffbff00de531d6a58768e7c78";
+       version = "1.3.3.1";
+       sha256 = "6fbbecc0263e1a734fd22c93aeede32912f10ba7cd2cf660d6fcae05d8d8de03";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23563,8 +23622,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.3.2";
-       sha256 = "51a43787780f5342070ab606287d91f519bf9d9d105d9bf5aaa633511638e8ba";
+       version = "1.3.3.1";
+       sha256 = "8260c4fbc7c4e37d6b1aa8dbf1e6fb32562e5930754a9e3609bcde398eec5ca5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23623,8 +23682,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.3.2";
-       sha256 = "da7cd796e9f8ff95cc63563d151ef91a9d4939603c906ea649d3418b1140e8b6";
+       version = "1.3.3.1";
+       sha256 = "cb80a5fecc7bdb35c87aff89438e1c64352cb19942acca100b09d74eacbd9895";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23641,8 +23700,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.3.2";
-       sha256 = "9afbe3ad9179d9ea7a9c09285c80186138c5f7d1c7783d9a7fc6aa565e9c916d";
+       version = "1.3.3.1";
+       sha256 = "415e1b4608ed2ca9b9a26570020ac503511b16a06503e3aa26274bdec1fd2780";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23715,8 +23774,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.3.2";
-       sha256 = "2c8b13a979537e328257dc8f54d9a517ca63a29fd8514cf7969ac208842f53c0";
+       version = "1.3.3.1";
+       sha256 = "4988024f87f5c8f4b2c19ace1d2b33c782f580cb662ca6e1b3e747350eadd94e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23776,8 +23835,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.3.2";
-       sha256 = "9502857611b8027a4d0a5a0a80d5947f3facdcffdd71841daa9d4d2f46a5255d";
+       version = "1.3.3.1";
+       sha256 = "f9a6baa97c182c497c41c0eb3a1805e5d5e376deee17c069ae15173d176b6c62";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23794,8 +23853,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.3.2";
-       sha256 = "cecae3833adb15b608fd756153eecc132127ee8b05fb605430944e13d4cc8489";
+       version = "1.3.3.1";
+       sha256 = "658728b594a32a5071acf085b1db2323cff6ed76161447c30ee9df9acd57e6e5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23854,8 +23913,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.3.2";
-       sha256 = "ca3029ceb1bf8548725fcff48a4b29a53e44d505be8f21c4ad2e751d67058cf5";
+       version = "1.3.3.1";
+       sha256 = "6bdc54b61a918e326079d76bfda045da725ff68236b22fcae40454eb0b32ee1f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23914,8 +23973,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.3.2";
-       sha256 = "b87a247d690531aff99d972cf57544aa7110a3112942d5731712d798245d3235";
+       version = "1.3.3.1";
+       sha256 = "5f04dd638e81b3f878776b9c9df514e53281600e208b09932054a528c62edbee";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -23926,6 +23985,24 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-elasticsearch" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticsearch";
+       version = "1.3.3.1";
+       sha256 = "22349ad33c4cc7c445a2e6945fbbdb375f906d222bb3336bacef16d9c9a8f06b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elasticsearch Service SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-elastictranscoder_0_3_3" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
@@ -23974,8 +24051,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.3.2";
-       sha256 = "88f3175585a6a5b88152cf00ba1a0c8e96bf3348cfe40b0b5b68f2c333644ed4";
+       version = "1.3.3.1";
+       sha256 = "ca7a8c367e09a283e6bcb0d428b6b58c55f24d9f05374fd6ee51de21abb8a5b5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24034,8 +24111,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.3.2";
-       sha256 = "296ac4d7e1d289887b3bc7f364541226289b8692b85138fa8a5fbbbe972fb562";
+       version = "1.3.3.1";
+       sha256 = "a346dfb8a16e3324da285695dd35fc84a1c7327151b99990dab07ff0c51c729a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24094,8 +24171,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.3.2";
-       sha256 = "b291a06f12afc10024dbf65d68d1c2e70f603a3fbaedcfdfe432f2d4e1322520";
+       version = "1.3.3.1";
+       sha256 = "b5ae30499d2f1b8e7538015143b13164ccf853a20913e95054ed2110d38ad790";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24154,8 +24231,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.3.2";
-       sha256 = "f4454c571590f2e7821880059feb809d325c58c4e922188301f4886a990fc1c4";
+       version = "1.3.3.1";
+       sha256 = "f1f3b1c37774f96ee6c528a4799e706ae09e8d5ab0d8004d201903775943ad72";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24214,8 +24291,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.3.2";
-       sha256 = "65675f2e6119e82176bf6cc9654506cd06b868d7e798ea0d724dafcfdc593053";
+       version = "1.3.3.1";
+       sha256 = "5cacaf7c2ae198f1441e4c6a3ae026f5c34c7d6b22685342a453e3207fffc8e2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24274,8 +24351,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.3.2";
-       sha256 = "97ae0adc639adb1a7e7d9de4d63feddba1ff9cb446d26b7f5be1b4b86b97bd01";
+       version = "1.3.3.1";
+       sha256 = "78f0970f803bd2898268ef9aa93b977325d8b12d7bb2710bbdc33b2268483974";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24286,6 +24363,42 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-inspector" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-inspector";
+       version = "1.3.3.1";
+       sha256 = "f954450339f70ad4865c1f1936eefa4537596f70b77cf02c44a77eeb99a702ef";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Inspector SDK";
+       license = "unknown";
+     }) {};
+
+  "amazonka-iot" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot";
+       version = "1.3.3.1";
+       sha256 = "203fcecd3c6b01d4979a565f7a8202533b589e8907fd4c627823a190cd7e2c98";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-kinesis_0_3_3" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
@@ -24334,8 +24447,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.3.2";
-       sha256 = "00765efb921cf0edcba4b344e18e8e891d42b88731d3983ebe53bcd6fb2d3f2b";
+       version = "1.3.3.1";
+       sha256 = "5309e46a928d3220ae7bfe59469b81589d2cc779456af20d1a4e0d5d80ab0008";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24346,6 +24459,24 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-kinesis-firehose" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-firehose";
+       version = "1.3.3.1";
+       sha256 = "ab9fc9aa1e0d8909aacee7647a03e6c49a6fe85e90b0df8bf62a2c0a8769c7d3";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Firehose SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-kms_0_3_3" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
@@ -24394,8 +24525,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.3.2";
-       sha256 = "e9b6f038ad6eac69d5211e1097b28f69c90b0847b8d46b49541e474d62249ff6";
+       version = "1.3.3.1";
+       sha256 = "1903e0712f83495b03ecf83556b5d637d7dd654e2d92bddc41710d7c77708781";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24454,8 +24585,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.3.2";
-       sha256 = "b53e3c9433596e84988447d342fb7b657aad0bcaa5a3cd7bec22808f1e79efa7";
+       version = "1.3.3.1";
+       sha256 = "042b8a6faf4beaa4f73477e276a30426b0dbe86cd334246171b82b126846f35f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24466,6 +24597,24 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-marketplace-analytics" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-marketplace-analytics";
+       version = "1.3.3.1";
+       sha256 = "0658b545153116a6a0ec3afaf04bf3a7e4f0c76c2a3dcb1f9c02efcee186a06f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Marketplace Commerce Analytics SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-ml_0_3_6" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
@@ -24486,8 +24635,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.3.2";
-       sha256 = "2a9f0c29d5e827248e1fb9684a33d9431f7949bd52e95171b0323c9b0caecfa2";
+       version = "1.3.3.1";
+       sha256 = "a7937abccfa33d09deb09087cef856fad1540874926123defa3ce293fa5faae5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24546,8 +24695,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.3.2";
-       sha256 = "26392a57cde6b15e59a5f6b96ff7088beb2003674ce125b058dcd66cc6cbd20d";
+       version = "1.3.3.1";
+       sha256 = "23a3c5eefcbcf31aecb7900a8d5e05377f22a4588241221bdf47283aa38f0e24";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24606,8 +24755,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.3.2";
-       sha256 = "49c2e70130d6bca50208792df74836617754287a6cbc2324be70260a91e803d3";
+       version = "1.3.3.1";
+       sha256 = "9b0f5edd0bc807700cfceda7f5be95fc0883e65dac719dd52dda55c630f4fe45";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24667,8 +24816,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.3.2";
-       sha256 = "d8447bf5bfe77358f1518ca421c04dbb62cb5a256e14df780284b75f926eba63";
+       version = "1.3.3.1";
+       sha256 = "c15130b57a9bda8b568d3fa6c90618ca4eb1e79b731f3620e6f10acebbe4cb02";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24741,8 +24890,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.3.2";
-       sha256 = "42c3a39705146c48a2fd124f0cb7c1a55f11dfd7c49971b661292c7a58dcc432";
+       version = "1.3.3.1";
+       sha256 = "6d976169fba413b11e650fbeec8321cfed44cdf5088741a7e045fb08c6020b3e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24801,8 +24950,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.3.2";
-       sha256 = "b11cfb87ae8d9697250efa8b8726d6a92c4747f5f27fbaaa84baaef298e6bd6e";
+       version = "1.3.3.1";
+       sha256 = "b036a6473ad435cab9f1c395abefd88186413c5f2d76f0e98ad7c74f3cad979e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24861,8 +25010,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.3.2";
-       sha256 = "be84c3c26fbc260544b2bdff623430ad055f02430f553ebc84f9122f2fae8c92";
+       version = "1.3.3.1";
+       sha256 = "e4b6fbbda81a900f7fd4d4a97136de2742b284a6e55454ebd6b7364a854b07a0";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24922,8 +25071,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.3.2";
-       sha256 = "40352be6e23eb5c1caaf12c349a624579ac48b88bc365f526303524c0f4449c9";
+       version = "1.3.3.1";
+       sha256 = "81bd1e1a2e4f7a37e7169822b304e7af936c6c0e0a5b2c4812e9bcb28c5a2e30";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -24982,8 +25131,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.3.2";
-       sha256 = "3a7dc098cf9d2c29cf8518ebee47c90de0bb2785671787f9aa2f1ebf06d4fbcd";
+       version = "1.3.3.1";
+       sha256 = "74b126cbaad5f3a6cfb452e2ee852f95d41e2c1ae7f6ab9049a02059d345c10f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25042,8 +25191,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.3.2";
-       sha256 = "cce7089e0ffa056c9062ca044e02df17ba6ceb47301d939ca34bf149eb35d031";
+       version = "1.3.3.1";
+       sha256 = "960f73f959c1444894ab765a3bda8912f1ccb60f1d266543f846174428af7c1c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25102,8 +25251,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.3.2";
-       sha256 = "504c25301b137cb654d7051febb497e476ae4dfa4d79e3e2b22c656d0ab86728";
+       version = "1.3.3.1";
+       sha256 = "5cbd2e7078b563a362af6017f4c96c62f4e8cc5564a46dbce1ac1b7e460ac155";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25163,8 +25312,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.3.2";
-       sha256 = "81e09bd6589385acfbadd26c2672f8511eeb595fb232688c66dd3dc0050c4866";
+       version = "1.3.3.1";
+       sha256 = "b6f057a5f796f9ceb764a2978e726bf10ac68cc04ad7af1da450819fb86b49d1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25223,8 +25372,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.3.2";
-       sha256 = "d63959ae893d92cada69173db45d922a415e758ecc40059fb10b4ef97136bc8a";
+       version = "1.3.3.1";
+       sha256 = "e903a341a72484e16c75913b3c8f23b7428956e8997026bac7bb5976fed12cac";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25283,8 +25432,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.3.2";
-       sha256 = "6ce779acdf481d9e664761e35c9e68a0fee28512df90a2eb72ee4751611713ac";
+       version = "1.3.3.1";
+       sha256 = "45d967ee5ec2a6bec32e02aeb052508932135104ca35e0dfe7d7b7a8734f3c19";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25343,8 +25492,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.3.2";
-       sha256 = "1482189908a0aa6f145fa2d3a5cf72d9c664f051ad0e437c6c9850e872019915";
+       version = "1.3.3.1";
+       sha256 = "cfd5e1b0d1255e1287167ee1f6ced8ae047a334d33ef87bbc87f2de8f6144b80";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25403,8 +25552,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.3.2";
-       sha256 = "2a2c6cda710f4b94a4ebeee36a4f56819982fe590c80eaabcd1d712582e4b3b4";
+       version = "1.3.3.1";
+       sha256 = "6a44f8338b400aa7cb58d4eac72c1223f94aa1a9b0bb73cf79efd0f9e80060d8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25425,8 +25574,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.3.2";
-       sha256 = "bf1052c75332990522cf4aebe3894c68c9c910b74bda415ac41a51374f212e8b";
+       version = "1.3.3.1";
+       sha256 = "88dfa3021f346e0c8149752597535abf5d3f8ebc05818b3f6e227fbcb642cc53";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types lens process
@@ -25438,6 +25587,24 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-waf" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-waf";
+       version = "1.3.3.1";
+       sha256 = "9a62d01fe19d6134b33a66bc2df6c7b1b05fe5ca10dfcb60beba6f839e33b7e2";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WAF SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-workspaces_0_3_6" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
@@ -25458,8 +25625,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.3.2";
-       sha256 = "2148ace8434fffe1a5b59f20fb5350c0bb6dd8ba3579cd6e9eaa8d21ed083fcf";
+       version = "1.3.3.1";
+       sha256 = "5a4f303b9ccb9dd17ba9fca7893f110b1e668ee7c77569d650ed3851fa38cf4d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -25471,28 +25638,32 @@ self: {
      }) {};
 
   "ampersand" = callPackage
-    ({ mkDerivation, base, bytestring, containers, csv, directory
-     , filepath, graphviz, hashable, HDBC, HDBC-odbc, HStringTemplate
-     , mtl, old-locale, old-time, pandoc, pandoc-types, process
-     , simple-sql-parser, split, SpreadsheetML, text, time, utf8-string
-     , uulib
+    ({ mkDerivation, base, bytestring, conduit, containers, csv
+     , directory, filepath, graphviz, hashable, HStringTemplate, lens
+     , MissingH, mtl, old-locale, old-time, pandoc, pandoc-types, parsec
+     , process, QuickCheck, simple-sql-parser, split, SpreadsheetML
+     , text, time, transformers, utf8-string, wl-pprint, xlsx, zlib
      }:
      mkDerivation {
        pname = "ampersand";
-       version = "3.0.3";
-       sha256 = "0c73dda8bedc5c6cbcacefbb581892de88582f0b6dca8207777edbac59ab5a75";
-       revision = "1";
-       editedCabalFile = "42a4a0f82e5c10b76a8412ba625df82da44d7e28353a9efa5aad2b10e7cc9d2a";
+       version = "3.1.0";
+       sha256 = "f52e3339321a5bac4539c4e5ab8cc91190499db43520bfdc2b63e8093df36744";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring containers csv directory filepath graphviz hashable
-         HDBC HDBC-odbc HStringTemplate mtl old-locale old-time pandoc
-         pandoc-types process simple-sql-parser split SpreadsheetML text
-         time utf8-string uulib
+         HStringTemplate lens MissingH mtl old-locale old-time pandoc
+         pandoc-types parsec process simple-sql-parser split SpreadsheetML
+         text time utf8-string wl-pprint xlsx zlib
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers directory filepath hashable lens
+         MissingH mtl old-locale pandoc pandoc-types parsec QuickCheck
+         simple-sql-parser text time transformers utf8-string wl-pprint xlsx
+         zlib
        ];
        jailbreak = true;
-       homepage = "ampersand.sourceforge.net";
+       homepage = "http://wiki.tarski.nl";
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32703,7 +32874,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bindings-DSL" = callPackage
+  "bindings-DSL_1_0_22" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "bindings-DSL";
@@ -32713,6 +32884,19 @@ self: {
        homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "bindings-DSL" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "bindings-DSL";
+       version = "1.0.23";
+       sha256 = "eb6c76448eeb2a9a17135b08eec0dd09e1917a9f6ab702cea0b2070bd19c10e7";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
+       description = "FFI domain specific language, on top of hsc2hs";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bindings-EsounD" = callPackage
@@ -37470,8 +37654,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-graphdeps";
-       version = "0.1.2";
-       sha256 = "2a896aaf7ccc2aaaaaf525aebad363ff2e8deb4a19a819dc4d4928bb4201b880";
+       version = "0.1.3";
+       sha256 = "2a419ca25fe5f8c346d520ccbce0b43701be976edf736bf3b046287ca6db75c8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43286,8 +43470,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "cli";
-       version = "0.0.4";
-       sha256 = "3dd98cc5a7d4e8bcd0db17dca4960273b1e541f5fdbab3cee69edaba3a87cc47";
+       version = "0.0.5";
+       sha256 = "2d514d8c7b17566c4cd5b9ae8f50dfad4af81fa5a81f547becb5b20faed714b2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -48655,20 +48839,19 @@ self: {
      }) {};
 
   "cpython" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, python3, text }:
+    ({ mkDerivation, base, bytestring, c2hs, python34, text }:
      mkDerivation {
        pname = "cpython";
-       version = "3.3.0";
-       sha256 = "529eb0b3931d3a18deaa6b0e026a6c0156efeb3518b7b4e4d89e45fb5c035598";
+       version = "3.4.0";
+       sha256 = "75424a6d82ca641a2d95eb25c298ee6ec40d974957d75056bb98b5757fe0c7c8";
        libraryHaskellDepends = [ base bytestring text ];
-       libraryPkgconfigDepends = [ python3 ];
+       libraryPkgconfigDepends = [ python34 ];
        libraryToolDepends = [ c2hs ];
-       jailbreak = true;
        homepage = "https://john-millikin.com/software/haskell-python/";
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) python3;};
+     }) {python34 = null;};
 
   "cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
@@ -49494,12 +49677,14 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, MissingH, split }:
+    ({ mkDerivation, base, containers, HUnit, MissingH, split }:
      mkDerivation {
        pname = "crypto-enigma";
-       version = "0.0.1.7";
-       sha256 = "e55bb2864c2f272884d0e40a97fbec22850ae2f3383953f061d3ddb212904f34";
+       version = "0.0.2.0";
+       sha256 = "193d3240a18db9d09ec1dc6d02612f034dd9e364083949adf8feb9e17c10a80f";
        libraryHaskellDepends = [ base containers MissingH split ];
+       testHaskellDepends = [ base HUnit ];
+       jailbreak = true;
        homepage = "https://github.com/orome/crypto-enigma";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
@@ -49989,8 +50174,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.7";
-       sha256 = "6cd4d9ff100b06a08ceac56eb12153633957797b309032a963cdf3841f92ecd9";
+       version = "0.8";
+       sha256 = "6401745cab3b83e81b84c09336215f3f80f532b3cfd948c4c53e891aa9b69b07";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -49998,7 +50183,7 @@ self: {
          base byteable bytestring memory tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
-       homepage = "https://github.com/vincenthz/cryptonite";
+       homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52786,7 +52971,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dbus" = callPackage
+  "dbus_0_10_10" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
      , process, QuickCheck, random, text, transformers, unix, vector
@@ -52805,6 +52990,33 @@ self: {
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
        ];
+       doCheck = false;
+       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" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
+     , containers, directory, filepath, libxml-sax, network, parsec
+     , process, QuickCheck, random, text, transformers, unix, vector
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "dbus";
+       version = "0.10.11";
+       sha256 = "73e6b2b2021215dd8b9540d770e5cc353427f37083c7d84ebc244ac48e630482";
+       libraryHaskellDepends = [
+         base bytestring cereal containers libxml-sax network parsec random
+         text transformers unix vector xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring cereal chell chell-quickcheck containers directory
+         filepath libxml-sax network parsec process QuickCheck random text
+         transformers unix vector xml-types
+       ];
+       doCheck = false;
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
@@ -53370,6 +53582,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "declarative" = callPackage
+    ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
+     , mighty-metropolis, mwc-probability, pipes, primitive
+     , speedy-slice, transformers
+     }:
+     mkDerivation {
+       pname = "declarative";
+       version = "0.1.0.1";
+       sha256 = "22bc7bed888b083c289ce027f3c545718e853736a8d19e9fe32a91da61355bad";
+       libraryHaskellDepends = [
+         base hasty-hamiltonian lens mcmc-types mighty-metropolis
+         mwc-probability pipes primitive speedy-slice transformers
+       ];
+       testHaskellDepends = [ base mwc-probability ];
+       homepage = "http://github.com/jtobin/declarative";
+       description = "DIY Markov Chains";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "decode-utf8" = callPackage
     ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
      }:
@@ -53425,16 +53656,18 @@ self: {
      }) {};
 
   "deepcontrol" = callPackage
-    ({ mkDerivation, base, doctest, HUnit, mtl, QuickCheck }:
+    ({ mkDerivation, base, doctest, HUnit, mtl, QuickCheck
+     , transformers
+     }:
      mkDerivation {
        pname = "deepcontrol";
-       version = "0.1.0.0";
-       sha256 = "be629c925996c193cc1f85c542bff637f444f22ab1f75d55a7cc33287407418a";
-       libraryHaskellDepends = [ base mtl ];
+       version = "0.2.0.0";
+       sha256 = "7df441135b4a219ca7d912f97a3b4fb6adc8ce3c5d5c9a7b5458ce421bc157ec";
+       libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/ocean0yohsuke/deepcontrol";
-       description = "Enable deeper level style of programming than the usual control provides";
+       description = "Enable more deeper level style of programming than the usual Control.xxx modules express";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -55610,10 +55843,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pandoc";
-       version = "0.1";
-       sha256 = "645d84d47ff347ef1bc667bd5b9ac35b4636a86dd38759f63106991a0507bf09";
-       isLibrary = false;
+       version = "0.2";
+       sha256 = "03bc32e95873000bae33d837319367febc2efad073671677afa3fdd59d246459";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         base diagrams-builder diagrams-cairo diagrams-lib directory
+         filepath linear pandoc-types
+       ];
        executableHaskellDepends = [
          base diagrams-builder diagrams-cairo diagrams-lib directory
          filepath linear optparse-applicative pandoc-types
@@ -57265,6 +57502,7 @@ self: {
          distributed-static ghc-prim hashable mtl network-transport random
          rank1dynamic stm syb template-haskell time transformers
        ];
+       doCheck = false;
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -57324,6 +57562,7 @@ self: {
          network-transport network-transport-tcp rematch stm test-framework
          test-framework-hunit transformers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-async";
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
@@ -57413,6 +57652,7 @@ self: {
          network-transport network-transport-tcp rematch stm test-framework
          test-framework-hunit transformers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -57548,6 +57788,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-extras";
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
@@ -57786,6 +58027,7 @@ self: {
          rematch stm test-framework test-framework-hunit time transformers
          unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -57873,8 +58115,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.3.1";
-       sha256 = "df2b69250b339baa5180cd46d1d045f33665474f13c1903bb2ff3f2f39e105b6";
+       version = "0.4.3.2";
+       sha256 = "ee44041cdfca0712f45b279534ee646eb4a51a70f91a26484dd234d1b0ef4251";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -58027,6 +58269,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "dixi" = callPackage
+    ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup
+     , composition-tree, containers, data-default, directory, either
+     , lens, pandoc, patches-vector, safecopy, servant, servant-blaze
+     , servant-server, shakespeare, template-haskell, text, transformers
+     , vector, warp, yaml
+     }:
+     mkDerivation {
+       pname = "dixi";
+       version = "0.1.0.0";
+       sha256 = "85d7bfd8dc4b0789900ccbdc0b7da330b7d613c9b2a991a02396aafd27d01686";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         acid-state aeson base blaze-html blaze-markup composition-tree
+         containers data-default directory either lens pandoc patches-vector
+         safecopy servant servant-blaze servant-server shakespeare
+         template-haskell text transformers vector warp yaml
+       ];
+       homepage = "https://github.com/liamoc/dixi";
+       description = "A wiki implemented with a firm theoretical foundation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "djinn" = callPackage
     ({ mkDerivation, array, base, containers, haskeline, mtl, pretty }:
      mkDerivation {
@@ -60108,13 +60374,17 @@ self: {
      }) {canlib = null;};
 
   "ed25519" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, hlint, QuickCheck }:
+    ({ mkDerivation, base, bytestring, directory, doctest, filepath
+     , ghc-prim, hlint, QuickCheck
+     }:
      mkDerivation {
        pname = "ed25519";
-       version = "0.0.4.0";
-       sha256 = "8d22bcb592814f96b5335824a2b2930ad1c50811f950609d054d1a5228ae298d";
+       version = "0.0.5.0";
+       sha256 = "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
-       testHaskellDepends = [ base bytestring hlint QuickCheck ];
+       testHaskellDepends = [
+         base bytestring directory doctest filepath hlint QuickCheck
+       ];
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
@@ -60970,8 +61240,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-log";
-       version = "0.1.0.3";
-       sha256 = "1c6ac96631e6fc826a31b086eb4f2385eaefe1bf3d4d3252c8bdebc940bbf2e5";
+       version = "0.1.0.4";
+       sha256 = "10827eaf0ba809fe1ea2f05e2a31e584f19354982436af8b73a2d7b422dbfbed";
        libraryHaskellDepends = [
          aeson base bytestring directory ekg-core fast-logger filepath text
          time unix unordered-containers
@@ -64674,16 +64944,17 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, lens, parsec
-     , pipes, pipes-bytestring, pipes-group, pipes-text, split, text
+    ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
+     , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
+     , pipes-group, pipes-text, split, text
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.8.0.2";
-       sha256 = "3399b07d0ca4a1aaffbcebce624aed5f44e370e5241af6b109b3a8839ad81591";
+       version = "0.9.0.0";
+       sha256 = "85d7358b4f20b54cfbb9f6241ad1d5c8c238230898fe377f80c6ba65bb1990bd";
        libraryHaskellDepends = [
-         base bytestring containers foldl lens parsec pipes pipes-bytestring
-         pipes-group pipes-text split text
+         attoparsec base bytestring containers foldl lens parsec pipes
+         pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
        ];
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
@@ -67411,6 +67682,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "flat-tex" = callPackage
+    ({ mkDerivation, base, directory, parsec }:
+     mkDerivation {
+       pname = "flat-tex";
+       version = "0.3.1";
+       sha256 = "574f88448cac7d5a0399e5e7518f5c7003dacf16a2767a6d925cd3606a224ed7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base directory parsec ];
+       homepage = "https://github.com/jwaldmann/flat-tex";
+       description = "flatten a latex multi-file latex document";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "flexible-defaults" = callPackage
     ({ mkDerivation, base, containers, template-haskell, th-extras
      , transformers
@@ -67797,16 +68082,16 @@ self: {
      }) {};
 
   "fltkhs" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, directory, filepath, ghc
-     , mtl, parsec, process
+    ({ mkDerivation, base, bytestring, c2hs, directory, filepath, mtl
+     , parsec, process
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.2.0.0";
-       sha256 = "9f94b505afe96846b026b483f0ceb5bb3f0d249d5b807e10e8da0d16fea345c1";
+       version = "0.2.0.1";
+       sha256 = "90f88822a01ce585217f1115aa99c705fdf0984443c68aef24cd93f3c2850c43";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring ghc ];
+       libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [
          base bytestring directory filepath mtl parsec process
@@ -71401,6 +71686,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "geo-resolver" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, http-conduit, http-types, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "geo-resolver";
+       version = "0.1.0.1";
+       sha256 = "b877048487a553e2c0ab8f698ac90e5facb24169d5f0c8cc11f36131a837af1a";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring http-conduit http-types text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/markenwerk/haskell-geo-resolver/";
+       description = "Performs geo location lookups and parses the results";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "geocalc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -72151,8 +72459,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-pkg-lib";
-       version = "0.3";
-       sha256 = "aab46954ba339e617120eec0f2db5ff9bf008efcf7c50df0dd308658dcf056d4";
+       version = "0.3.1";
+       sha256 = "b3e106581e474cb32eb049bc8b49eedce82c8645b80fdf508a21d2c6ce5c7fce";
        libraryHaskellDepends = [
          base Cabal directory filepath ghc ghc-paths
        ];
@@ -74532,8 +74840,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-common";
-       version = "0.4.4";
-       sha256 = "08ea4ebd42a3a6f781c697479bdbfbc1ec006e83edc78f9a2ebec1fd1910f156";
+       version = "0.4.5";
+       sha256 = "41a041eb0d6e11e64ffdbb1a1c47d3ee859f921dc710041ed39537899acad80b";
        libraryHaskellDepends = [
          base hashable lifted-base monad-control text time transformers
          transformers-base unordered-containers
@@ -74555,8 +74863,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-core";
-       version = "0.4.4";
-       sha256 = "cc6ca854e7fb29a507c693d6f6c310d0362fb59dcb0d84949f934dd11a71d4c1";
+       version = "0.4.5";
+       sha256 = "1f7cf0f3f2b0e7f309a3d40e70bf3e37641a3615f07281b59ca0aa1e30fc83b7";
        libraryHaskellDepends = [
          base glue-common hashable lifted-base monad-control text time
          transformers transformers-base unordered-containers
@@ -74578,8 +74886,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-ekg";
-       version = "0.4.4";
-       sha256 = "5aa00ec498baa8f5a960c535f7e0b9fa9b572b0f1f139c0dbe9ace9e900ccee8";
+       version = "0.4.5";
+       sha256 = "94bc32dd0fa581d20933a3075a925141258fc42f080dd58279e7a347fe8b58ef";
        libraryHaskellDepends = [
          base ekg-core glue-common hashable lifted-base monad-control text
          time transformers transformers-base unordered-containers
@@ -74600,8 +74908,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-example";
-       version = "0.4.4";
-       sha256 = "0d4b4812930ce679d0966b43ece71b0db32177d28bc9a7bdded3af328dbf2d71";
+       version = "0.4.5";
+       sha256 = "8fbb89e9fb0531f6e397cec0d9ec3ecc49b58fc1ae630e71062155ed5586402f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -81553,14 +81861,14 @@ self: {
      }:
      mkDerivation {
        pname = "hashabler";
-       version = "1.0";
-       sha256 = "fb778350f955188fd7348fc85e3709502432e7290e6cfd1799e3d65f51b982bf";
+       version = "1.1";
+       sha256 = "93944c783631977f3927db9b3888012325f72c5e4d90fba24055f4e3cc5ffaeb";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
        ];
        homepage = "https://github.com/jberryman/hashabler";
-       description = "Principled, cross-platform & extensible hashing of types, including an implementation of the FNV-1a and SipHash algorithms";
+       description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -83480,7 +83788,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskintex" = callPackage
+  "haskintex_0_5_0_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
      , transformers
@@ -83499,6 +83807,50 @@ self: {
        homepage = "http://daniel-diaz.github.io/projects/haskintex";
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskintex_0_5_1_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "haskintex";
+       version = "0.5.1.0";
+       sha256 = "1c65a350e2cebce1117ce59fab5749ab7796cf36476e03c882f91cf7a46cb0df";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath
+         haskell-src-exts HaTeX hint parsec process text transformers
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://daniel-diaz.github.io/projects/haskintex";
+       description = "Haskell Evaluation inside of LaTeX code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskintex" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "haskintex";
+       version = "0.6.0.0";
+       sha256 = "229a817b9a688f23d2e394a7e76aff80973707df86fe628214577e863072914f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath
+         haskell-src-exts HaTeX hint parsec process text transformers
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://daniel-diaz.github.io/projects/haskintex";
+       description = "Haskell Evaluation inside of LaTeX code";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "haskmon" = callPackage
@@ -84804,13 +85156,12 @@ self: {
      }:
      mkDerivation {
        pname = "hatex-guide";
-       version = "1.3.1.0";
-       sha256 = "be8897c8872803219c52553df8aced434de03d63aef1a130e0cbcff446019187";
+       version = "1.3.1.1";
+       sha256 = "19bdc6cd223514e0066fa3d74f8a86817f756245838437e9ba4e50faedb21acd";
        libraryHaskellDepends = [
          base blaze-html directory filepath HaTeX parsec text time
          transformers
        ];
-       jailbreak = true;
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89091,19 +89442,25 @@ self: {
      }) {};
 
   "hjsonschema" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, directory
-     , file-embed, filepath, hashable, hjsonpointer, http-client
-     , http-types, HUnit, regexpr, scientific, test-framework
-     , test-framework-hunit, text, unordered-containers, vector
-     , wai-app-static, warp
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , directory, file-embed, filepath, hashable, hjsonpointer
+     , http-client, http-types, HUnit, mtl, regexpr, scientific
+     , test-framework, test-framework-hunit, text, transformers
+     , unordered-containers, vector, wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.6.0.2";
-       sha256 = "343836f8062337a61b6db1fee79b663e673c6cce7d185f9ceed4b1c7a994a2ef";
+       version = "0.7.0.0";
+       sha256 = "aa9b7bcf14c7f6c02949ffb7348ec208142b82a6ac1a75fde754c7a3f70f5d86";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring file-embed hashable hjsonpointer http-client
-         http-types regexpr scientific text unordered-containers vector
+         aeson base bytestring containers file-embed hashable hjsonpointer
+         http-client http-types mtl regexpr scientific text transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base text unordered-containers vector
        ];
        testHaskellDepends = [
          aeson async base bytestring directory filepath HUnit test-framework
@@ -89112,7 +89469,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
-       description = "JSON Schema Draft 4 library";
+       description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -91691,7 +92048,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hoogle" = callPackage
+  "hoogle_4_2_41" = callPackage
     ({ mkDerivation, aeson, array, base, binary, blaze-builder
      , bytestring, Cabal, case-insensitive, cmdargs, conduit, containers
      , deepseq, directory, filepath, haskell-src-exts, http-types
@@ -91723,6 +92080,41 @@ self: {
        homepage = "http://www.haskell.org/hoogle/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hoogle" = callPackage
+    ({ mkDerivation, aeson, array, base, binary, blaze-builder
+     , bytestring, Cabal, case-insensitive, cmdargs, conduit, containers
+     , deepseq, directory, filepath, haskell-src-exts, http-types
+     , old-locale, parsec, process, QuickCheck, random, resourcet, safe
+     , shake, tagsoup, temporary, text, time, transformers, uniplate
+     , unix, vector, vector-algorithms, wai, warp
+     }:
+     mkDerivation {
+       pname = "hoogle";
+       version = "4.2.42";
+       sha256 = "32ed4637d53fe1c0ee032e3692b74a4a0bb5d38d30b302450631aa6f6805dccb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary blaze-builder bytestring case-insensitive conduit
+         containers deepseq directory filepath haskell-src-exts http-types
+         parsec process QuickCheck random resourcet safe text transformers
+         uniplate unix vector vector-algorithms wai
+       ];
+       executableHaskellDepends = [
+         aeson array base binary blaze-builder bytestring Cabal
+         case-insensitive cmdargs conduit containers deepseq directory
+         filepath haskell-src-exts http-types old-locale parsec process
+         QuickCheck random resourcet safe shake tagsoup text time
+         transformers uniplate unix vector vector-algorithms wai warp
+       ];
+       testHaskellDepends = [ base directory filepath process temporary ];
+       doCheck = false;
+       homepage = "http://www.haskell.org/hoogle/";
+       description = "Haskell API Search";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hoogle-index" = callPackage
@@ -92018,26 +92410,27 @@ self: {
   "hops" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring
      , conduit, conduit-extra, containers, deepseq, directory, filepath
-     , http-conduit, http-types, optparse-applicative, parallel
-     , QuickCheck, text, transformers, vector
+     , http-conduit, http-types, optparse-applicative, parallel, process
+     , QuickCheck, resourcet, text, transformers, vector
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.1.0";
-       sha256 = "8524715071acfa0d7f1724b565e50ba5ccd11f395b3aec07b9c8cfae5c8115eb";
+       version = "0.1.3";
+       sha256 = "3a87efb934782a3769e7daf79ff5252bae58359701a8d1f829ce83a7436bcb13";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal attoparsec base bytestring conduit
          conduit-extra containers deepseq directory filepath http-conduit
-         http-types optparse-applicative parallel text transformers vector
+         http-types optparse-applicative parallel resourcet text
+         transformers vector
        ];
        testHaskellDepends = [
-         aeson attoparsec base bytestring containers deepseq QuickCheck text
-         vector
+         aeson attoparsec base bytestring containers deepseq process
+         QuickCheck text vector
        ];
        homepage = "http://github.com/akc/hops";
-       description = "Hackable Operations on Power Series";
+       description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -92573,8 +92966,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpc-coveralls";
-       version = "1.0.1";
-       sha256 = "9fad1644415319762d298bcacd2e4d6f17c4b19e53025f4ba583f7ebbec27b6a";
+       version = "1.0.2";
+       sha256 = "e2ee0a3ac6bf15d772eea39b49e57c17de4b8e1e2312e87adc915a545a513e12";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92700,8 +93093,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.4.2";
-       sha256 = "730e64ec84a848b31463ca2292ac3834f0ebe9c7f0fc269c85b5c577483dac4a";
+       version = "1.4.3";
+       sha256 = "7cacff688476d271f7ad9515d44a612f8c15e5e731e1eb9f9cb50e06cb5ae67f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94805,6 +95198,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;};
 
+  "hsignal_0_2_7_2" = callPackage
+    ({ mkDerivation, array, base, binary, blas, bytestring, gsl
+     , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl
+     , storable-complex, vector
+     }:
+     mkDerivation {
+       pname = "hsignal";
+       version = "0.2.7.2";
+       sha256 = "287c864a0e375f9ebbfa52d5c0be13e94441cdb4b2c56f8105bef60426192934";
+       libraryHaskellDepends = [
+         array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
+         hstatistics mtl storable-complex vector
+       ];
+       librarySystemDepends = [ blas lapack ];
+       libraryPkgconfigDepends = [ gsl ];
+       jailbreak = true;
+       homepage = "http://code.haskell.org/hsignal";
+       description = "Signal processing and EEG data analysis";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;};
+
   "hsilop" = callPackage
     ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir
      }:
@@ -96891,6 +97306,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hstatistics_0_2_5_3" = callPackage
+    ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
+     , vector
+     }:
+     mkDerivation {
+       pname = "hstatistics";
+       version = "0.2.5.3";
+       sha256 = "d8a8bf9dcf6bd25ac5ca695ec1c4fc198310411cc87ab2a23ffe1d9116812a2d";
+       libraryHaskellDepends = [
+         array base hmatrix hmatrix-gsl-stats random vector
+       ];
+       jailbreak = true;
+       homepage = "http://code.haskell.org/hstatistics";
+       description = "Statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hstats" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -97638,8 +98071,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.1.1.1";
-       sha256 = "32ac86c57275eb2716ec001f83376110faa51d8cd6f24c07d0c8f22537039e75";
+       version = "0.2";
+       sha256 = "25b9127e356d15b7edea37068629f87523854a12f0ce4ac65a03ae391a4a6659";
        libraryHaskellDepends = [ base bytestring text time ];
        testHaskellDepends = [
          base doctest Glob hspec HUnit QuickCheck text time
@@ -107100,8 +107533,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.0";
        sha256 = "c549fa4b199efcd885334538cfa15cc77226a1c9c9afa30f5867d75b79d2701c";
-       revision = "2";
-       editedCabalFile = "7c40fcd8bc0386dde997f9b635d1f0c8d8251f38ce7b83c161235861fdb06e04";
+       revision = "3";
+       editedCabalFile = "931eff6aa28ef1dd184dd7a30ced84233b07da7293597875cb4bb812bc7a4699";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -107151,18 +107584,19 @@ self: {
 
   "json-stream" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, hspec
-     , scientific, text, unordered-containers, vector
+     , QuickCheck, quickcheck-unicode, scientific, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.3.2.2";
-       sha256 = "4415147dec300d1121121308008a522de79949549c35b23c673d70717ad28029";
+       version = "0.3.2.3";
+       sha256 = "cfb4c599973ec953a74c02b71ee8caa5e1813d7a5cbabb3f0434bea70ed6fabb";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring directory hspec scientific text
-         unordered-containers vector
+         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
+         scientific text unordered-containers vector
        ];
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
@@ -110975,16 +111409,18 @@ self: {
      }) {};
 
   "language-qux" = callPackage
-    ({ mkDerivation, base, containers, either, indents, mtl, parsec
-     , pretty, transformers
+    ({ mkDerivation, base, containers, either, indents
+     , llvm-general-pure, mtl, parsec, pretty, transformers
      }:
      mkDerivation {
        pname = "language-qux";
-       version = "0.1.1.3";
-       sha256 = "22e3263cbd3895e78739c650e7731b92a9de7c6894a8fc3defcd09994997477b";
+       version = "0.2.0.0";
+       sha256 = "1214e38b1ce62f40f43982667d61ccb3f9419f9854008d0d34910f285801ca75";
        libraryHaskellDepends = [
-         base containers either indents mtl parsec pretty transformers
+         base containers either indents llvm-general-pure mtl parsec pretty
+         transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/qux-lang/language-qux";
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
@@ -115023,10 +115459,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.5.0.0";
-       sha256 = "8aaea53ae1cf073025a4bdc7d533ee86c7a81bc39ffee683292449cb67495de6";
-       revision = "1";
-       editedCabalFile = "b3a0b7de825fec171db965ef35e07db3e95b1a70ecdefbbcda434eb8a4d92898";
+       version = "3.5.1.0";
+       sha256 = "7c6a6634abeb541c1fea59b34743dfb37b71f92359b0d481e50f962486f99da4";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -116484,8 +116918,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.3.1";
-       sha256 = "aaf10585137fa65ddcddbe4c9d2241834b84b4564654b1620bbe7f4a9525e823";
+       version = "0.3.1.1";
+       sha256 = "7b4339e714601dcf1cd52e5d2bdcd22f949f3935de4f3bd2d574ebf9c021c1cb";
        libraryHaskellDepends = [
          base contravariant gl mtl resourcet semigroups transformers void
        ];
@@ -116500,8 +116934,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance-samples";
-       version = "0.2.0.2";
-       sha256 = "f6305a797c67a9ba8c38414808360881fdfb9be3c3dae69b03ee43a1596bc185";
+       version = "0.3";
+       sha256 = "fa4b87f4c49815f0d8335303c35e3f71b13de5c6dcc156d40b820bc8713bee89";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118612,6 +119046,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mathista" = callPackage
+    ({ mkDerivation, base, filepath, hspec, MissingH, parsec
+     , regex-compat, split
+     }:
+     mkDerivation {
+       pname = "mathista";
+       version = "0.0.1";
+       sha256 = "89640f10b337e67d15ab2fc018f921ad7b158c4093b639be6defbbd745e90a2d";
+       revision = "1";
+       editedCabalFile = "57641a3bf376ea93c56ab3bb1cf06c41eb1e0fcbec3751d2a3507fe4974e818f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base MissingH parsec regex-compat split
+       ];
+       executableHaskellDepends = [
+         base filepath MissingH parsec regex-compat split
+       ];
+       testHaskellDepends = [ base hspec parsec ];
+       homepage = "https://github.com/nuta/mathista";
+       description = "A small programming language for numerical computing";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "mathlink" = callPackage
     ({ mkDerivation, array, base, c2hs, containers, haskell98
      , ix-shapable, mtl
@@ -119425,14 +119883,14 @@ self: {
      }) {};
 
   "memscript" = callPackage
-    ({ mkDerivation, base, readline }:
+    ({ mkDerivation, base, haskeline, transformers }:
      mkDerivation {
        pname = "memscript";
-       version = "0.0.2.0";
-       sha256 = "4b56f120da87899fe7c284554ef1bb225f9356b5cae49f4657bd122cdb7e756d";
+       version = "0.1.0.0";
+       sha256 = "b9003c8b8ac493ecae2ec104800b825e5ce50a8a76b7786069ae70ed9ed591f5";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base readline ];
+       executableHaskellDepends = [ base haskeline transformers ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript";
        description = "Command line utility for memorizing scriptures or any other text";
        license = "GPL";
@@ -119720,6 +120178,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mezzolens" = callPackage
+    ({ mkDerivation, base, containers, mtl, transformers }:
+     mkDerivation {
+       pname = "mezzolens";
+       version = "0.0.0";
+       sha256 = "8252be7d73700b7401c87248e6eb5cb23873d0ce092f9b15583c4fd59b46df2b";
+       libraryHaskellDepends = [ base containers mtl transformers ];
+       description = "Pure Profunctor Functional Lenses";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "mfsolve" = callPackage
     ({ mkDerivation, base, hashable, mtl, tasty, tasty-hunit
      , unordered-containers
@@ -122737,7 +123206,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mongoDB" = callPackage
+  "mongoDB_2_0_7" = callPackage
     ({ mkDerivation, array, base, binary, bson, bytestring, containers
      , cryptohash, hashtables, hspec, lifted-base, monad-control, mtl
      , network, old-locale, parsec, random, random-shuffle, text, time
@@ -122756,6 +123225,28 @@ self: {
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mongoDB" = callPackage
+    ({ mkDerivation, array, base, binary, bson, bytestring, containers
+     , cryptohash, hashtables, hspec, lifted-base, monad-control, mtl
+     , network, old-locale, parsec, random, random-shuffle, text, time
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.0.8";
+       sha256 = "d515ad855fb008848c62bea117925ef6cf48f62c9dfe94c9efbca4a65a1ac5d9";
+       libraryHaskellDepends = [
+         array base binary bson bytestring containers cryptohash hashtables
+         lifted-base monad-control mtl network parsec random random-shuffle
+         text transformers-base
+       ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
+       homepage = "https://github.com/mongodb-haskell/mongodb";
+       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+       license = "unknown";
      }) {};
 
   "mongodb-queue" = callPackage
@@ -123915,14 +124406,15 @@ self: {
 
   "mtl-unleashed" = callPackage
     ({ mkDerivation, base, contravariant, hspec, hspec-core, lens, mtl
-     , profunctors, tagged, transformers
+     , profunctors, tagged, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "mtl-unleashed";
-       version = "0.5";
-       sha256 = "729534cc28fce5b2868431c95becece84b21cca1740df32be9d508e7a49cf9cb";
+       version = "0.6";
+       sha256 = "acbe3906f3928587893e9b28ca13d2100995ee6cf5f401e3e34b0dcfacb6bbbe";
        libraryHaskellDepends = [
          base contravariant lens mtl profunctors tagged transformers
+         transformers-compat
        ];
        testHaskellDepends = [
          base contravariant hspec hspec-core lens mtl profunctors
@@ -129325,8 +129817,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "observable-sharing";
-       version = "0.2.2.1";
-       sha256 = "a93236cd153fed0a8364c21780083e6f2e9e08a84ac3dfb938a3e56b19e37a80";
+       version = "0.2.3";
+       sha256 = "36438ff9a35a7d7ff0f73d5bc798e544584d1aa0efc07e7f0fb7a5513ed20432";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
@@ -132100,8 +132592,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.5.3";
-       sha256 = "4ced17f91f39d0aa51d8b9b295dff0cf031b2d5348cb7cd0cd0624b43376db65";
+       version = "0.1.5.4";
+       sha256 = "193e597b75174a388c01d67bcf773d304cd023276d7a4b3ec0cd78b14dcabec4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132153,8 +132645,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.1.2";
-       sha256 = "8b7f13d09198aa28da598b89d4ff6af17ea13087a0d0ba38b8c0602d8b24096f";
+       version = "0.2";
+       sha256 = "1d8c5ac645812b0357d7b51e0d636c720638b70847869ede6bb02a4b309ded97";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137637,6 +138129,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plot_0_2_3_5" = callPackage
+    ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango
+     , transformers
+     }:
+     mkDerivation {
+       pname = "plot";
+       version = "0.2.3.5";
+       sha256 = "db5d69d5249e562eaedaa0887075dc43142ddb20260ddc746b501b8b2ed58483";
+       libraryHaskellDepends = [
+         array base cairo colour hmatrix mtl pango transformers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/amcphail/plot";
+       description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "plot-gtk" = callPackage
     ({ mkDerivation, base, glib, gtk, hmatrix, mtl, plot, process }:
      mkDerivation {
@@ -137745,15 +138255,12 @@ self: {
      }:
      mkDerivation {
        pname = "plugins";
-       version = "1.5.4.0";
-       sha256 = "28ae5f83583d6e659255f54c236a908d59a5df5fabb612dd1d4aa5bf96b8d488";
-       revision = "1";
-       editedCabalFile = "ee5d78944a0a39be9368c6ccc31bbd6791b7a1c21c0c4c09f0daa9d51803a47e";
+       version = "1.5.5.0";
+       sha256 = "57012217c22dce398b3574f45af22404be38de96145e5862d1453c599816f6a2";
        libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/stepcut/plugins";
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
@@ -138514,8 +139021,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.4.4";
-       sha256 = "89ba2e31509ca1ecb45341d4937478fe8a72ef53bf0f395c3e3bb8da022e19d8";
+       version = "0.4.5";
+       sha256 = "b35bb79b206250039a6a941f17e784d7760fd4197d80821319461031d6449f6d";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -141796,8 +142303,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150927";
-       sha256 = "cc44e9781c208a57c511a4ac3fa1a144e010b5ff6566c8b0c7920af028d68a94";
+       version = "0.20151011";
+       sha256 = "7497e7242297ee90af9a817302977f6d25539785c352b6bf3088a55181fa5759";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -143394,8 +143901,8 @@ self: {
     ({ mkDerivation, base, mmorph, transformers }:
      mkDerivation {
        pname = "quiver";
-       version = "1.1.1";
-       sha256 = "2fc6dae78521b314e333bcc8f3f09901731a5bb249f10186a7974c18591fa895";
+       version = "1.1.2";
+       sha256 = "fc4e05e7514e42ef12dbc58a471825ffc3208d1b073a86940a0c7b8207a8dfa6";
        libraryHaskellDepends = [ base mmorph transformers ];
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
@@ -143499,16 +144006,20 @@ self: {
      }) {};
 
   "qux" = callPackage
-    ({ mkDerivation, base, language-qux, mtl, optparse-applicative }:
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , language-qux, llvm-general, mtl, optparse-applicative, pretty
+     }:
      mkDerivation {
        pname = "qux";
-       version = "0.1.0.0";
-       sha256 = "fb2de869de3645b69c0f4bada356e3d1fd2902cf7d09315f7797eee93dd6f1da";
+       version = "0.2.0.0";
+       sha256 = "9f3a033e164b906384b4dd8312306a75ab2afefb3aa5533fc512ab38e33f341f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base language-qux mtl optparse-applicative
+         base bytestring containers directory filepath language-qux
+         llvm-general mtl optparse-applicative pretty
        ];
+       jailbreak = true;
        homepage = "https://github.com/qux-lang/qux";
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
@@ -147907,6 +148418,8 @@ self: {
        pname = "rest-client";
        version = "0.5.0.3";
        sha256 = "6bcef592f14ca6cd69f930f747ae27eccb62a8e7224e867800030044ac6c8f0a";
+       revision = "1";
+       editedCabalFile = "35626ed815619ff388861f871c987480d2856655f76f961333eff29406b8d526";
        libraryHaskellDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exceptions http-conduit http-types hxt hxt-pickle-utils
@@ -148004,7 +148517,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-core" = callPackage
+  "rest-core_0_36_0_6" = callPackage
     ({ mkDerivation, aeson, aeson-utils, base, bytestring
      , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
      , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
@@ -148031,6 +148544,34 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-core" = callPackage
+    ({ mkDerivation, aeson, aeson-utils, base, bytestring
+     , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
+     , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
+     , rest-types, safe, split, test-framework, test-framework-hunit
+     , text, transformers, transformers-compat, unordered-containers
+     , uri-encode, utf8-string, uuid
+     }:
+     mkDerivation {
+       pname = "rest-core";
+       version = "0.37";
+       sha256 = "6a7e13b5e1ae6aadf53cc0dcbeca99a01b68737833962b2abdd50f4e6e9d066c";
+       libraryHaskellDepends = [
+         aeson aeson-utils base bytestring case-insensitive errors fclabels
+         hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
+         rest-stringmap rest-types safe split text transformers
+         transformers-compat unordered-containers uri-encode utf8-string
+         uuid
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit mtl test-framework test-framework-hunit
+         transformers transformers-compat unordered-containers
+       ];
+       description = "Rest API library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rest-example" = callPackage
@@ -148043,8 +148584,8 @@ self: {
        pname = "rest-example";
        version = "0.2.0.2";
        sha256 = "f1d66ed2a8d6f700cb60b5d046afe20010ac909cd3004d55cca75c2ee13fb88e";
-       revision = "1";
-       editedCabalFile = "b0f11f80fe7f78fb76fc0ccb243eb54fe7177a6eef051abbcb2409f8fc79aab2";
+       revision = "2";
+       editedCabalFile = "740218a910858726cbd723e9c54b7d3f2632d6ad057fb71edbf04cc54a021a68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148253,6 +148794,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148280,6 +148822,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148307,6 +148850,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148336,6 +148880,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148365,6 +148910,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148392,6 +148938,7 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148407,10 +148954,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.18.0.0";
-       sha256 = "bca52143478e12a5fc91630c0df7f2206f8f60639d3a6cc568e4772696e92787";
-       revision = "1";
-       editedCabalFile = "8199543b3839b7b8e3fa7c6e768a2e6a9bc80ba520ec89db41865435be5cb666";
+       version = "0.19.0.0";
+       sha256 = "dc8b6e65acedd598a6592c5b0e92ef0f722b87c01af5c64b6caa30da4318840b";
        libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -148480,7 +149025,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-happstack" = callPackage
+  "rest-happstack_0_2_10_8" = callPackage
     ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
      , rest-gen, utf8-string
      }:
@@ -148493,8 +149038,41 @@ self: {
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
+       jailbreak = true;
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-happstack" = callPackage
+    ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
+     , rest-gen, utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-happstack";
+       version = "0.3";
+       sha256 = "494b9ae9e126e03e45d0fd61cbd77c4160ad3493448fcfbfcb1e2d0d8e9bc766";
+       libraryHaskellDepends = [
+         base containers happstack-server mtl rest-core rest-gen utf8-string
+       ];
+       description = "Rest driver for Happstack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rest-happstack_0_3_1" = callPackage
+    ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
+     , rest-gen, utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-happstack";
+       version = "0.3.1";
+       sha256 = "a2c2e1b1e1bfdc7870100eee642e488268e21117b08aad254342d14a53ce13d9";
+       libraryHaskellDepends = [
+         base containers happstack-server mtl rest-core rest-gen utf8-string
+       ];
+       description = "Rest driver for Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-snap_0_1_17_14" = callPackage
@@ -148533,7 +149111,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-snap" = callPackage
+  "rest-snap_0_1_17_18" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, rest-core
      , safe, snap-core, unordered-containers, uri-encode, utf8-string
      }:
@@ -148545,6 +149123,24 @@ self: {
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
        ];
+       jailbreak = true;
+       description = "Rest driver for Snap";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-snap" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, rest-core
+     , safe, snap-core, unordered-containers, uri-encode, utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-snap";
+       version = "0.2";
+       sha256 = "38947f552b90b08cf21567dd8931891f1c328546e5e5dda7e083fb2f3711eefc";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive rest-core safe snap-core
+         unordered-containers uri-encode utf8-string
+       ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148669,6 +149265,8 @@ self: {
        pname = "rest-types";
        version = "1.14.0.1";
        sha256 = "645516a501f3f6d928c04b6022b111bd5411f301572f4de6b96ef7b15e480b32";
+       revision = "1";
+       editedCabalFile = "d3f5642df902f6d3a393839b8e365481fb1b16f4ed945290f85e2c9cda253794";
        libraryHaskellDepends = [
          aeson base case-insensitive generic-aeson generic-xmlpickler hxt
          json-schema rest-stringmap text uuid
@@ -148717,7 +149315,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-wai" = callPackage
+  "rest-wai_0_1_0_8" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-types, mime-types, mtl, rest-core, text
      , unordered-containers, wai
@@ -148730,6 +149328,25 @@ self: {
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
        ];
+       jailbreak = true;
+       description = "Rest driver for WAI applications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-wai" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-types, mime-types, mtl, rest-core, text
+     , unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "rest-wai";
+       version = "0.2";
+       sha256 = "92d7455c537d24c6d2ccadd9272cac385659ed2a828fbe20bca9249016897413";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-types mime-types
+         mtl rest-core text unordered-containers wai
+       ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150348,8 +150965,8 @@ self: {
      }:
      mkDerivation {
        pname = "ruby-marshal";
-       version = "0.1.0";
-       sha256 = "f25c7f3f656b17348b90067176253d0a284d7019f1cdded214483b7ef47cb4b6";
+       version = "0.1.1";
+       sha256 = "d61ceb301b82e439b064eb4b1b84b1bb21c4ac9dc0239a0dc8d361cfe1b1800e";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl string-conv vector
        ];
@@ -151412,15 +152029,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_5_0" = callPackage
+  "sbv_5_2" = callPackage
     ({ mkDerivation, array, async, base, containers, crackNum
      , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl
      , old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.0";
-       sha256 = "eeb19fb888234565c9e5cfda6c760ed4c4650e33ba52400684f9c1ae6c55497f";
+       version = "5.2";
+       sha256 = "a32248c6d0c54fba629a90feb73b15c069ca257bf1017b4f34eeb50b4ac7d2db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151998,6 +152615,8 @@ self: {
        pname = "scientific";
        version = "0.3.4.0";
        sha256 = "fd681501f742f55fb092c967a42f537c8059db40f8b4a8870b07fe499944e97d";
+       revision = "1";
+       editedCabalFile = "04d40b9bb52883491e0c46f9f6d2942ec96a2de8a3dadb072cf0260f33cee208";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp text vector
@@ -152020,8 +152639,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.4.1";
-       sha256 = "f330ee1d819ad82efb42028c806b2bb3d13aaf6a60267a36764d4bb678a085f8";
+       version = "0.3.4.2";
+       sha256 = "f6d937039ee867d2ea4a5a4fc879c9e027e162da909b0c9957ff31a0f66c3556";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp text vector
@@ -176190,6 +176809,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "type-combinators" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "type-combinators";
+       version = "0.1.0.1";
+       sha256 = "33e2ae3af0db672119821b4084728a8a120dc2bbf98d102c228f32bbbdbf233e";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/kylcarte/type-combinators";
+       description = "A collection of data types for type-level programming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "type-digits" = callPackage
     ({ mkDerivation, base, template-haskell, type-spine }:
      mkDerivation {
@@ -178180,6 +178811,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unordered-graphs" = callPackage
+    ({ mkDerivation, base, deepseq, dlist, hashable
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "unordered-graphs";
+       version = "0.1.0";
+       sha256 = "9c14ac49ccc570dc93aadd45f89c82c92f6872a3077effc16825be81a2e7a9c7";
+       libraryHaskellDepends = [
+         base deepseq dlist hashable unordered-containers
+       ];
+       description = "Graph library using unordered-containers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "unpack-funcs" = callPackage
     ({ mkDerivation, base, bytestring, primitive, template-haskell
      , transformers, vector
@@ -180042,17 +180688,17 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, time, transformers }:
      mkDerivation {
        pname = "varying";
-       version = "0.1.4.0";
-       sha256 = "056ebec89095f08ebb05fc55bcdbb1e5850dedaa2e281dd9b7c683649974c914";
+       version = "0.1.5.0";
+       sha256 = "458e51ea43a096848e80df6d2ec79756bfefc7a3c10f84a69793fd5c3e81013b";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base time ];
-       executableHaskellDepends = [ base time ];
+       libraryHaskellDepends = [ base time transformers ];
+       executableHaskellDepends = [ base time transformers ];
        homepage = "https://github.com/schell/varying";
-       description = "Automaton based varying values, event streams and tweening";
+       description = "FRP through varying values and monadic splines";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -182422,10 +183068,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.11";
-       sha256 = "adbf2dc7130881c687052869582407ef462df2bcc2b6bf54bcb63f465767018d";
-       revision = "1";
-       editedCabalFile = "f53692f3fee83cd8393f400b4d9e02f6c4e97daba2830ad7c7633766e8c5bde7";
+       version = "3.0.11.1";
+       sha256 = "086fb0ea800085e8f49bdda4de2ed8b23f4d14bb078a3332b7bb85ee71d122cf";
        libraryHaskellDepends = [
          aeson ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -184864,6 +185508,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wavefront" = callPackage
+    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "wavefront";
+       version = "0.1.0.2";
+       sha256 = "f97a815a374303c9a2ff4a616b80f5202550f062c1cd7641bdaaf8af487f2386";
+       libraryHaskellDepends = [
+         attoparsec base dlist filepath mtl text transformers
+       ];
+       homepage = "https://github.com/phaazon/wavefront";
+       description = "Wavefront OBJ loader";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wavesurfer" = callPackage
     ({ mkDerivation, base, binary, bytestring, bytestring-lexing
      , bytestring-show, delimited-text
@@ -186852,8 +187512,8 @@ self: {
      }:
      mkDerivation {
        pname = "workflow-osx";
-       version = "0.0.0";
-       sha256 = "c07e5131a30fa25d2105ac35091fa2f6e6442da924d0e90038c73c5fc3e7f2dc";
+       version = "0.0.1";
+       sha256 = "1bb9b7e9df0d99893301f452f35f6f181009617a481d9f25cb14d5bc592bbdd2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187214,10 +187874,10 @@ self: {
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
        pname = "wx";
-       version = "0.92.0.0";
-       sha256 = "7a649a4445aaf4681e1c2c9e0b664bce656cc4700a527af8596920019d3295e4";
+       version = "0.92.1.0";
+       sha256 = "282f18d34c69cb0139ffd0728bfa97e52dfe4f325e7829ca0c76112b3e2bd408";
        libraryHaskellDepends = [ base stm time wxcore ];
-       homepage = "http://haskell.org/haskellwiki/WxHaskell";
+       homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
      }) {};
@@ -187255,16 +187915,16 @@ self: {
      }) {};
 
   "wxc" = callPackage
-    ({ mkDerivation, base, libX11, mesa, wxdirect, wxGTK }:
+    ({ mkDerivation, base, libX11, mesa, split, wxdirect, wxGTK }:
      mkDerivation {
        pname = "wxc";
-       version = "0.92.1.0";
-       sha256 = "2a914d8940664998cd0f88de79d3f3f111a06eee90e263066990c6379c8970cf";
-       libraryHaskellDepends = [ base wxdirect ];
+       version = "0.92.1.1";
+       sha256 = "e458be811c10a0ba56deb567c56c3b71579b8c923188236c1de8ccf844c1a602";
+       libraryHaskellDepends = [ base split wxdirect ];
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
        doHaddock = false;
-       postInstall = "cp -v dist/build/libwxc.so.0.92.1.0 $out/lib/libwxc.so";
+       postInstall = "cp -v dist/build/libwxc.so.0.92.1.1 $out/lib/libwxc.so";
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
@@ -187441,6 +188101,8 @@ self: {
        pname = "x509";
        version = "1.5.0.1";
        sha256 = "6a0d7adf3dd6cb5b29b2cecbc82d84cdb71e4042315761e10b1403075220f20d";
+       revision = "1";
+       editedCabalFile = "261a16dba40aebf24b31b014abd300f3d86cb9298ff86c998ae1ec7e7783157d";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          crypto-pubkey-types cryptohash directory filepath hourglass mtl pem
@@ -187450,6 +188112,7 @@ self: {
          asn1-types base bytestring crypto-pubkey-types hourglass mtl tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
@@ -187466,6 +188129,8 @@ self: {
        pname = "x509";
        version = "1.5.1";
        sha256 = "566c23f526c20be1386c492a3923eec31f251b725e816e6cebf8074ae31aafd7";
+       revision = "1";
+       editedCabalFile = "f4a09a968921e5ff0f6a87b66c97e21f3455d7bc73a5f8675f306785adf595a1";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          crypto-pubkey-types cryptohash directory filepath hourglass mtl pem
@@ -187475,6 +188140,7 @@ self: {
          asn1-types base bytestring crypto-pubkey-types hourglass mtl tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
@@ -187490,6 +188156,8 @@ self: {
        pname = "x509";
        version = "1.6.0";
        sha256 = "939eec164a1dd764d610920d8896c7715c86f9b437c2d44b27119b3fb197c23b";
+       revision = "1";
+       editedCabalFile = "b849e31b4baa4186008a5dc5544b5acad634f9aee8d3ccbdcae6a217b061a676";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite directory filepath hourglass memory mtl pem process
@@ -187498,6 +188166,7 @@ self: {
          asn1-types base bytestring cryptonite hourglass mtl tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
@@ -187513,6 +188182,8 @@ self: {
        pname = "x509";
        version = "1.6.1";
        sha256 = "cc95fc10135998a5a4bf59566a4e0c7ed6c40f0ff175dfb3023b8ec941df2450";
+       revision = "1";
+       editedCabalFile = "44f30cc360b249fab75aa4f7b6dc940fae9a85571890ad7dc3fea2fa3eb0e1e7";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite hourglass memory mtl pem
@@ -187521,6 +188192,7 @@ self: {
          asn1-types base bytestring cryptonite hourglass mtl tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
@@ -191464,6 +192136,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth-ldap-native" = callPackage
+    ({ mkDerivation, aeson, base, either, ldap-client, semigroups, text
+     , transformers, yesod-auth, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-ldap-native";
+       version = "0.1.0.0";
+       sha256 = "49cd23ae22d5acc2c7a2d6bca074e7bca28197d057ccd4d9da08f5af0923db28";
+       libraryHaskellDepends = [
+         aeson base either ldap-client semigroups text transformers
+         yesod-auth yesod-core yesod-form
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
+       description = "Yesod LDAP authentication plugin";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-auth-oauth_1_4_0_1" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
      , text, transformers, yesod-auth, yesod-core, yesod-form
@@ -193330,7 +194020,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core" = callPackage
+  "yesod-core_1_4_15" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -193367,6 +194057,46 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-core" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , data-default, deepseq, directory, exceptions, fast-logger, hspec
+     , hspec-expectations, http-types, HUnit, lifted-base, monad-control
+     , monad-logger, mtl, mwc-random, network, old-locale, parsec
+     , path-pieces, primitive, QuickCheck, random, resourcet, safe
+     , semigroups, shakespeare, streaming-commons, template-haskell
+     , text, time, transformers, transformers-base, unix-compat
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.15.1";
+       sha256 = "a414a0eb14b4b88ad4d6ec22db9837b4ead9c7958cf236476dce963555a75e29";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq directory
+         exceptions fast-logger http-types lifted-base monad-control
+         monad-logger mtl mwc-random old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers transformers-base unix-compat
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-crud" = callPackage
@@ -196011,6 +196741,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zim-parser" = callPackage
+    ({ mkDerivation, array, base, binary, binary-conduit, bytestring
+     , conduit, conduit-extra, hspec, lzma-conduit, resourcet
+     }:
+     mkDerivation {
+       pname = "zim-parser";
+       version = "0.1.0.0";
+       sha256 = "2d0d49978feb7eb2ed52715ff22ad5687e2d0a6aefc55690793c2bd6c58a344f";
+       libraryHaskellDepends = [
+         array base binary binary-conduit bytestring conduit conduit-extra
+         lzma-conduit resourcet
+       ];
+       testHaskellDepends = [
+         array base binary binary-conduit bytestring conduit conduit-extra
+         hspec lzma-conduit resourcet
+       ];
+       homepage = "https://github.com/robbinch/zim-parser#readme";
+       description = "Read and parse ZIM files";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "zip-archive_0_2_3_5" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty