diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5093c73914..3dbe7ea16b3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1987,8 +1987,8 @@ self: {
     ({ mkDerivation, base, bytestring, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "BitSyntax";
-       version = "0.3.2.1";
-       sha256 = "0cc0nvmnybn68a1bvzqrvc5csaqvs3g50657slwjf2f686yi5q8r";
+       version = "0.3.2.2";
+       sha256 = "0615r1cb2sv9sj517vii3g2sf1k308q3r176i03jpjlb6vgfipkn";
        libraryHaskellDepends = [
          base bytestring QuickCheck template-haskell
        ];
@@ -6774,6 +6774,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_16" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.16";
+       sha256 = "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
@@ -18692,22 +18710,21 @@ self: {
      }) {};
 
   "Sit" = callPackage
-    ({ mkDerivation, alex, array, base, containers, data-lens-light
-     , happy, mtl
-     }:
+    ({ mkDerivation, array, base, containers, data-lens-light, mtl }:
      mkDerivation {
        pname = "Sit";
-       version = "0.2017.5.2";
-       sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff";
-       revision = "2";
-       editedCabalFile = "1chbiyvp02yn03pvqd4r4z3yprb7yiwmxmw2kl6gr5aml9923w41";
-       isLibrary = false;
+       version = "0.2021.1.18";
+       sha256 = "045xbxf0jyxr6510mcfhnfbj2p0kka5l45cydlxchhwg75z8snmi";
+       revision = "1";
+       editedCabalFile = "0vd1j410rp27g9cbzd3b1ymv02gfmi7pcnqzgpnppi9kc0nrr6kl";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          array base containers data-lens-light mtl
        ];
-       executableToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Prototypical type checker for Type Theory with Sized Natural Numbers";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29467,33 +29484,6 @@ self: {
      }) {};
 
   "amqp" = callPackage
-    ({ mkDerivation, base, binary, bytestring, clock, connection
-     , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, stm, text, vector
-     , xml
-     }:
-     mkDerivation {
-       pname = "amqp";
-       version = "0.20.0";
-       sha256 = "1vi8kccvvnym8v4cnsghkiicbjzvkbc7binr12priqmvwvis34rv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split stm
-         text vector
-       ];
-       executableHaskellDepends = [ base containers xml ];
-       testHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 hspec hspec-expectations network network-uri
-         split stm text vector
-       ];
-       description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "amqp_0_20_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -29518,7 +29508,6 @@ self: {
        ];
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -31747,27 +31736,28 @@ self: {
     ({ mkDerivation, base, containers, directory, extra, filemanip
      , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative
      , process, refact, silently, syb, tasty, tasty-expected-failure
-     , tasty-golden, transformers, unix-compat
+     , tasty-golden, transformers, uniplate, unix-compat
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.8.2.1";
-       sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp";
+       version = "0.9.0.0";
+       sha256 = "1w6andxlap50vi2cwdy7x5xp2q1qyd67g4vs860gddcv8nir69qc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory extra filemanip ghc ghc-exactprint
-         process refact syb transformers unix-compat
+         base containers directory extra filemanip ghc ghc-boot-th
+         ghc-exactprint process refact syb transformers uniplate unix-compat
        ];
        executableHaskellDepends = [
          base containers directory extra filemanip filepath ghc ghc-boot-th
          ghc-exactprint optparse-applicative process refact syb transformers
-         unix-compat
+         uniplate unix-compat
        ];
        testHaskellDepends = [
          base containers directory extra filemanip filepath ghc ghc-boot-th
          ghc-exactprint optparse-applicative process refact silently syb
-         tasty tasty-expected-failure tasty-golden transformers unix-compat
+         tasty tasty-expected-failure tasty-golden transformers uniplate
+         unix-compat
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
@@ -42208,18 +42198,18 @@ self: {
      }) {};
 
   "bitcoin-compact-filters" = callPackage
-    ({ mkDerivation, aeson, base, bitstream, bytestring, cereal
-     , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers
+    ({ mkDerivation, aeson, base, base16-bytestring, bitstream
+     , bytestring, cereal, haskoin-core, memory, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "bitcoin-compact-filters";
-       version = "0.1.0.0";
-       sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m";
+       version = "0.1.0.1";
+       sha256 = "1ifs7yi34x5nfhy0bs9w6arz7f6kwfxl0wgl6s0iwd1z94s5ysk1";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bitstream bytestring cereal haskoin-core memory text
-         transformers
+         base base16-bytestring bitstream bytestring cereal haskoin-core
+         memory text transformers
        ];
        testHaskellDepends = [
          aeson base bytestring cereal haskoin-core tasty tasty-hunit
@@ -42382,6 +42372,8 @@ self: {
        pname = "bitcoin-scripting";
        version = "0.1.0";
        sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707";
+       revision = "1";
+       editedCabalFile = "002i80rqigg3avydg9xhsa8ppyjw6a0r39hbimdghmv8db4wnpbl";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring cereal containers
          haskoin-core text transformers
@@ -42446,6 +42438,8 @@ self: {
        pname = "bitcoind-regtest";
        version = "0.2.0.0";
        sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf";
+       revision = "1";
+       editedCabalFile = "15qqqvrx3ikbzvws2n5mywqlpsg8g437gsdj19cdfa6cc4bd8kqh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42476,6 +42470,8 @@ self: {
        pname = "bitcoind-rpc";
        version = "0.2.0.0";
        sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc";
+       revision = "1";
+       editedCabalFile = "0zg4ym032v3bzr24ap9afl05difcxgd4wwipbvfbjybka1dwwr97";
        libraryHaskellDepends = [
          aeson base base16-bytestring bitcoin-compact-filters bytestring
          cereal haskoin-core http-client scientific servant servant-client
@@ -49801,28 +49797,29 @@ self: {
 
   "calamity" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, colour
-     , concurrent-extra, containers, data-default-class, data-flags
-     , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus
-     , generic-lens, generic-override, generic-override-aeson, hashable
-     , http-date, http-types, lens, lens-aeson, megaparsec, mime-types
-     , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions
+     , concurrent-extra, connection, containers, data-default-class
+     , data-flags, deepseq, deque, df1, di-core, di-polysemy, exceptions
+     , fmt, focus, generic-lens, generic-override
+     , generic-override-aeson, hashable, http-client, http-date
+     , http-types, lens, lens-aeson, megaparsec, mime-types, mtl
+     , polysemy, polysemy-plugin, reflection, req, safe-exceptions
      , scientific, stm, stm-chans, stm-containers, text, text-show, time
-     , typerep-map, unagi-chan, unboxing-vector, unordered-containers
-     , vector, websockets, wreq, wuss
+     , tls, typerep-map, unagi-chan, unboxing-vector
+     , unordered-containers, vector, websockets, x509-system
      }:
      mkDerivation {
        pname = "calamity";
-       version = "0.1.23.1";
-       sha256 = "162vjlzd2w98c5w8smjy6y7sywa7dfmv780g6ij4spzn1611l2z5";
+       version = "0.1.24.1";
+       sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2";
        libraryHaskellDepends = [
-         aeson async base bytestring colour concurrent-extra containers
-         data-default-class data-flags deepseq deque df1 di-core di-polysemy
-         exceptions fmt focus generic-lens generic-override
-         generic-override-aeson hashable http-date http-types lens
-         lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
-         reflection safe-exceptions scientific stm stm-chans stm-containers
-         text text-show time typerep-map unagi-chan unboxing-vector
-         unordered-containers vector websockets wreq wuss
+         aeson async base bytestring colour concurrent-extra connection
+         containers data-default-class data-flags deepseq deque df1 di-core
+         di-polysemy exceptions fmt focus generic-lens generic-override
+         generic-override-aeson hashable http-client http-date http-types
+         lens lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
+         reflection req safe-exceptions scientific stm stm-chans
+         stm-containers text text-show time tls typerep-map unagi-chan
+         unboxing-vector unordered-containers vector websockets x509-system
        ];
        description = "A library for writing discord bots in haskell";
        license = stdenv.lib.licenses.mit;
@@ -52670,6 +52667,55 @@ self: {
        broken = true;
      }) {};
 
+  "chakra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cryptonite
+     , data-default, data-has, dotenv, envy, fast-logger, hspec
+     , http-types, iproute, jose, lens, mtl, network, network-uri
+     , options, optparse-simple, prometheus-client
+     , prometheus-metrics-ghc, rio, servant-auth, servant-auth-server
+     , servant-server, streaming-commons, string-conversions, text, time
+     , transformers, unordered-containers, wai, wai-cli, wai-extra
+     , wai-middleware-prometheus, warp
+     }:
+     mkDerivation {
+       pname = "chakra";
+       version = "0.1.0";
+       sha256 = "00ygnyvif8z8x9xasa3s9yahsawdmkjg43afczd5i0p3clfg6385";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger http-types iproute jose lens mtl
+         network network-uri options prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       executableHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger http-types iproute jose lens mtl
+         network network-uri options optparse-simple prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal base bytestring cryptonite data-default
+         data-has dotenv envy fast-logger hspec http-types iproute jose lens
+         mtl network network-uri options prometheus-client
+         prometheus-metrics-ghc rio servant-auth servant-auth-server
+         servant-server streaming-commons string-conversions text time
+         transformers unordered-containers wai wai-cli wai-extra
+         wai-middleware-prometheus warp
+       ];
+       description = "A REST Web Api server template for building (micro)services";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "chalk" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -53424,23 +53470,23 @@ self: {
      }) {};
 
   "cherry-core-alpha" = callPackage
-    ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
-     , case-insensitive, cherry-core, containers, directory, ghc-prim
-     , hspec, hspec-discover, http-client, http-client-tls, http-types
-     , mtl, network, safe-exceptions, scientific, stm, text-utf8, time
-     , unix, utf8-string, vector, wai, wai-extra, wai-middleware-static
-     , warp
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, case-insensitive, cherry-core, containers, directory
+     , ghc-prim, hspec, hspec-discover, http-client, http-client-tls
+     , http-types, jose-jwt, mtl, network, postgresql-libpq
+     , safe-exceptions, scientific, stm, text, text-utf8, time, unix
+     , utf8-string, vector, wai, wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "cherry-core-alpha";
-       version = "0.3.0.0";
-       sha256 = "03plsrwzji653psjwsxmafsl24cyx6260x15cfpmb7fka5rdfs5i";
+       version = "0.4.0.0";
+       sha256 = "1rrmglzxvfq67ymgy7jifx8rgk33qq82vrcsbaqwcsjc95c3kfdx";
        libraryHaskellDepends = [
-         async base base64-bytestring binary bytestring case-insensitive
-         containers directory ghc-prim http-client http-client-tls
-         http-types mtl network safe-exceptions scientific stm text-utf8
-         time unix utf8-string vector wai wai-extra wai-middleware-static
-         warp
+         aeson async base base64-bytestring binary bytestring
+         case-insensitive containers directory ghc-prim http-client
+         http-client-tls http-types jose-jwt mtl network postgresql-libpq
+         safe-exceptions scientific stm text text-utf8 time unix utf8-string
+         vector wai wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
          base cherry-core containers hspec text-utf8
@@ -54575,8 +54621,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.3.0.3";
-       sha256 = "0ck7hw1md1bwfl0qzkj0vg8ippmymcmvw84srr15rhaqgiqx9v4n";
+       version = "0.3.0.4";
+       sha256 = "13rx1919hnk26jpnqcdfqmd8hkvhg8504aq7abiyxy0diy28mvz7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61082,6 +61128,26 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "conferer_1_0_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , filepath, hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "conferer";
+       version = "1.0.0.1";
+       sha256 = "0cfn6aj265qs1qk5z942g5l2cz2gsj35bapxynj4c90wjl89wz5r";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath text
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory filepath hspec
+         QuickCheck text
+       ];
+       description = "Configuration management library";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conferer-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
      , directory, hspec, text, unordered-containers, vector
@@ -72062,6 +72128,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "dep-t" = callPackage
+    ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit
+     , template-haskell, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "dep-t";
+       version = "0.1.0.2";
+       sha256 = "0vzf37gmhvpv43xybzn7lms0jgl12ch7mz04a05a1arn3ljh89c9";
+       libraryHaskellDepends = [ base mtl transformers unliftio-core ];
+       testHaskellDepends = [
+         base mtl rank2classes tasty tasty-hunit template-haskell
+         transformers unliftio-core
+       ];
+       description = "Reader-like monad transformer for dependency injection";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers
      , criterion, deepseq, hspec, microlens
@@ -83858,6 +83941,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "equational-reasoning_0_6_0_4" = callPackage
+    ({ mkDerivation, base, containers, template-haskell, th-desugar
+     , void
+     }:
+     mkDerivation {
+       pname = "equational-reasoning";
+       version = "0.6.0.4";
+       sha256 = "1dv9di6p7pqmxys9c2d3rv36qhafgji0rxf52v0240zvfqhg8wn4";
+       libraryHaskellDepends = [
+         base containers template-haskell th-desugar void
+       ];
+       description = "Proof assistant for Haskell using DataKinds & PolyKinds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "equational-reasoning-induction" = callPackage
     ({ mkDerivation, base, singletons, template-haskell, th-extras }:
      mkDerivation {
@@ -100736,23 +100835,56 @@ self: {
      }) {};
 
   "ghc-typelits-presburger" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
-     , pretty, reflection, syb, transformers
+    ({ mkDerivation, base, containers, equational-reasoning, ghc
+     , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
+     , tasty-discover, tasty-expected-failure, tasty-hunit, text
+     , transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-presburger";
-       version = "0.3.0.1";
-       sha256 = "0h403zi5lqbpygpqw5469fafz1cgh5mcx96sp0iw4scnmh7z3cj9";
+       version = "0.4.0.0";
+       sha256 = "0sz8n323vcwgx3haq6235k1hs0yqg8qnksqk5wwz9a2gkb45gqn2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
          transformers
        ];
+       testHaskellDepends = [
+         base equational-reasoning tasty tasty-discover
+         tasty-expected-failure tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-typelits-presburger_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, equational-reasoning, ghc
+     , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty
+     , tasty-discover, tasty-expected-failure, tasty-hunit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-presburger";
+       version = "0.5.0.0";
+       sha256 = "12v42xav9mvhkkzbfbrjcm2b3hk6vr3j6ra8qn9ji1jfzvin88wl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers ghc ghc-tcplugins-extra mtl pretty reflection syb
+         transformers
+       ];
+       testHaskellDepends = [
+         base equational-reasoning tasty tasty-discover
+         tasty-expected-failure tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-usage" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-paths, unix }:
      mkDerivation {
@@ -103721,8 +103853,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlab-haskell";
-       version = "0.2.4";
-       sha256 = "1p2sgxnr5xgh0wz3q5vf6xqy827nrplfbcpfwa6kgqxiqgsfsdv2";
+       version = "0.2.5";
+       sha256 = "13dlbl2hlvmplxjypg14llpbxf0a9x2f4lk0kkn46f63mn0fy83x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring connection http-conduit http-types temporary
@@ -114455,8 +114587,8 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.10.2.0";
-       sha256 = "0axqpa1p7lzxym8nyppc3nhbfzis8y71ywi444v3w6syyvh06ygf";
+       version = "0.11.0.1";
+       sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
@@ -125741,10 +125873,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }:
      mkDerivation {
        pname = "hgmp";
-       version = "0.1.1";
-       sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "4";
-       editedCabalFile = "00rg7f223716dlqk0w92ixnyj7a9imj6yqcs5qx833jv7lk8lbyj";
+       version = "0.1.2";
+       sha256 = "1sqnywh4h1nklcpci60n427m1kahkza1vy1j60jmq3lnlrbgzfzk";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
@@ -128322,8 +128452,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "3.2.6";
-       sha256 = "1i1qqqi6qdfa3py48cns6c41xn6qr8rsfg7rn4i22qr86zp8ikp5";
+       version = "3.2.7";
+       sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -129461,34 +129591,31 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "hnix-store-core_0_4_0_0" = callPackage
+  "hnix-store-core_0_4_1_0" = callPackage
     ({ mkDerivation, algebraic-graphs, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cereal
      , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256
-     , cryptohash-sha512, directory, filepath, hashable, io-streams
-     , lifted-base, monad-control, mtl, nix-derivation, process
-     , process-extras, saltine, tasty, tasty-discover, tasty-golden
-     , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
-     , unix, unordered-containers, vector
+     , cryptohash-sha512, directory, filepath, hashable, lifted-base
+     , monad-control, mtl, nix-derivation, process, saltine, tasty
+     , tasty-golden, tasty-hspec, tasty-hunit, tasty-quickcheck
+     , temporary, text, time, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-core";
-       version = "0.4.0.0";
-       sha256 = "05fwh5y82qy4qzi32xgk8dmndd8r074rvfl2nxyg3f3ydqpcmmr2";
+       version = "0.4.1.0";
+       sha256 = "05yblps7x9r4hwszinx2s4rcfr8q1d1y6r29mn6jzydjwvdyhgj0";
        libraryHaskellDepends = [
          algebraic-graphs attoparsec base base16-bytestring
-         base64-bytestring binary bytestring cereal containers
-         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
-         directory filepath hashable lifted-base monad-control mtl
-         nix-derivation saltine text time unix unordered-containers vector
+         base64-bytestring bytestring cereal containers cryptohash-md5
+         cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 directory
+         filepath hashable lifted-base monad-control mtl nix-derivation
+         saltine text time unix unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring binary
-         bytestring containers directory filepath io-streams process
-         process-extras tasty tasty-discover tasty-golden tasty-hspec
-         tasty-hunit tasty-quickcheck temporary text unix
+         bytestring containers directory filepath process tasty tasty-golden
+         tasty-hspec tasty-hunit tasty-quickcheck temporary text unix
        ];
-       testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129496,17 +129623,16 @@ self: {
 
   "hnix-store-remote" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , filepath, hnix-store-core, mtl, network, nix-derivation, text
-     , time, unix, unordered-containers, vector
+     , hnix-store-core, mtl, network, nix-derivation, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hnix-store-remote";
-       version = "0.4.0.0";
-       sha256 = "0l9gb5b415im1bjrbx6k0ah92763hgm1ns6kxfl5mxwij52kzc32";
+       version = "0.4.1.0";
+       sha256 = "1w6x756hh7429ci2kdsl9psxbsq8k829x802dblv652d33wl0fkc";
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers filepath
-         hnix-store-core mtl network nix-derivation text time unix
-         unordered-containers vector
+         attoparsec base binary bytestring containers hnix-store-core mtl
+         network nix-derivation text time unordered-containers
        ];
        description = "Remote hnix store";
        license = stdenv.lib.licenses.asl20;
@@ -135557,6 +135683,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_7_8" = callPackage
+    ({ mkDerivation, base, hspec-core, hspec-discover
+     , hspec-expectations, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.7.8";
+       sha256 = "0v6bf6ir6h97mys797amr8idl1a6w1gpvj7ps3k0gkxwrnsyvynh";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations QuickCheck
+       ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -135639,6 +135781,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_7_8" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.7.8";
+       sha256 = "10c7avvjcrpy3nrf5xng4177nmxvz0gmc83h7qlnljcp3rkimbvd";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testToolDepends = [ hspec-meta ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -135676,6 +135846,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_7_8" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.7.8";
+       sha256 = "0z2ysmy4qzv4jyb5yqmavhmbhqk2ch0cmaj18i9jvbg0y7fpsn67";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       testToolDepends = [ hspec-meta ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -138673,8 +138863,8 @@ self: {
        pname = "http-media";
        version = "0.8.0.0";
        sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir";
-       revision = "3";
-       editedCabalFile = "1ndz5x6njl35h73il5c6qpaqd4ynvg21n6k7sb8aq09gfbg544d8";
+       revision = "4";
+       editedCabalFile = "0qg6x92i3w2q7zarr08kmicychkwskfi04xaxkqkg0cw6jnpnhhh";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -139866,8 +140056,8 @@ self: {
      }:
      mkDerivation {
        pname = "hurl";
-       version = "2.0.0.0";
-       sha256 = "0rr4v8dbbkasg68zkv6z2p4ib12kazqjrad4s0z7h6l7hy6rqwbz";
+       version = "2.1.0.0";
+       sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145496,6 +145686,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-cpp_0_4_0_3" = callPackage
+    ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
+     , template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.4.0.3";
+       sha256 = "0bqrhyic3cw1pqg7knsmkqx5swpr4kvf9bmz0mhmqbl6brmv5il0";
+       libraryHaskellDepends = [
+         base containers inline-c safe-exceptions template-haskell
+       ];
+       testHaskellDepends = [
+         base containers hspec inline-c safe-exceptions template-haskell
+         vector
+       ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-win32" = callPackage
     ({ mkDerivation, base, containers, inline-c, template-haskell
      , Win32
@@ -154316,8 +154526,8 @@ self: {
      }:
      mkDerivation {
        pname = "ktx-codec";
-       version = "0.0.1.1";
-       sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0";
+       version = "0.0.1.2";
+       sha256 = "14vv1c7n8ms2y18ks08i5hr09av9y2gn677rki4swfdhgy3zamcp";
        libraryHaskellDepends = [
          base binary bytestring containers text vector
        ];
@@ -155671,8 +155881,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.10.2";
-       sha256 = "10lanbzbaywyc3a8lq2ndgmpqq2kgpm4vkjxw7gl4irzjn3206yg";
+       version = "1.7.10.3";
+       sha256 = "0snidchidgzxwizbzaxf1gn547ga6kdf8pi03p6p5g9ffb8mv372";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -164229,16 +164439,33 @@ self: {
        broken = true;
      }) {};
 
-  "logict" = callPackage
+  "logict_0_7_0_3" = callPackage
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "logict";
        version = "0.7.0.3";
        sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r";
+       revision = "1";
+       editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "logict" = callPackage
+    ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "logict";
+       version = "0.7.1.0";
+       sha256 = "1d22b7r8lnak5k8ars166cxbk1lv7gf8g0qs604irsx2s474ybi7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ async base mtl tasty tasty-hunit ];
+       description = "A backtracking logic-programming monad";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "logict-state" = callPackage
@@ -170169,8 +170396,8 @@ self: {
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.2.0.1";
-       sha256 = "0p6qyw15nx1l0b7h029hjkhgz7zvc19c4bfm2pkx53hm96gxjxqg";
+       version = "0.3.0.1";
+       sha256 = "0sbfzmdq0rqzrvrjk7yzkn0mfadbz3dxj1d9n8f3s9mz3s8bv328";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-default-class hashable
          network resource-pool time vector
@@ -173010,25 +173237,26 @@ self: {
      }) {};
 
   "miv" = callPackage
-    ({ mkDerivation, aeson, async, base, concurrent-output, directory
-     , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel
-     , process, SafeSemaphore, text, time, unix-compat
-     , unordered-containers, xdg-basedir, yaml
+    ({ mkDerivation, async, base, bytestring, concurrent-output
+     , containers, directory, filepath, filepattern, ghc-prim, hspec
+     , HsYAML, monad-parallel, process, SafeSemaphore, text, time
+     , unix-compat, unordered-containers, xdg-basedir
      }:
      mkDerivation {
        pname = "miv";
-       version = "0.4.6";
-       sha256 = "1xf4frjvccjvkzgx9ha9q2i6ig5bx3z37igjb3s7a9zvqnvig06g";
+       version = "0.4.8";
+       sha256 = "1b3lplsnjf992rvidj48swccl8f8aqdik1sf481g7vwv2mz7d7m6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson async base concurrent-output directory filepath filepattern
-         ghc-prim hashable monad-parallel process SafeSemaphore text time
-         unix-compat unordered-containers xdg-basedir yaml
+         async base bytestring concurrent-output containers directory
+         filepath filepattern ghc-prim HsYAML monad-parallel process
+         SafeSemaphore text time unix-compat unordered-containers
+         xdg-basedir
        ];
        testHaskellDepends = [
-         aeson base directory ghc-prim hashable hspec monad-parallel process
-         text time unordered-containers yaml
+         base bytestring containers directory ghc-prim hspec HsYAML
+         monad-parallel process text time unordered-containers
        ];
        description = "Vim plugin manager written in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -191923,8 +192151,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.3.4";
-       sha256 = "0xmf75v6b5cj083fjxz3hl6cj9ix2v68h8ix5zrh94qik5is4rl7";
+       version = "0.3.5";
+       sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205278,6 +205506,18 @@ self: {
        broken = true;
      }) {};
 
+  "prime" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "prime";
+       version = "0.1.1";
+       sha256 = "18bfxyzazf5d8hfakrags3l3hbn75zws4ihl9bj59c52if5l6fbm";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "prime number tools";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "primes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -213063,8 +213303,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "9.3.2";
-       sha256 = "06mb7z1w56hvwl9gbkmbbib01760ix93x03bdl0ybpb6hhffq7r3";
+       version = "9.3.3";
+       sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214163,44 +214403,6 @@ self: {
      }) {};
 
   "reanimate" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
-     , base64-bytestring, bytestring, cassava, cereal, colour
-     , containers, cryptohash-sha256, cubicbezier, directory, filelock
-     , filepath, fingertree, fsnotify, geojson, hashable, hgeometry
-     , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl
-     , neat-interpolation, network, open-browser, optparse-applicative
-     , parallel, process, QuickCheck, random, random-shuffle
-     , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden
-     , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time
-     , unix, unordered-containers, vector, vector-space, websockets, xml
-     }:
-     mkDerivation {
-       pname = "reanimate";
-       version = "1.1.3.1";
-       sha256 = "0x2pfbf712lixpj1mv1gvv26xi80shiq3798mkd0kqmvzkz57aqz";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal array attoparsec base base64-bytestring
-         bytestring cassava cereal colour containers cryptohash-sha256
-         cubicbezier directory filelock filepath fingertree fsnotify geojson
-         hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear
-         matrix mtl neat-interpolation network open-browser
-         optparse-applicative parallel process random random-shuffle
-         reanimate-svg split temporary text time unix unordered-containers
-         vector vector-space websockets xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath linear process QuickCheck tasty
-         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
-         tasty-rerun temporary text vector
-       ];
-       description = "Animation library based on SVGs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "reanimate_1_1_3_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
      , base64-bytestring, bytestring, cassava, cereal, colour
      , containers, cryptohash-sha256, cubicbezier, directory, filelock
@@ -217005,8 +217207,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-hedgehog";
-       version = "0.2.1.1";
-       sha256 = "1s94xb7ma6rq81z30wjaczy2w3v1myqwhkx257p4nh69dv4wzd8d";
+       version = "0.3.0.0";
+       sha256 = "0ardmwsaxlk9g062bf2xiigbjbnqbf7iz9s8xwjzj8nh8rrs252z";
        libraryHaskellDepends = [
          base containers hedgehog mmorph multimap protolude registry tasty
          tasty-discover tasty-hedgehog tasty-th template-haskell text
@@ -223459,25 +223661,6 @@ self: {
      }) {};
 
   "saltine" = callPackage
-    ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors
-     , QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "saltine";
-       version = "0.1.1.0";
-       sha256 = "1apcyc39mraqg9394scwqrdc3aaxvry22pl648gyp73z9dfrk5wf";
-       libraryHaskellDepends = [ base bytestring hashable profunctors ];
-       libraryPkgconfigDepends = [ libsodium ];
-       testHaskellDepends = [
-         base bytestring QuickCheck semigroups test-framework
-         test-framework-quickcheck2
-       ];
-       description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) libsodium;};
-
-  "saltine_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors
      , QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2
@@ -223494,7 +223677,6 @@ self: {
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
@@ -227097,28 +227279,27 @@ self: {
      }) {};
 
   "sensei" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai
+    ({ mkDerivation, ansi-terminal, base, bytestring, directory
+     , filepath, fsnotify, hspec, hspec-discover, hspec-meta, hspec-wai
      , http-client, http-types, interpolate, mockery, network, process
      , silently, stm, text, time, unix, wai, warp
      }:
      mkDerivation {
        pname = "sensei";
-       version = "0.4.0";
-       sha256 = "18p3hrc0av30ri678rgzdarp5m3qpia0y1nc6rb8zzvs0cspmfvd";
+       version = "0.5.0";
+       sha256 = "011lck879q12npszqf2cjsxyjrcyfhrs77dh8kbififm53dfglf4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring directory filepath
-         fsnotify http-client http-types network process stm text time unix
-         wai warp
+         ansi-terminal base bytestring directory filepath fsnotify
+         http-client http-types network process stm text time unix wai warp
        ];
        testHaskellDepends = [
-         ansi-terminal base base-compat bytestring directory filepath
-         fsnotify hspec hspec-meta hspec-wai http-client http-types
-         interpolate mockery network process silently stm text time unix wai
-         warp
+         ansi-terminal base bytestring directory filepath fsnotify hspec
+         hspec-meta hspec-wai http-client http-types interpolate mockery
+         network process silently stm text time unix wai warp
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227643,8 +227824,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, unix }:
      mkDerivation {
        pname = "serialport";
-       version = "0.5.0";
-       sha256 = "1w547rrfsa1cbjcdpqrlzwnnyrzd4lmbj52mnh98zz9aiv7rbqxv";
+       version = "0.5.1";
+       sha256 = "1ys3rjw1a3cghd2slnn43hvc3pdgwfy3rs19j1kjfshasr7d375m";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Cross platform serial port library";
@@ -234561,8 +234742,8 @@ self: {
      }:
      mkDerivation {
        pname = "singletons-presburger";
-       version = "0.3.0.1";
-       sha256 = "1j7azll9cjg5gcvpw8aq1hia1njg4bm8llwms1v941gwi7gk481m";
+       version = "0.4.0.0";
+       sha256 = "0jdyynjapviks042jw3vfq27yk3wvjg7n7xmq3m3x0v195731jph";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234572,6 +234753,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singletons-presburger_0_5_0_0" = callPackage
+    ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl
+     , reflection, singletons
+     }:
+     mkDerivation {
+       pname = "singletons-presburger";
+       version = "0.5.0.0";
+       sha256 = "0pc95rg9vbcgzw6bzsj41vbz3h85p4lhf1ry8ik6l8c2nz3ga6bb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc ghc-typelits-presburger mtl reflection singletons
+       ];
+       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singnal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -234830,30 +235029,6 @@ self: {
      }) {};
 
   "sized" = callPackage
-    ({ mkDerivation, base, constraints, containers, deepseq
-     , equational-reasoning, ghc-typelits-knownnat
-     , ghc-typelits-presburger, hashable, hspec, inspection-testing
-     , lens, mono-traversable, singletons, subcategories
-     , template-haskell, th-lift, these, type-natural, vector
-     }:
-     mkDerivation {
-       pname = "sized";
-       version = "0.8.0.0";
-       sha256 = "1jwarhc0xi4h5860whi6s9n36qijlh6j6rnxx71dnlsrinfdsn2m";
-       libraryHaskellDepends = [
-         base constraints containers deepseq equational-reasoning
-         ghc-typelits-knownnat ghc-typelits-presburger hashable lens
-         mono-traversable singletons subcategories these type-natural vector
-       ];
-       testHaskellDepends = [
-         base containers hspec inspection-testing mono-traversable
-         singletons subcategories template-haskell th-lift vector
-       ];
-       description = "Sized sequence data-types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sized_0_9_0_0" = callPackage
     ({ mkDerivation, base, constraints, containers, deepseq
      , equational-reasoning, ghc-typelits-knownnat
      , ghc-typelits-presburger, hashable, hspec, inspection-testing
@@ -234865,6 +235040,8 @@ self: {
        pname = "sized";
        version = "0.9.0.0";
        sha256 = "0pj21mnh5prxxbis6735na68ggqzslyqj5djkhzdvr364ajmbnd1";
+       revision = "1";
+       editedCabalFile = "1ij5avi0k4p5ms5g9l8yyy3mp0d0z05lap8jwx99zgz3rri7s4sw";
        libraryHaskellDepends = [
          base constraints containers deepseq equational-reasoning
          ghc-typelits-knownnat ghc-typelits-presburger hashable lens
@@ -234877,6 +235054,32 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "sized_1_0_0_0" = callPackage
+    ({ mkDerivation, base, constraints, containers, deepseq
+     , equational-reasoning, ghc-typelits-knownnat
+     , ghc-typelits-presburger, hashable, hspec, inspection-testing
+     , lens, mono-traversable, subcategories, template-haskell, th-lift
+     , these, type-natural, vector
+     }:
+     mkDerivation {
+       pname = "sized";
+       version = "1.0.0.0";
+       sha256 = "0f6ql0yk0qi2wkzifhhhfn5z3wzh10d57ak9wrb4dv8s6mx34yk7";
+       revision = "3";
+       editedCabalFile = "13v3dkfdnzg2y7pfkn2dnvczd9y40izlm30vcssn2a5b1v7vy3bz";
+       libraryHaskellDepends = [
+         base constraints containers deepseq equational-reasoning
+         ghc-typelits-knownnat ghc-typelits-presburger hashable lens
+         mono-traversable subcategories these type-natural vector
+       ];
+       testHaskellDepends = [
+         base containers hspec inspection-testing mono-traversable
+         subcategories template-haskell th-lift type-natural vector
+       ];
+       description = "Sized sequence data-types";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -235562,8 +235765,8 @@ self: {
      }:
      mkDerivation {
        pname = "slick";
-       version = "1.0.1.1";
-       sha256 = "1n1a7jpn37dzfmk9z51d6yhg2iaraqw55qnlap0d6zk1lnc3drib";
+       version = "1.1.0.0";
+       sha256 = "1a6zsp308ikqzdxy26phb04bk4hr8lmw1i73mwydg65yd42c8zjx";
        libraryHaskellDepends = [
          aeson base bytestring directory extra mustache pandoc shake text
          unordered-containers
@@ -235842,8 +236045,8 @@ self: {
     ({ mkDerivation, base, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
-       version = "1.2.0";
-       sha256 = "1y6rh1g7pi99jqq32xdv79yli9hmbfwjqg8ix1z2i2qkqqkr5iyn";
+       version = "1.2.1";
+       sha256 = "0sf87zjlrgjw7q6a0499g2ywx66zvpv6rg6953fjc18fnl8rs7z4";
        libraryHaskellDepends = [ base logict mtl pretty ];
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
@@ -251333,6 +251536,8 @@ self: {
        pname = "tasty-smallcheck";
        version = "0.8.2";
        sha256 = "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym";
+       revision = "1";
+       editedCabalFile = "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh";
        libraryHaskellDepends = [
          base optparse-applicative smallcheck tagged tasty
        ];
@@ -251364,8 +251569,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-sugar";
-       version = "1.0.0.0";
-       sha256 = "0nh8s3ma9xjyfn90ylgbywrd536px2bmvsibmjhy0lcjzbd37jwx";
+       version = "1.0.1.0";
+       sha256 = "1q5m6x5w95dds1f00sr6nn7lgs0q2g7ivdxd8ghfm529pss2143n";
        libraryHaskellDepends = [
          base directory filemanip filepath logict optparse-applicative
          prettyprinter tagged tasty
@@ -256009,8 +256214,8 @@ self: {
      }:
      mkDerivation {
        pname = "thock";
-       version = "0.2.0.0";
-       sha256 = "1wj3zldfqpa8xvk62qv13frhxmrjhrjismcb9iyblkrwlcxzfyns";
+       version = "0.2.1.0";
+       sha256 = "0s5xxmbxpr6g2j7797j8ix51405q7455s74x5dijfpi13phx7v94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -263412,6 +263617,8 @@ self: {
        pname = "type-natural";
        version = "0.9.0.0";
        sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a";
+       revision = "1";
+       editedCabalFile = "0iybmf7c6lzrbdyslhlwzd7z6sq9sdanfv3lrw1hmp7lrmnmrfij";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger singletons singletons-presburger
@@ -263421,6 +263628,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-natural_1_0_0_0" = callPackage
+    ({ mkDerivation, base, constraints, equational-reasoning, ghc
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise
+     , ghc-typelits-presburger, integer-logarithms, QuickCheck
+     , quickcheck-instances, tasty, tasty-discover
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "type-natural";
+       version = "1.0.0.0";
+       sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0";
+       libraryHaskellDepends = [
+         base constraints equational-reasoning ghc ghc-typelits-knownnat
+         ghc-typelits-natnormalise ghc-typelits-presburger
+         integer-logarithms template-haskell
+       ];
+       testHaskellDepends = [
+         base equational-reasoning integer-logarithms QuickCheck
+         quickcheck-instances tasty tasty-discover tasty-expected-failure
+         tasty-hunit tasty-quickcheck template-haskell
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Type-level natural and proofs of their properties";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-of-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
@@ -266183,8 +266418,6 @@ self: {
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A class for finite and recursively enumerable types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe-dependent-sum" = callPackage
@@ -266196,8 +266429,6 @@ self: {
        libraryHaskellDepends = [ base universe-some ];
        description = "Universe instances for types from dependent-sum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe-instances-base" = callPackage
@@ -266275,8 +266506,6 @@ self: {
        testHaskellDepends = [ base some template-haskell universe-base ];
        description = "Universe instances for Some from some";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universe-th" = callPackage
@@ -271711,6 +271940,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai_3_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-discover
+     , http-types, network, text, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.3";
+       sha256 = "1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m";
+       libraryHaskellDepends = [
+         base bytestring http-types network text vault
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-accept-language" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, http-types, text
      , wai, wai-app-static, wai-extra, warp, word8
@@ -271992,6 +272239,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_1_6" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, call-stack, case-insensitive, containers, cookie
+     , data-default-class, directory, fast-logger, hspec, http-types
+     , http2, HUnit, iproute, network, resourcet, streaming-commons
+     , text, time, transformers, unix, vault, wai, wai-logger, word8
+     , zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.1.6";
+       sha256 = "03bbhmy8dc2ivhgbsrc39wk5kb9ci4p98pb2qcq2w92imy710cj6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring bytestring call-stack
+         case-insensitive containers cookie data-default-class directory
+         fast-logger http-types http2 HUnit iproute network resourcet
+         streaming-commons text time transformers unix vault wai wai-logger
+         word8
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive cookie fast-logger hspec
+         http-types http2 HUnit iproute resourcet text time transformers wai
+         zlib
+       ];
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-feature-flags" = callPackage
     ({ mkDerivation, aeson, base, bytestring, random, text
      , unordered-containers, wai, warp
@@ -276168,19 +276446,22 @@ self: {
 
   "witherable" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
-     , indexed-traversable, indexed-traversable-instances, transformers
-     , transformers-compat, unordered-containers, vector
+     , indexed-traversable, indexed-traversable-instances, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.4";
-       sha256 = "086cqikx8x3yga3b25wgdmws46prx5i49rfb8c5cchp3ilksrxhi";
-       revision = "1";
-       editedCabalFile = "14if8lyjg8q1iml63y5bq8r0fjqpday31q3m49prl1hlarhl6yxs";
+       version = "0.4.1";
+       sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b";
        libraryHaskellDepends = [
          base base-orphans containers hashable indexed-traversable
-         indexed-traversable-instances transformers transformers-compat
-         unordered-containers vector
+         indexed-traversable-instances transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base containers hashable QuickCheck quickcheck-instances tasty
+         tasty-quickcheck transformers unordered-containers vector
        ];
        description = "filterable traversable";
        license = stdenv.lib.licenses.bsd3;
@@ -278887,30 +279168,6 @@ self: {
        broken = true;
      }) {};
 
-  "xml-conduit_1_8_0_1" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , bytestring, conduit, conduit-extra, containers
-     , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.8.0.1";
-       sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup bytestring conduit
-         conduit-extra containers data-default-class deepseq resourcet text
-         transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers doctest hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "xml-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers