hackage-packages.nix: re-generate from Hackage state https://github.com/commercialhaskell/all-cabal-files/commit/ea1b618ac7e2e00985b6ce2b5fa827cbd5cd61f3

2 files changed, 424 insertions, 239 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c6e25b10e2aa..f8c117ab314c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -800,6 +800,6 @@ self: super: {
   };
 
   # Test suite won't compile against tasty 0.10.x.
-  zlib_0_6_0_0 = dontCheck super.zlib_0_6_0_0;
+  zlib_0_6_1_0 = dontCheck super.zlib_0_6_1_0;
 
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6f4f4a8ef4bf..e13845d19a93 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3521,12 +3521,12 @@ self: {
     ({ mkDerivation, base, containers, MonadRandom }:
      mkDerivation {
        pname = "Dist";
-       version = "0.1.0.0";
-       sha256 = "1w9jwgnbf0n0w3a80aca59ppkxf4ij7jwhsj0xdn3jcik3zkf6iv";
+       version = "0.2.0.0";
+       sha256 = "0w9n123rngl85qsgwm0dgqnc0v8zn9lsi2v0n4hfxdvxlhcjr3ir";
        buildDepends = [ base containers MonadRandom ];
        testDepends = [ base containers MonadRandom ];
        jailbreak = true;
-       homepage = "https://github.com/wyager/Distribution";
+       homepage = "https://github.com/wyager/Dist";
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -7654,8 +7654,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaskellNet-SSL";
-       version = "0.2.5.2";
-       sha256 = "0jhm43zd6jvhbahk4ki29ydg02qnjj4mw823rckqxk6f91q00qlp";
+       version = "0.3.0.0";
+       sha256 = "1n1jlnxp16dmfkw4yh1bsbylsk5c1kyixh3gi81202fjx3q9z2pf";
        buildDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
@@ -12949,17 +12949,17 @@ self: {
 
   "SVGFonts" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
-     , containers, data-default-class, diagrams-lib, directory, parsec
-     , split, text, tuple, vector, vector-space, xml
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , directory, parsec, split, text, tuple, vector, xml
      }:
      mkDerivation {
        pname = "SVGFonts";
-       version = "1.4.0.3";
-       sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin";
+       version = "1.5.0.0";
+       sha256 = "0w1675cwd8gx65vh421abnl4z6jw7jaz3a43g04x0a5kgf1sfl76";
        buildDepends = [
          attoparsec base blaze-markup blaze-svg containers
-         data-default-class diagrams-lib directory parsec split text tuple
-         vector vector-space xml
+         data-default-class diagrams-core diagrams-lib directory parsec
+         split text tuple vector xml
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
@@ -16582,19 +16582,20 @@ self: {
      }) {};
 
   "active" = callPackage
-    ({ mkDerivation, array, base, newtype, QuickCheck, semigroupoids
-     , semigroups, vector-space
+    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
+     , semigroups, vector
      }:
      mkDerivation {
        pname = "active";
-       version = "0.1.0.19";
-       sha256 = "1zzzrjpfwxzf0zbz8vcnpfqi7djvrfxglhkvw1s6yj5gcblg2rcw";
+       version = "0.2.0.0";
+       sha256 = "1qz6xncpgbkv77cwixa6dgkwwdqwvaa9c778zrgf4i8zi0zhp701";
        buildDepends = [
-         array base newtype semigroupoids semigroups vector-space
+         base lens linear semigroupoids semigroups vector
        ];
        testDepends = [
-         array base newtype QuickCheck semigroupoids semigroups vector-space
+         base lens linear QuickCheck semigroupoids semigroups vector
        ];
+       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25888,14 +25889,13 @@ self: {
      }:
      mkDerivation {
        pname = "boomange";
-       version = "0.1.2.1";
-       sha256 = "1yjmnbldla5iha6vzslnd1sdaaknsgk4afrj5yjrib3w2v1rp2vx";
+       version = "0.1.3.1";
+       sha256 = "1sg1ldrglhca62xiak33k5023zrpmgg3aa8xpwn8l1323kwlkqm0";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base containers descrilo directory filepath simtreelo
        ];
-       jailbreak = true;
        description = "A Bookmarks manager with a HTML generator";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -36520,27 +36520,38 @@ self: {
      }) {};
 
   "darcs" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, curl
-     , directory, extensible-exceptions, filepath, hashed-storage
-     , haskeline, html, HTTP, mmap, mtl, network, network-uri, old-time
-     , parsec, process, random, regex-compat, tar, terminfo, text, unix
-     , utf8-string, vector, zlib
+    ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
+     , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
+     , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline
+     , html, HUnit, mmap, mtl, old-time, parsec, process, QuickCheck
+     , random, regex-applicative, regex-compat-tdfa, shelly, split, tar
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers, transformers-compat, unix, unix-compat
+     , utf8-string, vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.8.5";
-       sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6";
+       version = "2.10.0";
+       sha256 = "0dkby6bqv8dnv6zbvhz9yrablqkzi2szfsmrhmjk1934gczxpcsj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base bytestring containers directory extensible-exceptions
-         filepath hashed-storage haskeline html HTTP mmap mtl network
-         network-uri old-time parsec process random regex-compat tar
-         terminfo text unix utf8-string vector zlib
+         array attoparsec base base16-bytestring binary bytestring
+         containers cryptohash data-ordlist dataenc directory filepath
+         hashable haskeline html mmap mtl old-time parsec process random
+         regex-applicative regex-compat-tdfa tar text time transformers
+         transformers-compat unix unix-compat utf8-string vector zip-archive
+         zlib
+       ];
+       testDepends = [
+         array base binary bytestring cmdargs containers cryptohash dataenc
+         directory filepath FindBin ghc html HUnit mmap mtl parsec process
+         QuickCheck regex-compat-tdfa shelly split test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix-compat
+         zip-archive zlib
        ];
        extraLibraries = [ curl ];
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
-       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -36830,8 +36841,8 @@ self: {
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.0.0.3";
-       sha256 = "1z1nqfsfkkwcg4k7jhwyiwy7m1qwcmk9q0aqjqspikv8jg3zrqnz";
+       version = "1.0.0.4";
+       sha256 = "12nggfrc10i4kmjjqgiqjw9lz2mapqxxvs9d6cba43x43pb8z893";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -39498,8 +39509,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams";
-       version = "1.2";
-       sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg";
+       version = "1.3";
+       sha256 = "1f5cpa2qjpzq9m8d3066iixbq414zk0pv1vajghb214a1w9sqaf9";
        buildDepends = [
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg
        ];
@@ -39509,24 +39520,25 @@ self: {
      }) {};
 
   "diagrams-builder" = callPackage
-    ({ mkDerivation, base, blaze-svg, bytestring, cmdargs
-     , diagrams-cairo, diagrams-lib, diagrams-postscript, diagrams-svg
-     , directory, exceptions, filepath, hashable, haskell-src-exts, hint
-     , lens, mtl, split, transformers
+    ({ mkDerivation, base, bytestring, cmdargs, diagrams-cairo
+     , diagrams-lib, diagrams-postscript, diagrams-rasterific
+     , diagrams-svg, directory, exceptions, filepath, hashable
+     , haskell-src-exts, hint, JuicyPixels, lens, lucid-svg, mtl, split
+     , transformers
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.6.0.4";
-       sha256 = "11zpl1zk1cn71as8n86mg4c1whr59h9qaddkq7pfw7ni5whx0k3n";
+       version = "0.7.0.0";
+       sha256 = "0a9kg8fl1d3yr2h6dnxm0qy6fai912fv3arhr9inqigrlhff359i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base blaze-svg bytestring cmdargs diagrams-cairo diagrams-lib
-         diagrams-postscript diagrams-svg directory exceptions filepath
-         hashable haskell-src-exts hint lens mtl split transformers
+         base bytestring cmdargs diagrams-cairo diagrams-lib
+         diagrams-postscript diagrams-rasterific diagrams-svg directory
+         exceptions filepath hashable haskell-src-exts hint JuicyPixels lens
+         lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -39535,22 +39547,20 @@ self: {
 
   "diagrams-cairo" = callPackage
     ({ mkDerivation, base, bytestring, cairo, colour, containers
-     , data-default-class, diagrams-core, diagrams-lib, directory
-     , filepath, hashable, JuicyPixels, lens, mtl, old-time
-     , optparse-applicative, pango, process, split, statestack, time
-     , transformers, unix, vector
+     , data-default-class, diagrams-core, diagrams-lib, filepath
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
+     , split, statestack, transformers, unix, vector
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.2.0.7";
-       sha256 = "0z87qrp2z4j2x5zwwczrjw7kps7izcyb045665319kp9yp0dbzjk";
+       version = "1.3";
+       sha256 = "0blhndk4anifh34k9zgh86fyihfywckpnacpclbb92g75r93fmga";
        buildDepends = [
          base bytestring cairo colour containers data-default-class
-         diagrams-core diagrams-lib directory filepath hashable JuicyPixels
-         lens mtl old-time optparse-applicative pango process split
-         statestack time transformers unix vector
+         diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
+         optparse-applicative pango split statestack transformers unix
+         vector
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -39560,65 +39570,61 @@ self: {
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
      , NumInstances, optparse-applicative, statestack, text
-     , vector-space
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "0.3.0.4";
-       sha256 = "1jc47y739rg51czny0z17pspskim4ss2jraw6h5gyhnr8f50rv5w";
+       version = "1.3";
+       sha256 = "1zqq77ka3p7y9szqvlazwwaamz1b7lg2l8dp2wz5wycignchl26b";
        buildDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
-         optparse-applicative statestack text vector-space
+         optparse-applicative statestack text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, arithmoi, base, circle-packing, colour, containers
+    ({ mkDerivation, base, circle-packing, colour, containers
      , data-default, data-default-class, diagrams-core, diagrams-lib
-     , force-layout, HUnit, lens, MonadRandom, mtl, parsec, QuickCheck
-     , semigroups, split, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, vector-space
-     , vector-space-points
+     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
+     , mtl, parsec, QuickCheck, random, semigroups, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.1.2.6";
-       sha256 = "0bkil4klkdx30q6hwdcag20fbgx04vcn9kl7196mccl7yhh1msi0";
+       version = "1.3.0";
+       sha256 = "0q4369kdm04nl5rkdpbz23ckknsipmyysp5zmxp5ibmgh3mi8sq7";
        buildDepends = [
-         arithmoi base circle-packing colour containers data-default
-         data-default-class diagrams-core diagrams-lib force-layout lens
-         MonadRandom mtl parsec semigroups split text vector-space
-         vector-space-points
+         base circle-packing colour containers data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout lens linear MonadRandom mtl parsec random semigroups
+         split text
        ];
        testDepends = [
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-core" = callPackage
-    ({ mkDerivation, base, containers, dual-tree, lens, MemoTrie
-     , monoid-extras, newtype, semigroups, vector-space
-     , vector-space-points
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.2.0.6";
-       sha256 = "1i8h7arzhq2qzkv9hjldz3vymcns7y1w3wn56w57k2sbx3vx0zls";
+       version = "1.3";
+       sha256 = "1abf2pxs659bqhl6d803ny11gacfa1wy5c1g47k0h8q9nq6jg3q9";
        buildDepends = [
-         base containers dual-tree lens MemoTrie monoid-extras newtype
-         semigroups vector-space vector-space-points
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -39628,39 +39634,38 @@ self: {
     ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
      mkDerivation {
        pname = "diagrams-gtk";
-       version = "1.0.1.3";
-       sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
+       version = "1.3";
+       sha256 = "0kf340d63jzb0clw9kv2i8wdhprv5cialcfqbaxyhdvf0qswp8ms";
        buildDepends = [ base cairo diagrams-cairo diagrams-lib gtk ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-haddock" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base64-bytestring, blaze-svg
-     , bytestring, Cabal, cautious-file, cmdargs, containers, cpphs
+    ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring
+     , Cabal, cautious-file, cmdargs, containers, cpphs
      , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath
-     , haskell-src-exts, lens, mtl, parsec, QuickCheck, split, strict
-     , tasty, tasty-quickcheck, text, uniplate, vector-space
+     , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec
+     , QuickCheck, split, strict, tasty, tasty-quickcheck, text
+     , uniplate
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.2.2.14";
-       sha256 = "0j2flbirqxvgvyv8s3d8cwiqz9w3p864g2wg5hsya8r30jmlyycl";
+       version = "0.3";
+       sha256 = "0nb34y6bhlkxksc62z2cixhd4ghig4b5f8shcx3g5kcc75a6z178";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ansi-terminal base base64-bytestring blaze-svg bytestring Cabal
-         cautious-file cmdargs containers cpphs diagrams-builder
-         diagrams-lib diagrams-svg directory filepath haskell-src-exts lens
-         mtl parsec split strict text uniplate vector-space
+         ansi-terminal base base64-bytestring bytestring Cabal cautious-file
+         cmdargs containers cpphs diagrams-builder diagrams-lib diagrams-svg
+         directory filepath haskell-src-exts lens linear lucid-svg mtl
+         parsec split strict text uniplate
        ];
        testDepends = [
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -39687,24 +39692,46 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-html5" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, data-default-class
+     , diagrams-core, diagrams-lib, lens, mtl, NumInstances
+     , optparse-applicative, split, statestack, static-canvas, text
+     }:
+     mkDerivation {
+       pname = "diagrams-html5";
+       version = "1.3";
+       sha256 = "1g9a7wg7rdzqz0bl476gq7hbmsn369jdi67k9ikbjw7z9w060l5f";
+       buildDepends = [
+         base cmdargs containers data-default-class diagrams-core
+         diagrams-lib lens mtl NumInstances optparse-applicative split
+         statestack static-canvas text
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "HTML5 canvas backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-lib" = callPackage
-    ({ mkDerivation, active, array, base, colour, containers
-     , data-default-class, diagrams-core, dual-tree, filepath
-     , fingertree, hashable, intervals, JuicyPixels, lens, MemoTrie
-     , monoid-extras, optparse-applicative, semigroups, tagged
-     , vector-space, vector-space-points
+    ({ mkDerivation, active, adjunctions, array, base, colour
+     , containers, data-default-class, diagrams-core, diagrams-solve
+     , directory, distributive, dual-tree, exceptions, filepath
+     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
+     , linear, monoid-extras, mtl, optparse-applicative, process
+     , semigroups, system-filepath, tagged, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.2.0.9";
-       sha256 = "1naamjx7i9k3jwbvrz5jwhsfmri3jgjxqwalckyc473pclf6y4k9";
+       version = "1.3";
+       sha256 = "0ap92ya3m74dq4x9zv1jx7cbb0cpzssgy8r7xqmzyq54grdxv01r";
        buildDepends = [
-         active array base colour containers data-default-class
-         diagrams-core dual-tree filepath fingertree hashable intervals
-         JuicyPixels lens MemoTrie monoid-extras optparse-applicative
-         semigroups tagged vector-space vector-space-points
+         active adjunctions array base colour containers data-default-class
+         diagrams-core diagrams-solve directory distributive dual-tree
+         exceptions filepath fingertree fsnotify hashable intervals
+         JuicyPixels lens linear monoid-extras mtl optparse-applicative
+         process semigroups system-filepath tagged text transformers
+         unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -39730,21 +39757,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-pgf" = callPackage
+    ({ mkDerivation, base, bytestring, colour, containers
+     , diagrams-core, diagrams-lib, directory, filepath, hashable
+     , JuicyPixels, mtl, optparse-applicative, process, split, texrunner
+     , time, vector, zlib
+     }:
+     mkDerivation {
+       pname = "diagrams-pgf";
+       version = "0.1.0.0";
+       sha256 = "0fj520g7afhzfjr72bka7p9bhfikwfqz0kzbpg67f9nfb3a01adz";
+       buildDepends = [
+         base bytestring colour containers diagrams-core diagrams-lib
+         directory filepath hashable JuicyPixels mtl optparse-applicative
+         process split texrunner time vector zlib
+       ];
+       homepage = "http://github.com/cchalmers/diagrams-pgf";
+       description = "PGF backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-postscript" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
-     , monoid-extras, mtl, semigroups, split, vector-space
+     , monoid-extras, mtl, semigroups, split, statestack
      }:
      mkDerivation {
        pname = "diagrams-postscript";
-       version = "1.1.0.5";
-       sha256 = "1nriv964zmzlcyqxb3drfbxsimg786n4bsyyy1020rchf3df8rp5";
+       version = "1.3.0.0";
+       sha256 = "1dbnmlwm6blkh8x5rvsvlm6is84bvy9aymayf5k7nhvz9qb82n8v";
        buildDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
-         vector-space
+         statestack
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -39766,21 +39812,19 @@ self: {
 
   "diagrams-rasterific" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
-     , diagrams-core, diagrams-lib, directory, filepath, FontyFruity
-     , JuicyPixels, lens, mtl, old-time, optparse-applicative, process
-     , Rasterific, split, statestack, time, unix
+     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
+     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
+     , statestack, unix
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "0.1.0.8";
-       sha256 = "08a80w466hz89xp82n5yqqisd2vkd1876z4hw2p99bg22qr8b87k";
+       version = "1.3.0.0";
+       sha256 = "1hr5hddf6jv5cr4s8rxlmwn4krxgyz84jfmg1xsdrjrv0cmbifhw";
        buildDepends = [
          base bytestring containers data-default-class diagrams-core
-         diagrams-lib directory filepath FontyFruity JuicyPixels lens mtl
-         old-time optparse-applicative process Rasterific split statestack
-         time unix
+         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
+         optparse-applicative Rasterific split statestack unix
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -39793,28 +39837,40 @@ self: {
        version = "0.1.0.0";
        sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv";
        buildDepends = [ base data-default-class diagrams-lib lens ];
+       jailbreak = true;
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "diagrams-solve" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "diagrams-solve";
+       version = "0.1";
+       sha256 = "0jqc0mlswrp7iz7wg02fp9ggi04rb97bzlssvpv26z6i6ig3b5sf";
+       buildDepends = [ base ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Pure Haskell solver routines used by diagrams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-svg" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg
-     , bytestring, colour, containers, diagrams-core, diagrams-lib
-     , directory, filepath, hashable, JuicyPixels, lens, monoid-extras
-     , mtl, old-time, process, split, time, unix, vector-space
+    ({ mkDerivation, base, base64-bytestring, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
+     , old-time, optparse-applicative, process, split, text, time
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.1.0.5";
-       sha256 = "0n4ljdym9cbq4n7ynx5caxlr26ai5ifzv9x0yvqydhczmm0n35xf";
+       version = "1.3";
+       sha256 = "1jwya3cksx2js10x37fdnjvhjgkzp5pxnlfd9wnd4g8r90y77jf6";
        buildDepends = [
-         base base64-bytestring blaze-markup blaze-svg bytestring colour
-         containers diagrams-core diagrams-lib directory filepath hashable
-         JuicyPixels lens monoid-extras mtl old-time process split time unix
-         vector-space
+         base base64-bytestring bytestring colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
+         monoid-extras mtl old-time optparse-applicative process split text
+         time
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -43566,6 +43622,7 @@ self: {
          base bytestring containers elm-compiler elm-core-sources file-embed
          template-haskell
        ];
+       jailbreak = true;
        homepage = "http://github.com/JoeyEremondi/elm-build-lib";
        description = "Compile Elm code to JS within Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -43574,32 +43631,32 @@ self: {
   "elm-compiler" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, blaze-html
      , blaze-markup, bytestring, cmdargs, containers, directory
-     , filemanip, filepath, HUnit, indents, language-ecmascript
-     , language-glsl, mtl, parsec, pretty, process, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, transformers, union-find, unordered-containers
+     , edit-distance, filemanip, filepath, HUnit, indents
+     , language-ecmascript, language-glsl, mtl, parsec, pretty, process
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers, union-find
+     , unordered-containers
      }:
      mkDerivation {
        pname = "elm-compiler";
-       version = "0.14.1";
-       sha256 = "0my04mipgia5qw02nzzrzc4kq3vl7bv75rzrsmd2bdb2wll1k94f";
+       version = "0.15";
+       sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
-         cmdargs containers directory filepath indents language-ecmascript
-         language-glsl mtl parsec pretty process text transformers
-         union-find unordered-containers
+         cmdargs containers directory edit-distance filepath indents
+         language-ecmascript language-glsl mtl parsec pretty process text
+         transformers union-find unordered-containers
        ];
        testDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
-         cmdargs containers directory filemanip filepath HUnit indents
-         language-ecmascript language-glsl mtl parsec pretty process
+         cmdargs containers directory edit-distance filemanip filepath HUnit
+         indents language-ecmascript language-glsl mtl parsec pretty process
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers union-find
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://elm-lang.org";
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
@@ -43652,8 +43709,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-make";
-       version = "0.1.1";
-       sha256 = "02mqr6v146piwrhycnmlxnky5bmsl7ap7781qmcwkfmc89wfa4zl";
+       version = "0.1.2";
+       sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43676,8 +43733,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-package";
-       version = "0.4";
-       sha256 = "0vsq87imyvs1sa2n4z41b6qswy2cknxsg4prhwc9r7lvyljkmn03";
+       version = "0.5";
+       sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -43701,8 +43758,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-reactor";
-       version = "0.3";
-       sha256 = "196xm10x7vi82xmq97ykffkz5j9pclq7qsasispdv3hrhpircv8z";
+       version = "0.3.1";
+       sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43725,8 +43782,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-repl";
-       version = "0.4";
-       sha256 = "1yy3vxp87bxps41x985sa0q7cqm9wx5d8sc04q0licx0in2phvyi";
+       version = "0.4.1";
+       sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -45990,8 +46047,8 @@ self: {
     ({ mkDerivation, base, containers, parsec, split, text }:
      mkDerivation {
        pname = "fasta";
-       version = "0.5.1.5";
-       sha256 = "12qjgmrd8pvzcx6ssky3vjbbh69yki1kpppkyksv0afbvd81qkv5";
+       version = "0.5.3.0";
+       sha256 = "060y8sqbklf7wr8kl2c935cxakykj705f1bbn72c4zcwfdrf5jz4";
        buildDepends = [ base containers parsec split text ];
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
@@ -47602,8 +47659,8 @@ self: {
     ({ mkDerivation, base, either, optparse-applicative, pipes }:
      mkDerivation {
        pname = "flamingra";
-       version = "0.1.1";
-       sha256 = "1nl3hvv9lji9fwcb8cdlb0883bjxr8aaai2kwbm3xhgkpz46qqqi";
+       version = "0.1.1.1";
+       sha256 = "1yfqgbjam33vrkic5xnb8pp76215jnacr6sj1xw1xqcbcs02bn3v";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base either optparse-applicative pipes ];
@@ -48215,18 +48272,13 @@ self: {
      }) {};
 
   "force-layout" = callPackage
-    ({ mkDerivation, base, containers, data-default-class, lens
-     , vector-space, vector-space-points
+    ({ mkDerivation, base, containers, data-default-class, lens, linear
      }:
      mkDerivation {
        pname = "force-layout";
-       version = "0.3.0.11";
-       sha256 = "01cjj30xf34j7c8nk0pbrsy7zp1pyl9qwq3mvnvbikrjqbhdylhh";
-       buildDepends = [
-         base containers data-default-class lens vector-space
-         vector-space-points
-       ];
-       jailbreak = true;
+       version = "0.4.0.0";
+       sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk";
+       buildDepends = [ base containers data-default-class lens linear ];
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52576,21 +52628,19 @@ self: {
 
   "gnuplot" = callPackage
     ({ mkDerivation, array, base, containers, data-accessor
-     , data-accessor-transformers, deepseq, filepath, old-locale
-     , process, temporary, time, transformers, utility-ht
+     , data-accessor-transformers, deepseq, filepath, process, temporary
+     , time, transformers, utility-ht
      }:
      mkDerivation {
        pname = "gnuplot";
-       version = "0.5.3.1";
-       sha256 = "03q226k7dhlc9mvfkkw3p00h7fh55s7l5hxgb2aarlz6q3rnjrcb";
+       version = "0.5.4";
+       sha256 = "1rx6gppgikjyd8ndlmc1yx3b4670184l80g8vrpcgjmbq23wjnmh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers data-accessor data-accessor-transformers
-         deepseq filepath old-locale process temporary time transformers
-         utility-ht
+         deepseq filepath process temporary time transformers utility-ht
        ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
@@ -61776,6 +61826,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexstring" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, hspec, text
+     }:
+     mkDerivation {
+       pname = "hexstring";
+       version = "0.9.0";
+       sha256 = "1958vmg6xb9ibg8m2rjhczfc299zw5801byh95z8hpaszird0d11";
+       buildDepends = [ base base16-bytestring bytestring text ];
+       testDepends = [ base bytestring hspec text ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Fast and safe representation of a hex string";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hfann" = callPackage
     ({ mkDerivation, base, doublefann, fann }:
      mkDerivation {
@@ -65603,14 +65667,13 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1";
-       sha256 = "1w13j70r6b66nyjj2fsa1z1m5p8v0zil6jf31x0h0f222x4fvmih";
+       version = "0.3.1.1";
+       sha256 = "137vvqmyq81aqjpag6rl980l2amf0in1rx6im4pp0gzwl48vzsyj";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
-       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68231,6 +68294,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsreadability" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+     , data-default, file-embed, http-conduit, http-types, HUnit
+     , test-framework, test-framework-hunit, text, xsd
+     }:
+     mkDerivation {
+       pname = "hsreadability";
+       version = "1.0.0.0";
+       sha256 = "0q4sqx7xjsa8jplrdzirdlh6170ckqags02idjknwpc48plarnaw";
+       buildDepends = [
+         aeson authenticate-oauth base bytestring data-default http-conduit
+         http-types text xsd
+       ];
+       testDepends = [
+         aeson base file-embed HUnit test-framework test-framework-hunit
+         text
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/rasendubi/hsreadability";
+       description = "Access to the Readability API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsshellscript" = callPackage
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
@@ -69995,6 +70081,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hutton" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, flow
+     , http-client, http-conduit, http-types, network, rainbow
+     , regex-compat, text, time, transformers, websockets, wuss
+     }:
+     mkDerivation {
+       pname = "hutton";
+       version = "1.0.0";
+       sha256 = "12rvlagd0n946x05wnyixd1b16ls9ynagccw2bc77fjqfb0d9shi";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring connection flow http-client http-conduit
+         http-types network rainbow regex-compat text time transformers
+         websockets wuss
+       ];
+       description = "A program for the button on Reddit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "huzzy" = callPackage
     ({ mkDerivation, base, easyplot }:
      mkDerivation {
@@ -71079,6 +71185,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ide-backend-server" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, Cabal, containers
+     , data-accessor, data-accessor-mtl, directory, filemanip, filepath
+     , ghc, haddock-api, ide-backend-common, mtl, process, temporary
+     , text, time, transformers, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ide-backend-server";
+       version = "0.9.0";
+       sha256 = "0kljg5dpcxhk4dr8mi5ywb0ykygqm9p89rinyk1i2fqdcvza89rm";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         array async base bytestring Cabal containers data-accessor
+         data-accessor-mtl directory filemanip filepath ghc haddock-api
+         ide-backend-common mtl process temporary text time transformers
+         unix unordered-containers
+       ];
+       description = "An IDE backend server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ideas" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, Diff
      , directory, exceptions, filepath, mtl, multipart, network
@@ -72763,19 +72891,19 @@ self: {
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , cryptohash, directory, filepath, hscurses, mtl, network-fancy
-     , random, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers
-     , vector
+     , random, safe, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time
+     , transformers, vector
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.3.8";
-       sha256 = "1w4lawwd59zkfdvi8lkg7cmqnzr0mjrkcsgpibyr8p2x42zxskgm";
+       version = "0.4.1";
+       sha256 = "1gv2kgm3r5b4nh8d58nwrilyzxr7l4awn1qlwl7wnkfi99h5nlz8";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base binary bytestring containers cryptohash directory
-         filepath hscurses mtl network-fancy random SDL SDL-gfx SDL-mixer
-         SDL-ttf stm time transformers vector
+         filepath hscurses mtl network-fancy random safe SDL SDL-gfx
+         SDL-mixer SDL-ttf stm time transformers vector
        ];
        homepage = "http://mbays.freeshell.org/intricacy";
        description = "A game of competitive puzzle-design";
@@ -83770,6 +83898,54 @@ self: {
        license = "unknown";
      }) {};
 
+  "microlens" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.1.0.0";
+       sha256 = "173ak9flxdpck7q5b3r38bpgbiv9mzmiz89y3f1wn0wz3q957p44";
+       buildDepends = [ base ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "A tiny part of the ‘lens’ library which you can depend upon";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "microlens-each" = callPackage
+    ({ mkDerivation, base, microlens }:
+     mkDerivation {
+       pname = "microlens-each";
+       version = "0.1.0.0";
+       sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
+       buildDepends = [ base microlens ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "'each' for microlens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "microlens-mtl" = callPackage
+    ({ mkDerivation, base, microlens, mtl }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.0.0";
+       sha256 = "0wz61g71c0w12apwziww2b6snbmyhfhm2f1304rw4gasify9q5s8";
+       buildDepends = [ base microlens mtl ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "microlens-th" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.1.0.0";
+       sha256 = "0balhqdlj8ighzda5g9qz8s634jlf4pjxs3hvgaqp2rw56jc4i12";
+       buildDepends = [ base containers microlens template-haskell ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for 'microlens'";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microtimer" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -85762,10 +85938,9 @@ self: {
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
-       version = "0.3.3.5";
-       sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280";
+       version = "0.4.0.0";
+       sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx";
        buildDepends = [ base groups semigroupoids semigroups ];
-       jailbreak = true;
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91340,8 +91515,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-simple";
-       version = "0.0.1";
-       sha256 = "0b6v3an74n39vhanasm6hzz6jm99i9g57lppj07cqzfj62iwj6w1";
+       version = "0.0.2";
+       sha256 = "07zq89bhkfm08mq4wnnxafgvcv5y53fmjiamfj50mqskzv21i9i7";
        buildDepends = [
          base either gitrev optparse-applicative template-haskell
          transformers
@@ -93456,6 +93631,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pell" = callPackage
+    ({ mkDerivation, arithmoi, base, Cabal, cabal-test-quickcheck
+     , containers, primes, QuickCheck
+     }:
+     mkDerivation {
+       pname = "pell";
+       version = "0.1.0.0";
+       sha256 = "0sxgliwhd0iplv3xd44a40vz8i2kmzvsq1a3zvbz4j77611hmnxd";
+       buildDepends = [ arithmoi base containers ];
+       testDepends = [
+         arithmoi base Cabal cabal-test-quickcheck containers primes
+         QuickCheck
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brunjlar/pell";
+       description = "Package to solve the Generalized Pell Equation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pem" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HUnit, mtl
      , QuickCheck, test-framework, test-framework-hunit
@@ -105025,21 +105219,17 @@ self: {
      }) {};
 
   "scalpel" = callPackage
-    ({ mkDerivation, base, bytestring, curl, download-curl, HUnit
-     , regex-base, regex-tdfa, tagsoup, text
+    ({ mkDerivation, base, bytestring, curl, HUnit, regex-base
+     , regex-tdfa, tagsoup, text
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.1.3";
-       sha256 = "0z9hfznvyr2c4xlnlny7bpmvp6ynlamsjx51my69f5ns2hq268rh";
+       version = "0.1.3.1";
+       sha256 = "0vh48fbfa4drp6wvhnj7yswgd09dabq61b7gpar0l0fviz98y8id";
        buildDepends = [
-         base bytestring curl download-curl regex-base regex-tdfa tagsoup
-         text
-       ];
-       testDepends = [
-         base bytestring curl download-curl HUnit regex-base regex-tdfa
-         tagsoup text
+         base bytestring curl regex-base regex-tdfa tagsoup text
        ];
+       testDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -108713,8 +108903,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "simtreelo";
-       version = "0.1.0.3";
-       sha256 = "1s8j2kim3h7rybi52qhdf40smamclhg1il81y2kn1sq6sx220spd";
+       version = "0.1.1.0";
+       sha256 = "1j7q2mld8np16nmq8w3lx87j1f530jpxv4jlpf038k42pf4p23l2";
        buildDepends = [ base containers ];
        description = "Loader for data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
@@ -112272,37 +112462,18 @@ self: {
      }) {};
 
   "stackage" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal
-     , classy-prelude-conduit, conduit, conduit-extra, containers
-     , data-default-class, directory, filepath, hspec, http-client
-     , http-client-tls, http-conduit, mono-traversable, mtl, old-locale
-     , optparse-applicative, process, QuickCheck, semigroups, stm
-     , streaming-commons, system-fileio, system-filepath, tar, temporary
-     , text, time, transformers, unix-compat, utf8-string, xml-conduit
-     , yaml, zlib
-     }:
+    ({ mkDerivation, base, stackage-cli, stackage-update }:
      mkDerivation {
        pname = "stackage";
-       version = "0.6.0.1";
-       sha256 = "0y785cc71rw5g6jlbrljabing0dpizqyid36hp97r3kwa1bc5x2m";
-       isLibrary = true;
-       isExecutable = true;
-       buildDepends = [
-         aeson async base bytestring Cabal classy-prelude-conduit conduit
-         conduit-extra containers data-default-class directory filepath
-         http-client http-client-tls http-conduit mono-traversable mtl
-         old-locale optparse-applicative process semigroups stm
-         streaming-commons system-fileio system-filepath tar temporary text
-         time transformers unix-compat utf8-string xml-conduit yaml zlib
-       ];
-       testDepends = [
-         base Cabal classy-prelude-conduit containers hspec http-client
-         http-client-tls QuickCheck text yaml
-       ];
-       homepage = "https://github.com/fpco/stackage";
-       description = "\"Stable Hackage,\" tools for creating a vetted set of packages from Hackage";
+       version = "0.7.0.0";
+       sha256 = "0fw910zvm4vgm41jrsfr76x1c5alwvm85m0k9x0hyrwxnd5ci4dj";
+       buildDepends = [ base stackage-cli stackage-update ];
+       jailbreak = true;
+       homepage = "https://www.stackage.org/";
+       description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
-     }) {};
+       broken = true;
+     }) { stackage-cli = null;};
 
   "stackage-curator" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal
@@ -112533,13 +112704,12 @@ self: {
      }) {};
 
   "statestack" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "statestack";
-       version = "0.2.0.3";
-       sha256 = "0w5vw8jmnwbfyma4a3ggdm9jvxf3c18kpwbvcmvr5szifaqv9sgx";
-       buildDepends = [ base mtl transformers ];
-       jailbreak = true;
+       version = "0.2.0.4";
+       sha256 = "0swj3f2vc56a5y2qxp2pq8nxkwngcw2lm87dmaikymchbqb832hd";
+       buildDepends = [ base mtl transformers transformers-compat ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119235,6 +119405,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-olson-th" = callPackage
+    ({ mkDerivation, base, template-haskell, time, timezone-olson
+     , timezone-series
+     }:
+     mkDerivation {
+       pname = "timezone-olson-th";
+       version = "0.1.0.0";
+       sha256 = "0rw0gca1qa5r9nas12mhmbfa09jjix6kn7h5vjmvbhh83820br5i";
+       buildDepends = [
+         base template-haskell time timezone-olson timezone-series
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/jonpetterbergman/timezone-olson-th";
+       description = "Load TimeZoneSeries from an Olson file at compile time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timezone-series" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -127609,8 +127796,8 @@ self: {
      }:
      mkDerivation {
        pname = "wiring";
-       version = "0.2.1";
-       sha256 = "1vbvv6wkizmh6wrzfk968vdsmp9iwrkpl3dgw6465s8z90ncclj5";
+       version = "0.3.0";
+       sha256 = "0c7xg6xq5bmb0qc2f9509sx5yrnngp4q5v1bgxl636qp9mhck68x";
        buildDepends = [ base mtl template-haskell transformers ];
        testDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -132632,16 +132819,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
 
-  "zlib_0_6_0_0" = callPackage
+  "zlib_0_6_1_0" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck, zlib
      }:
      mkDerivation {
        pname = "zlib";
-       version = "0.6.0.0";
-       revision = "1";
-       sha256 = "1xiql3y7p1pd5bvbwa2dp2z919bgbm4gxb83bqxlpwmjlsm0fk97";
-       editedCabalFile = "922bc62e14b9c9dce6ef365a3e40a56fcc0ccf21876579df9a76e97899a7d251";
+       version = "0.6.1.0";
+       sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck