Merge master into staging-next

25 files changed, 1747 insertions, 1428 deletions

diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index e052632ecaf..678894a521d 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -29,7 +29,7 @@
    <listitem>
     <para>
      <link xlink:href="https://www.gnuradio.org/">GNURadio</link> 3.8 was
-     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finnally</link>
+     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link>
      packaged, along with a rewrite to the Nix expressions, allowing users to
      override the features upstream supports selecting to compile or not to.
      Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code>
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 87990b6eae8..9db68f71ea8 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -1,27 +1,19 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
 , qtscript, poppler, hunspell
 , withLua ? true, lua
 , withPython ? true, python3 }:
 
 mkDerivation rec {
   pname = "texworks";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "TeXworks";
     repo = "texworks";
     rev = "release-${version}";
-    sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z";
+    sha256 = "0l8jl1b8lpas7yz6m0qc2nikyn54lx2ljzmjjz3zgxgd6l502006";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-compilation-with-qt-5.15.patch";
-      url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch";
-      sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6";
-    })
-  ];
-
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ qtscript poppler hunspell ]
                 ++ lib.optional withLua lua
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index f7ca7259415..945b0b32491 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
+{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }:
 
 stdenv.mkDerivation rec {
   pname = "todoist-electron";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+    makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \
       --add-flags $out/share/${pname}/resources/app.asar \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
   '';
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 581af59f0c8..847e3f64ca6 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,23 +2,20 @@
 
 buildGoModule rec {
   pname = "tektoncd-cli";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q=";
+    sha256 = "sha256-IyYlmatgcVbUj1WCPAFVOIgn1iHM80P4ie6d1YD3ISM=";
   };
 
   vendorSha256 = null;
 
-  buildFlagsArray = [
-    "-ldflags="
-    "-s"
-    "-w"
-    "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}"
-  ];
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
+  '';
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -40,6 +37,14 @@ buildGoModule rec {
       --zsh <($out/bin/tkn completion zsh)
   '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/tkn --help
+    $out/bin/tkn version | grep "Client version: ${version}"
+    runHook postInstallCheck
+  '';
+
   meta = with lib; {
     homepage = "https://tekton.dev";
     changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 441410ce138..ad242777ec1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -64,7 +64,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl";
+      sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -727,8 +727,19 @@ self: super: {
   # The tests spuriously fail
   libmpd = dontCheck super.libmpd;
 
+  # 2021-03-12: All of this libraries have to restrictive upper bounds
+  # https://github.com/diagrams/diagrams-core/issues/112
+  active = doJailbreak super.active;
+  statestack = doJailbreak super.statestack;
+  force-layout = doJailbreak super.force-layout;
+  size-based = doJailbreak super.size-based;
+  dual-tree = doJailbreak super.dual-tree;
+  diagrams-core = doJailbreak super.diagrams-core;
+  diagrams-postscript = doJailbreak super.diagrams-postscript;
+  diagrams-svg = doJailbreak super.diagrams-svg;
+  diagrams-contrib = doJailbreak super.diagrams-contrib;
   # https://github.com/diagrams/diagrams-lib/issues/288
-  diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
+  diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }));
 
   # https://github.com/danidiaz/streaming-eversion/issues/1
   streaming-eversion = dontCheck super.streaming-eversion;
@@ -1413,17 +1424,21 @@ self: super: {
   # https://github.com/haskell/haskell-language-server/issues/611
   haskell-language-server = dontCheck super.haskell-language-server;
 
-  # 2021-02-11: Jailbreaking because of syntax error on bound revision
-  hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
+  # 2021-03-09: Overrides because nightly is to old for hls 1.0.0
+  lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
 
-  # 2021-02-08: Overrides because nightly is to old for hls 0.9.0
-  lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7);
-  haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0;
-  haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0;
+  # 2021-03-09: Golden tests seem to be missing in hackage release:
+  # https://github.com/haskell/haskell-language-server/issues/1536
+  hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
 
-  # 1. test requires internet
-  # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
-  ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
+  # 2021-03-21 Test hangs
+  # https://github.com/haskell/haskell-language-server/issues/1562
+  ghcide = dontCheck super.ghcide;
+
+  # 2020-03-09: Tests broken in hackage release
+  # fixed on upstream, but not released in hiedb 0.3.0.1
+  # https://github.com/wz1000/HieDb/issues/30
+  hiedb = dontCheck super.hiedb;
 
   data-tree-print = doJailbreak super.data-tree-print;
 
@@ -1515,8 +1530,25 @@ self: super: {
   # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
   servant-swagger = dontCheck super.servant-swagger;
 
-  # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
-  hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
+  hercules-ci-agent = super.hercules-ci-agent.override {
+    cachix =
+      # https://github.com/cachix/cachix/pull/361
+      (appendPatch
+        (addBuildDepend super.cachix super.hercules-ci-cnix-store)
+        (pkgs.fetchpatch {
+          name = "cachix-361.patch";
+          url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
+          sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
+          stripLen = 1;
+          includes = ["*.cabal" "*.hs"];
+        })
+        );
+  };
+
+  hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
+    # See hercules-ci-optparse-applicative in non-hackage-packages.nix.
+    addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
+  );
 
   # 2020-12-05: http-client is fixed on too old version
   essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
@@ -1602,4 +1634,31 @@ self: super: {
     ];
   });
 
+  # cabal-install switched to build type simple in 3.2.0.0
+  # as a result, the cabal(1) man page is no longer installed
+  # automatically. Instead we need to use the `cabal man`
+  # command which generates the man page on the fly and
+  # install it to $out/share/man/man1 ourselves in this
+  # override.
+  # The commit that introduced this change:
+  # https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7
+  cabal-install = overrideCabal super.cabal-install (old: {
+    postInstall = old.postInstall + ''
+      mkdir -p "$out/share/man/man1"
+      "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
+    '';
+  });
+
+  # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
+  amazonka = appendPatches (doJailbreak super.amazonka) [
+    (pkgs.fetchpatch {
+      stripLen = 1;
+      url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
+      sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3";
+    })
+  ];
+
+  # Test suite does not compile.
+  feed = dontCheck super.feed;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 5e39a8047bd..f1af62b1f51 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -50,6 +50,12 @@ self: super: {
     random = super.random_1_2_0;
   };
 
+  # cabal-install-parsers is written for Cabal 3.4
+  cabal-install-parsers = super.cabal-install-parsers.override {
+    Cabal = super.Cabal_3_4_0_0;
+    base16-bytestring = super.base16-bytestring_1_0_1_0;
+  };
+
   # Jailbreak to fix the build.
   base-noprelude = doJailbreak super.base-noprelude;
   system-fileio = doJailbreak super.system-fileio;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index e6e0f690fe7..996d2182602 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -52,9 +52,15 @@ self: super: {
   haddock = self.haddock_2_23_1;
   haddock-api = self.haddock-api_2_23_1;
 
-  # These builds need Cabal 3.2.x.
+  # These builds need newer versions of Cabal.
   cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
+  cabal-install = super.cabal-install.override {
+    Cabal = super.Cabal_3_4_0_0;
+    hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
+    # Using dontCheck to break test dependency cycles
+    edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
+    random = super.random_1_2_0;
+  };
 
   # Ignore overly restrictive upper version bounds.
   aeson-diff = doJailbreak super.aeson-diff;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 0a41a91aaa3..e3099bfe510 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -93,4 +93,7 @@ self: super: {
   # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
   unordered-containers = dontCheck super.unordered-containers;
 
+  # The test suite seems pretty broken.
+  base64-bytestring = dontCheck super.base64-bytestring;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ca8b927cc17..263cf833b16 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -73,15 +73,8 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # Don't update yet to remain compatible with haskell-language-server-0.9.0.
-  - ghcide < 0.7.4
-  - hls-class-plugin < 1
-  - hls-explicit-imports-plugin < 0.1.0.1
-  - hls-haddock-comments-plugin < 1
-  - hls-plugin-api < 0.7.1.0
-  - hls-retrie-plugin < 0.1.1.1
-  - hls-tactics-plugin < 1
-  # Stackage Nightly 2021-03-01
+
+  # Stackage Nightly 2021-03-12
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -215,8 +208,8 @@ default-package-overrides:
   - amazonka-waf ==1.6.1
   - amazonka-workspaces ==1.6.1
   - amazonka-xray ==1.6.1
-  - amqp ==0.20.0.1
-  - amqp-utils ==0.4.5.1
+  - amqp ==0.21.0
+  - amqp-utils ==0.6.1.0
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.10.3
   - ansi-wl-pprint ==0.6.9
@@ -229,7 +222,7 @@ default-package-overrides:
   - ap-normalize ==0.1.0.0
   - appar ==0.1.8
   - appendmap ==0.1.5
-  - apply-refact ==0.9.1.0
+  - apply-refact ==0.9.2.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.4
   - approximate-equality ==1.1.0.2
@@ -271,7 +264,7 @@ default-package-overrides:
   - attoparsec-path ==0.0.0.1
   - audacity ==0.0.2
   - aur ==7.0.6
-  - aura ==3.2.3
+  - aura ==3.2.4
   - authenticate ==1.3.5
   - authenticate-oauth ==1.6.0.1
   - auto ==0.4.3.1
@@ -306,6 +299,8 @@ default-package-overrides:
   - basic-prelude ==0.7.0
   - bazel-runfiles ==0.12
   - bbdb ==0.8
+  - bcp47 ==0.2.0.3
+  - bcp47-orphans ==0.1.0.2
   - bcrypt ==0.0.11
   - bech32 ==1.1.0
   - bech32-th ==1.0.2
@@ -348,11 +343,11 @@ default-package-overrides:
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.2.1
   - blaze-html ==0.9.1.2
-  - blaze-markup ==0.8.2.7
+  - blaze-markup ==0.8.2.8
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - bmp ==1.2.6.3
-  - BNFC ==2.9.0
+  - BNFC ==2.9.1
   - board-games ==0.3
   - boltzmann-samplers ==0.1.1.0
   - Boolean ==0.2.4
@@ -427,7 +422,7 @@ default-package-overrides:
   - cassava-megaparsec ==2.0.2
   - cast ==0.1.0.2
   - category ==0.2.5.0
-  - cayley-client ==0.4.13
+  - cayley-client ==0.4.14
   - cborg ==0.2.4.0
   - cborg-json ==0.2.2.0
   - cereal ==0.5.8.1
@@ -462,7 +457,7 @@ default-package-overrides:
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
   - circular ==0.3.1.1
-  - citeproc ==0.3.0.7
+  - citeproc ==0.3.0.8
   - clash-ghc ==1.2.5
   - clash-lib ==1.2.5
   - clash-prelude ==1.2.5
@@ -525,17 +520,17 @@ default-package-overrides:
   - concurrent-split ==0.0.1.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.4
+  - conduit ==1.3.4.1
   - conduit-algorithms ==0.0.11.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
   - conduit-extra ==1.3.5
   - conduit-parse ==0.2.1.0
   - conduit-zstd ==0.0.2.0
-  - conferer ==1.0.0.1
-  - conferer-aeson ==1.0.0.0
-  - conferer-hspec ==1.0.0.0
-  - conferer-warp ==1.0.0.0
+  - conferer ==1.1.0.0
+  - conferer-aeson ==1.1.0.0
+  - conferer-hspec ==1.1.0.0
+  - conferer-warp ==1.1.0.0
   - ConfigFile ==1.1.4
   - config-ini ==0.2.4.0
   - configurator ==0.3.0.0
@@ -547,7 +542,7 @@ default-package-overrides:
   - constraint ==0.1.4.0
   - constraints ==0.12
   - constraint-tuples ==0.1.2
-  - construct ==0.3
+  - construct ==0.3.0.1
   - contravariant ==1.5.3
   - contravariant-extras ==0.3.5.2
   - control-bool ==0.2.1
@@ -658,7 +653,7 @@ default-package-overrides:
   - declarative ==0.5.4
   - deepseq-generics ==0.2.0.0
   - deepseq-instances ==0.1.0.1
-  - deferred-folds ==0.9.16
+  - deferred-folds ==0.9.17
   - dejafu ==2.4.0.1
   - dense-linear-algebra ==0.1.0.0
   - depq ==0.4.1.0
@@ -700,6 +695,7 @@ default-package-overrides:
   - doctemplates ==0.9
   - doctest ==0.16.3
   - doctest-discover ==0.2.0.0
+  - doctest-driver-gen ==0.3.0.3
   - doctest-exitcode-stdio ==0.0
   - doctest-lib ==0.1
   - doldol ==0.4.1.2
@@ -815,6 +811,7 @@ default-package-overrides:
   - fakedata-parser ==0.1.0.0
   - fakefs ==0.3.0.2
   - fakepull ==0.3.0.2
+  - faktory ==1.0.2.1
   - fast-digits ==0.3.0.0
   - fast-logger ==3.0.3
   - fast-math ==1.0.2
@@ -823,7 +820,7 @@ default-package-overrides:
   - feature-flags ==0.1.0.1
   - fedora-dists ==1.1.2
   - fedora-haskell-tools ==0.9
-  - feed ==1.3.0.1
+  - feed ==1.3.2.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
   - fgl ==5.7.0.3
@@ -840,7 +837,7 @@ default-package-overrides:
   - FindBin ==0.0.5
   - fingertree ==0.1.4.2
   - finite-typelits ==0.1.4.2
-  - first-class-families ==0.8.0.0
+  - first-class-families ==0.8.0.1
   - first-class-patterns ==0.3.2.5
   - fitspec ==0.4.8
   - fixed ==0.3
@@ -916,6 +913,7 @@ default-package-overrides:
   - generic-optics ==2.0.0.0
   - GenericPretty ==1.2.2
   - generic-random ==1.3.0.1
+  - generics-eot ==0.4.0.1
   - generics-sop ==0.5.1.1
   - generics-sop-lens ==0.2.0.1
   - geniplate-mirror ==0.7.7
@@ -934,8 +932,14 @@ default-package-overrides:
   - genvalidity-mergeful ==0.2.0.0
   - genvalidity-mergeless ==0.2.0.0
   - genvalidity-path ==0.3.0.4
+  - genvalidity-persistent ==0.0.0.0
   - genvalidity-property ==0.5.0.1
   - genvalidity-scientific ==0.2.1.1
+  - genvalidity-sydtest ==0.0.0.0
+  - genvalidity-sydtest-aeson ==0.0.0.0
+  - genvalidity-sydtest-hashable ==0.0.0.0
+  - genvalidity-sydtest-lens ==0.0.0.0
+  - genvalidity-sydtest-persistent ==0.0.0.1
   - genvalidity-text ==0.7.0.2
   - genvalidity-time ==0.3.0.0
   - genvalidity-typed-uuid ==0.0.0.2
@@ -1006,7 +1010,7 @@ default-package-overrides:
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.6.1
   - google-isbn ==1.0.3
-  - gothic ==0.1.5
+  - gothic ==0.1.6
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphite ==0.10.0.1
@@ -1028,9 +1032,9 @@ default-package-overrides:
   - hackage-db ==2.1.0
   - hackage-security ==0.6.0.1
   - haddock-library ==1.9.0
-  - hadolint ==1.22.1
+  - hadolint ==1.23.0
   - hadoop-streaming ==0.2.0.3
-  - hakyll-convert ==0.3.0.3
+  - hakyll-convert ==0.3.0.4
   - half ==0.3.1
   - hall-symbols ==0.1.0.6
   - hamtsolo ==1.0.3
@@ -1074,7 +1078,7 @@ default-package-overrides:
   - hdaemonize ==0.5.6
   - HDBC ==2.4.0.3
   - HDBC-session ==0.1.2.0
-  - headroom ==0.3.2.0
+  - headroom ==0.4.0.0
   - heap ==1.0.4
   - heaps ==0.3.6.1
   - hebrew-time ==0.1.2
@@ -1109,7 +1113,7 @@ default-package-overrides:
   - hlibcpuid ==0.2.0
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.10.1
-  - hmatrix ==0.20.1
+  - hmatrix ==0.20.2
   - hmatrix-backprop ==0.1.3.0
   - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.8
@@ -1163,6 +1167,7 @@ default-package-overrides:
   - hspec-core ==2.7.8
   - hspec-discover ==2.7.8
   - hspec-expectations ==0.8.2
+  - hspec-expectations-json ==1.0.0.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.5
   - hspec-golden ==0.1.0.3
@@ -1274,7 +1279,7 @@ default-package-overrides:
   - immortal-queue ==0.1.0.1
   - inbox ==0.1.0
   - include-file ==0.1.0.4
-  - incremental-parser ==0.5.0.1
+  - incremental-parser ==0.5.0.2
   - indents ==0.5.0.1
   - indexed ==0.1.3
   - indexed-containers ==0.1.0.2
@@ -1290,7 +1295,7 @@ default-package-overrides:
   - inline-c-cpp ==0.4.0.3
   - inline-r ==0.10.4
   - inliterate ==0.1.0
-  - input-parsers ==0.1.0.1
+  - input-parsers ==0.2.1
   - insert-ordered-containers ==0.2.4
   - inspection-testing ==0.4.3.0
   - instance-control ==0.1.2.0
@@ -1317,7 +1322,7 @@ default-package-overrides:
   - io-streams ==1.5.2.0
   - io-streams-haproxy ==1.0.1.0
   - ip6addr ==1.0.1
-  - iproute ==1.7.10
+  - iproute ==1.7.11
   - IPv6Addr ==1.1.5
   - ipynb ==0.1.0.1
   - ipython-kernel ==0.10.2.1
@@ -1546,16 +1551,16 @@ default-package-overrides:
   - mixed-types-num ==0.4.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
-  - mmark ==0.0.7.2
+  - mmark ==0.0.7.3
   - mmark-cli ==0.0.5.0
-  - mmark-ext ==0.2.1.2
+  - mmark-ext ==0.2.1.3
   - mmorph ==1.1.5
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
   - mock-time ==0.1.0
   - mod ==0.1.2.1
   - model ==0.5
-  - modern-uri ==0.3.4.0
+  - modern-uri ==0.3.4.1
   - modular ==0.1.0.8
   - monad-chronicle ==1.0.0.1
   - monad-control ==1.0.2.3
@@ -1673,8 +1678,9 @@ default-package-overrides:
   - no-value ==1.0.0.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.3
-  - nri-env-parser ==0.1.0.4
-  - nri-prelude ==0.4.0.0
+  - nri-env-parser ==0.1.0.5
+  - nri-observability ==0.1.0.0
+  - nri-prelude ==0.5.0.0
   - nsis ==0.3.3
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
@@ -1690,7 +1696,7 @@ default-package-overrides:
   - ObjectName ==1.1.0.1
   - o-clock ==1.2.0.1
   - odbc ==0.2.2
-  - oeis2 ==1.0.4
+  - oeis2 ==1.0.5
   - ofx ==0.4.4.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
@@ -1702,7 +1708,7 @@ default-package-overrides:
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.7.1.0
   - OpenAL ==1.7.0.5
-  - openapi3 ==3.0.1.0
+  - openapi3 ==3.0.2.0
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.2
   - OpenGL ==3.0.3.0
@@ -1733,10 +1739,10 @@ default-package-overrides:
   - packcheck ==0.5.1
   - packdeps ==0.6.0.0
   - pager ==0.1.1.0
-  - pagination ==0.2.1
+  - pagination ==0.2.2
   - pagure-cli ==0.2
   - pandoc ==2.11.4
-  - pandoc-plot ==1.0.2.1
+  - pandoc-plot ==1.1.0
   - pandoc-types ==1.22
   - pantry ==0.5.1.4
   - parallel ==3.2.2.0
@@ -1907,7 +1913,7 @@ default-package-overrides:
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.14.0.0
   - pushbullet-types ==0.4.1.0
-  - pusher-http-haskell ==2.0.0.3
+  - pusher-http-haskell ==2.1.0.0
   - pvar ==1.0.0.0
   - PyF ==0.9.0.3
   - qchas ==1.1.0.1
@@ -1968,7 +1974,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
   - rebase ==1.6.1
-  - record-dot-preprocessor ==0.2.9
+  - record-dot-preprocessor ==0.2.10
   - record-hasfield ==1.0
   - records-sop ==0.1.0.3
   - record-wrangler ==0.1.1.0
@@ -2042,6 +2048,7 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.6
   - safe ==0.3.19
+  - safe-coloured-text ==0.0.0.0
   - safecopy ==0.10.4.1
   - safe-decimal ==0.2.0.0
   - safe-exceptions ==0.1.7.1
@@ -2095,7 +2102,7 @@ default-package-overrides:
   - seqalign ==0.2.0.4
   - seqid ==0.6.2
   - seqid-streams ==0.7.2
-  - sequence-formats ==1.6.0
+  - sequence-formats ==1.6.1
   - sequenceTools ==1.4.0.5
   - serf ==0.1.1.0
   - serialise ==0.2.3.0
@@ -2216,7 +2223,7 @@ default-package-overrides:
   - squeal-postgresql ==0.7.0.1
   - squeather ==0.6.0.0
   - srcloc ==0.5.1.2
-  - stache ==2.2.0
+  - stache ==2.2.1
   - stackcollapse-ghc ==0.0.1.3
   - stack-templatizer ==0.1.0.2
   - stateref ==0.3
@@ -2265,14 +2272,14 @@ default-package-overrides:
   - string-random ==0.1.4.0
   - stringsearch ==0.3.6.6
   - string-transform ==1.1.1
-  - stripe-concepts ==1.0.2.4
+  - stripe-concepts ==1.0.2.6
   - stripe-core ==2.6.2
   - stripe-haskell ==2.6.2
   - stripe-http-client ==2.6.2
   - stripe-tests ==2.6.2
   - strive ==5.0.13
   - structs ==0.1.5
-  - structured ==0.1
+  - structured ==0.1.0.1
   - structured-cli ==2.6.0.0
   - subcategories ==0.1.0.0
   - sum-type-boilerplate ==0.1.1
@@ -2284,6 +2291,12 @@ default-package-overrides:
   - sweet-egison ==0.1.1.3
   - swish ==0.10.0.4
   - syb ==0.7.2.1
+  - sydtest ==0.1.0.0
+  - sydtest-discover ==0.0.0.0
+  - sydtest-persistent-sqlite ==0.0.0.0
+  - sydtest-servant ==0.0.0.0
+  - sydtest-wai ==0.0.0.0
+  - sydtest-yesod ==0.0.0.0
   - symbol ==0.2.4
   - symengine ==0.1.2.0
   - symmetry-operations-symbols ==0.0.2.1
@@ -2531,13 +2544,14 @@ default-package-overrides:
   - utility-ht ==0.0.15
   - uuid ==1.3.14
   - uuid-types ==1.0.4
-  - validation ==1.1
+  - validation ==1.1.1
   - validation-selective ==0.1.0.0
   - validity ==0.11.0.0
   - validity-aeson ==0.2.0.4
   - validity-bytestring ==0.4.1.1
   - validity-containers ==0.5.0.4
   - validity-path ==0.4.0.1
+  - validity-persistent ==0.0.0.0
   - validity-primitive ==0.0.0.1
   - validity-scientific ==0.2.0.3
   - validity-text ==0.3.1.1
@@ -2669,16 +2683,17 @@ default-package-overrides:
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.5.0
-  - yamlparse-applicative ==0.1.0.2
+  - yamlparse-applicative ==0.1.0.3
   - yesod ==1.6.1.0
   - yesod-auth ==1.6.10.1
   - yesod-auth-hashdb ==1.7.1.5
-  - yesod-auth-oauth2 ==0.6.1.7
+  - yesod-auth-oauth2 ==0.6.2.3
   - yesod-bin ==1.6.1
   - yesod-core ==1.6.18.8
   - yesod-fb ==0.6.1
   - yesod-form ==1.6.7
   - yesod-gitrev ==0.2.1
+  - yesod-markdown ==0.12.6.6
   - yesod-newsfeed ==1.7.0.0
   - yesod-page-cursor ==2.0.0.4
   - yesod-paginator ==1.1.1.0
@@ -2790,8 +2805,12 @@ package-maintainers:
   roberth:
     - arion-compose
     - hercules-ci-agent
+    - hercules-ci-api
     - hercules-ci-api-agent
     - hercules-ci-api-core
+    - hercules-ci-cli
+    - hercules-ci-cnix-expr
+    - hercules-ci-cnix-store
   cdepillabout:
     - pretty-simple
     - spago
@@ -2807,6 +2826,7 @@ package-maintainers:
     - releaser
     - taskwarrior
     - haskell-language-server
+    - shake-bench
   sorki:
     - cayene-lpp
     - data-stm32
@@ -3070,7 +3090,6 @@ broken-packages:
   - acme-zero
   - acousticbrainz-client
   - ActionKid
-  - active
   - activehs
   - activehs-base
   - activitypub
@@ -3181,7 +3200,6 @@ broken-packages:
   - amazon-emailer
   - amazon-emailer-client-snap
   - amazon-products
-  - amazonka
   - amazonka-s3-streaming
   - amby
   - AMI
@@ -3837,7 +3855,6 @@ broken-packages:
   - cabal-install-bundle
   - cabal-install-ghc72
   - cabal-install-ghc74
-  - cabal-install-parsers
   - cabal-lenses
   - cabal-meta
   - cabal-mon
@@ -3988,7 +4005,6 @@ broken-packages:
   - character-cases
   - charade
   - chart-cli
-  - Chart-diagrams
   - Chart-fltkhs
   - chart-histogram
   - Chart-simple
@@ -4679,27 +4695,21 @@ broken-packages:
   - dhrun
   - dia-base
   - dia-functions
-  - diagrams
   - diagrams-boolean
   - diagrams-braille
   - diagrams-builder
   - diagrams-cairo
   - diagrams-canvas
-  - diagrams-contrib
-  - diagrams-core
   - diagrams-graphviz
   - diagrams-gtk
   - diagrams-haddock
   - diagrams-html5
-  - diagrams-lib
   - diagrams-pandoc
   - diagrams-pdf
   - diagrams-pgf
-  - diagrams-postscript
   - diagrams-qrcode
   - diagrams-rasterific
   - diagrams-rubiks-cube
-  - diagrams-svg
   - diagrams-tikz
   - diagrams-wx
   - dib
@@ -4807,7 +4817,6 @@ broken-packages:
   - docrecords
   - DocTest
   - doctest-discover-configurator
-  - doctest-driver-gen
   - doctest-prop
   - docusign-base
   - docusign-base-minimal
@@ -4870,7 +4879,6 @@ broken-packages:
   - dtd
   - dtd-text
   - dtw
-  - dual-tree
   - dualizer
   - duet
   - dumb-cas
@@ -5151,8 +5159,6 @@ broken-packages:
   - FailureT
   - fake
   - fake-type
-  - fakedata
-  - fakedata-quickcheck
   - faktory
   - falling-turnip
   - fallingblocks
@@ -5344,7 +5350,6 @@ broken-packages:
   - foo
   - for-free
   - forbidden-fruit
-  - force-layout
   - fordo
   - forecast-io
   - foreign-var
@@ -6454,7 +6459,6 @@ broken-packages:
   - hid-examples
   - hidden-char
   - hie-core
-  - hiedb
   - hieraclus
   - hierarchical-clustering-diagrams
   - hierarchical-exceptions
@@ -8165,7 +8169,6 @@ broken-packages:
   - Monocle
   - monoid
   - monoid-absorbing
-  - monoid-extras
   - monoid-owns
   - monoidplus
   - monoids
@@ -10002,6 +10005,7 @@ broken-packages:
   - sha1
   - shade
   - shadower
+  - shake-bench
   - shake-bindist
   - shake-cabal-build
   - shake-dhall
@@ -10115,7 +10119,6 @@ broken-packages:
   - sirkel
   - sitepipe
   - sixfiguregroup
-  - size-based
   - sized-grid
   - sized-types
   - sized-vector
@@ -10395,7 +10398,6 @@ broken-packages:
   - state-plus
   - state-record
   - stateful-mtl
-  - statestack
   - static-canvas
   - static-closure
   - static-tensor
@@ -10484,7 +10486,6 @@ broken-packages:
   - strictly
   - string-isos
   - string-quote
-  - string-random
   - string-typelits
   - stringlike
   - stringtable-atom
@@ -10542,12 +10543,10 @@ broken-packages:
   - sv-svfactor
   - SVD2HS
   - svfactor
-  - svg-builder
   - svg-builder-fork
   - SVG2Q
   - svg2q
   - svgcairo
-  - SVGFonts
   - svgone
   - svgutils
   - svm-light-utils
@@ -10746,7 +10745,6 @@ broken-packages:
   - testbench
   - testCom
   - testcontainers
-  - testing-feat
   - testloop
   - testpack
   - testpattern
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 21aa86ee5a4..492b8ac72d3 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -446,9 +446,6 @@ self: super: builtins.intersectAttrs super {
   # requires an X11 display in test suite
   gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
 
-  # depends on 'hie' executable
-  lsp-test = dontCheck super.lsp-test;
-
   # tests depend on executable
   ghcide = overrideCabal super.ghcide (drv: {
     preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';
@@ -812,4 +809,11 @@ self: super: builtins.intersectAttrs super {
   # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
   # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
   hadolint = disableCabalFlag super.hadolint "static";
+
+  # Test suite tries to execute the build product "doctest-driver-gen", but it's not in $PATH.
+  doctest-driver-gen = dontCheck super.doctest-driver-gen;
+
+  # Tests access internet
+  prune-juice = dontCheck super.prune-juice;
+
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 44f0b4ec51b..81fc6341938 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1285,34 +1285,6 @@ self: {
      }:
      mkDerivation {
        pname = "BNFC";
-       version = "2.9.0";
-       sha256 = "1h5365978q43r4sik1kmbrxnxa6lxnb54lhp7bi9599rnav8nw0z";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array base containers deepseq directory filepath mtl pretty process
-         string-qq time
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         array base containers deepseq directory doctest filepath hspec
-         HUnit mtl pretty process QuickCheck string-qq temporary time
-       ];
-       testToolDepends = [ alex happy hspec-discover ];
-       description = "A compiler front-end generator";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "BNFC_2_9_1" = callPackage
-    ({ mkDerivation, alex, array, base, Cabal, cabal-doctest
-     , containers, deepseq, directory, doctest, filepath, happy, hspec
-     , hspec-discover, HUnit, mtl, pretty, process, QuickCheck
-     , string-qq, temporary, time
-     }:
-     mkDerivation {
-       pname = "BNFC";
        version = "2.9.1";
        sha256 = "0670in07lr9fgkx0c7zci8rn8c7g8nimkmpzy5w9swfp4rp3gbkk";
        isLibrary = true;
@@ -1331,7 +1303,6 @@ self: {
        testToolDepends = [ alex happy hspec-discover ];
        description = "A compiler front-end generator";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -3071,8 +3042,6 @@ self: {
        ];
        description = "Diagrams backend for Charts";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "Chart-fltkhs" = callPackage
@@ -10969,8 +10938,8 @@ self: {
        pname = "HsYAML";
        version = "0.2.1.0";
        sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0";
-       revision = "1";
-       editedCabalFile = "0bfwdwwj5wgqrrbw1cwaxwxy9970dzln7w20f21mlg2l374wnqvf";
+       revision = "2";
+       editedCabalFile = "0f7867jfzlmlqnkv3fjrzjvvfzjlvhbm10kmg7n0qk69ic8grkbc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11857,8 +11826,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.2";
        sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
-       revision = "5";
-       editedCabalFile = "0aar0h109fiy6pads3rlmhjsaj5528yn4zay5ps0zf8yb9dyd82s";
+       revision = "6";
+       editedCabalFile = "0np8wqf0s0pwqnjfhs8zw9h133p2x173xbv984c4dn5a1xhn0azq";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -17363,8 +17332,8 @@ self: {
      }:
      mkDerivation {
        pname = "RtMidi";
-       version = "0.4.0.0";
-       sha256 = "075j6d7vmihyz33b5ikv2l0c0alnhjzy1wpnzdrca6l201vab2mw";
+       version = "0.5.0.0";
+       sha256 = "0yb52a4c03x28nbq8shpzqsczr04ngi0fa1hw0mflhql5rzd7yy5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq unliftio-core vector ];
@@ -17911,8 +17880,6 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "SVGPath" = callPackage
@@ -22010,6 +21977,8 @@ self: {
        pname = "Z-Data";
        version = "0.7.0.0";
        sha256 = "1b4ycsq5g459ynp989kldq6r3ssawr64a2hp3dzy804pwrp8v62m";
+       revision = "1";
+       editedCabalFile = "057si6f4hz5kda3gyr2b8kni17dmv28z82b64qi142gjr3gx415i";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq ghc-prim
@@ -22036,8 +22005,8 @@ self: {
      }:
      mkDerivation {
        pname = "Z-IO";
-       version = "0.6.4.0";
-       sha256 = "1d651q0xda38652n249swh84kkn2jgw63db01aia00304h9cbcgf";
+       version = "0.7.0.0";
+       sha256 = "1yw0ym2iw1hi3jn2xrp1hwi6vbv69d0fpvvz3n2328v4i0ryjdjf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23910,8 +23879,6 @@ self: {
        ];
        description = "Abstractions for animation";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "activehs" = callPackage
@@ -25337,15 +25304,19 @@ self: {
      }) {};
 
   "aeson-via" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, text
+    ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, tasty
+     , tasty-hunit, text
      }:
      mkDerivation {
        pname = "aeson-via";
-       version = "0.1.0";
-       sha256 = "0zlx4pxfh3qll8ymfya0rfqx3gd7ag0wag86fa8fvni6h07ynryf";
+       version = "0.1.1";
+       sha256 = "18b1pxvkrva6531v8x38vhqmyj48iddi49vgc79s0jx8sgb39l8d";
        libraryHaskellDepends = [
          aeson aeson-casing base newtype-generics text
        ];
+       testHaskellDepends = [
+         aeson aeson-casing base newtype-generics tasty tasty-hunit text
+       ];
        description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses";
        license = lib.licenses.bsd3;
      }) {};
@@ -26547,17 +26518,17 @@ self: {
   "algorithmic-composition-basic" = callPackage
     ({ mkDerivation, base, bytestring, directory, foldable-ix
      , mmsyn2-array, mmsyn3, mmsyn7l, mmsyn7ukr-common
-     , phonetic-languages-simplified-base, process
+     , phonetic-languages-simplified-base, process, process-sequential
      , ukrainian-phonetics-basic-array
      }:
      mkDerivation {
        pname = "algorithmic-composition-basic";
-       version = "0.2.2.0";
-       sha256 = "0ij3yh29mxkj9zph33g3r46afh3s4vhqxmhkpnm2mgzad7xqca2m";
+       version = "0.3.1.0";
+       sha256 = "0vpqi398nhlawh7dipfzvq6zsk1g9gpjbr35mizm5rms4sj3mfsk";
        libraryHaskellDepends = [
          base bytestring directory foldable-ix mmsyn2-array mmsyn3 mmsyn7l
          mmsyn7ukr-common phonetic-languages-simplified-base process
-         ukrainian-phonetics-basic-array
+         process-sequential ukrainian-phonetics-basic-array
        ];
        description = "Helps to create experimental music from a file (or its part) and a Ukrainian text";
        license = lib.licenses.mit;
@@ -26599,6 +26570,17 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "algorithmic-composition-overtones" = callPackage
+    ({ mkDerivation, algorithmic-composition-basic, base }:
+     mkDerivation {
+       pname = "algorithmic-composition-overtones";
+       version = "0.1.0.0";
+       sha256 = "0phdwds12jmv7dp88z6lk6h58jayn9cpjn1sgrglymgww87h88d9";
+       libraryHaskellDepends = [ algorithmic-composition-basic base ];
+       description = "Some variants of the overtones functions to generate a timbre";
+       license = lib.licenses.mit;
+     }) {};
+
   "align" = callPackage
     ({ mkDerivation, base, containers, transformers, vector }:
      mkDerivation {
@@ -27196,8 +27178,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-alexa-business" = callPackage
@@ -29674,8 +29654,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.20.0.1";
-       sha256 = "10qj4776b3sjifij3qic2bafd01jn8s0pfgm1yd74nyhjx50s19p";
+       version = "0.21.0";
+       sha256 = "1sni1bl2rmc2fq2zla0h093acd7yisfdizd5wrxclammzav7x0gk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29740,28 +29720,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-utils";
-       version = "0.4.5.1";
-       sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         amqp base bytestring connection containers data-default-class
-         directory hinotify magic network process text time tls unix
-         utf8-string x509-system
-       ];
-       description = "AMQP toolset for the command line";
-       license = lib.licenses.gpl3;
-     }) {};
-
-  "amqp-utils_0_5_0_0" = callPackage
-    ({ mkDerivation, amqp, base, bytestring, connection, containers
-     , data-default-class, directory, hinotify, magic, network, process
-     , text, time, tls, unix, utf8-string, x509-system
-     }:
-     mkDerivation {
-       pname = "amqp-utils";
-       version = "0.5.0.0";
-       sha256 = "140awzxj14h9wa13wfl15dqndqvyy046zmyg0q643r40nbyggl8r";
+       version = "0.6.1.0";
+       sha256 = "0h0mjgaiyhhx8y6zd3zxm1jzd0vgc6crq3980l5cal0zv6vs9zc1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29771,7 +29731,6 @@ self: {
        ];
        description = "AMQP toolset for the command line";
        license = lib.licenses.gpl3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "amqp-worker" = callPackage
@@ -31943,8 +31902,8 @@ self: {
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.9.1.0";
-       sha256 = "1b9ib5ix643aagzsw5vk8d789a784pggsm6qv36bxkcsx89s2bjm";
+       version = "0.9.2.0";
+       sha256 = "1j0afdl6g51wyb3g47wss15v0yl50n23k3icbyla8h89rxh74lcx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33697,6 +33656,8 @@ self: {
        pname = "asciidiagram";
        version = "1.3.3.3";
        sha256 = "09k1kdaa0xi2fx9vfdlv2w2nxx5x1vnlkz7gp8s998a325w1x7q1";
+       revision = "1";
+       editedCabalFile = "1j7p9smyfmkayx6n7inssxcg9cr4zdm6329fpvba7504b96aprdk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35504,8 +35465,8 @@ self: {
      }:
      mkDerivation {
        pname = "aura";
-       version = "3.2.3";
-       sha256 = "1gq4nkwil64h4armg39vbl3wjsbnqsa0vg5b41kq19dp9rmpfsp5";
+       version = "3.2.4";
+       sha256 = "0d3v3kpy4acd7pyysy5dw25b4154v7jwgydipmrczfxicrf02aa0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36601,8 +36562,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-lambda-haskell-runtime-wai";
-       version = "2.0.0";
-       sha256 = "1m95hcfl72v9rrks0clzrz3md35jsk5jgc5ds81vrknzxr0b0fgj";
+       version = "2.0.1";
+       sha256 = "13h0cxmxzr7bgma1ry1yj9dhqzqvh5sgzv6nqyvb0xy8n3gysbcn";
        libraryHaskellDepends = [
          aeson aws-lambda-haskell-runtime base binary bytestring
          case-insensitive http-types iproute network text
@@ -38471,8 +38432,8 @@ self: {
        pname = "basement";
        version = "0.0.11";
        sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37";
-       revision = "2";
-       editedCabalFile = "1l95bzmn23cmx386hk3d3r0ykdaibh9rp489lcnba5g56kiy4hxg";
+       revision = "3";
+       editedCabalFile = "1indgsrk0yhkbqlxj39qqb5xqicwkmcliggb8wn87vgfswxpi1dn";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
        license = lib.licenses.bsd3;
@@ -40476,6 +40437,21 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "binary-generic-combinators" = callPackage
+    ({ mkDerivation, base, binary, generic-arbitrary, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "binary-generic-combinators";
+       version = "0.4.2.0";
+       sha256 = "1z1ngjcssb0nrkyd1chklmv19xf2qz7vqh2idsvkxa67ryp5g4a3";
+       libraryHaskellDepends = [ base binary QuickCheck ];
+       testHaskellDepends = [
+         base binary generic-arbitrary hspec QuickCheck
+       ];
+       description = "Combinators and utilities to make Generic-based deriving of Binary easier and more expressive";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "binary-ieee754" = callPackage
     ({ mkDerivation, array, base, binary }:
      mkDerivation {
@@ -40784,8 +40760,8 @@ self: {
        pname = "binary-tagged";
        version = "0.3";
        sha256 = "1bvzwhdjxxr7b3lk23rwcygi34d6a5mairi2j2gh7k3p8983fgss";
-       revision = "1";
-       editedCabalFile = "1swaxiyz16wmsi0qdm9nfs56ld37hg9vqp73j3lvdq84f1s0ck2l";
+       revision = "2";
+       editedCabalFile = "0h397jzajqiw01nf7fkjmqzsmzd08d1z6f9ff2rvcj4s6wsqkik8";
        libraryHaskellDepends = [
          array base base16-bytestring binary bytestring containers
          structured tagged
@@ -43581,6 +43557,8 @@ self: {
        pname = "blaze-html";
        version = "0.9.1.2";
        sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30";
+       revision = "1";
+       editedCabalFile = "0wvlfb3rd9cm3p894p5rl9kggrsr5da3n8x9ydrbagx91yvkxns9";
        libraryHaskellDepends = [
          base blaze-builder blaze-markup bytestring text
        ];
@@ -43669,23 +43647,6 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-markup";
-       version = "0.8.2.7";
-       sha256 = "1r4fij8qs1z4dfrh6cjzjbnx9f3jyx01zgj15wvy961d8bnqjr4b";
-       libraryHaskellDepends = [ base blaze-builder bytestring text ];
-       testHaskellDepends = [
-         base blaze-builder bytestring containers HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck text
-       ];
-       description = "A blazingly fast markup combinator library for Haskell";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "blaze-markup_0_8_2_8" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "blaze-markup";
        version = "0.8.2.8";
        sha256 = "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23";
        libraryHaskellDepends = [ base blaze-builder bytestring text ];
@@ -43695,7 +43656,6 @@ self: {
        ];
        description = "A blazingly fast markup combinator library for Haskell";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "blaze-shields" = callPackage
@@ -48851,8 +48811,6 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -50254,8 +50212,8 @@ self: {
      }:
      mkDerivation {
        pname = "camfort";
-       version = "1.0";
-       sha256 = "1lgsn1jin57677j8xia7ga4pdvs0yrs9spdmm9rbncxcz5c3nf52";
+       version = "1.0.1";
+       sha256 = "1jwlkrf4aja71sbxxlxsd7syh6sb4vgv2pb18mvj5ppm6al2ykp3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52033,8 +51991,8 @@ self: {
      }:
      mkDerivation {
        pname = "cayley-client";
-       version = "0.4.13";
-       sha256 = "1sak0rg9gydcwk7ahx51czp3akispxrkkfgq94n6hgg3dqvm646l";
+       version = "0.4.14";
+       sha256 = "1hczhvqqpx8kqg90h5qb2vjindn4crxmq6lwbj8ix45fnkijv4xg";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -54869,32 +54827,6 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.3.0.7";
-       sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring case-insensitive containers
-         data-default file-embed filepath pandoc-types rfc5051 safe
-         scientific text transformers uniplate vector xml-conduit
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath mtl pretty
-         text timeit transformers
-       ];
-       description = "Generates citations and bibliography from CSL styles";
-       license = lib.licenses.bsd2;
-     }) {};
-
-  "citeproc_0_3_0_8" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring
-     , case-insensitive, containers, data-default, Diff, directory
-     , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe
-     , scientific, text, timeit, transformers, uniplate, vector
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "citeproc";
        version = "0.3.0.8";
        sha256 = "0njlb37cxnpikwz9k92d689j477fz9x7chl58s3ljsw9drcgpcvh";
        isLibrary = true;
@@ -54910,7 +54842,6 @@ self: {
        ];
        description = "Generates citations and bibliography from CSL styles";
        license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -55293,6 +55224,38 @@ self: {
        broken = true;
      }) {};
 
+  "clash-ghc_1_4_0" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
+     , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
+     , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp
+     , lens, mtl, primitive, process, reflection, split
+     , template-haskell, text, time, transformers, uniplate, unix
+     , unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "1.4.0";
+       sha256 = "18nm5x6rk69pd506yqp4pwp1i56x81bb56ly9x7adkmjk7j3l6y2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bifunctors bytestring Cabal clash-lib clash-prelude
+         concurrent-supply containers deepseq directory exceptions extra
+         filepath ghc ghc-boot ghc-prim ghc-typelits-extra
+         ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable
+         haskeline integer-gmp lens mtl primitive process reflection split
+         template-haskell text time transformers uniplate unix
+         unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Clash: a functional hardware description language - GHC frontend";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "clash-lib" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
      , bytestring, clash-prelude, concurrent-supply, containers
@@ -55332,6 +55295,50 @@ self: {
        broken = true;
      }) {};
 
+  "clash-lib_1_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array
+     , attoparsec, base, base16-bytestring, binary, bytestring
+     , clash-prelude, concurrent-supply, containers, cryptohash-sha256
+     , data-binary-ieee754, data-default, deepseq, directory, dlist
+     , errors, exceptions, extra, filepath, ghc, ghc-boot-th
+     , ghc-typelits-knownnat, hashable, haskell-src-exts
+     , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl
+     , ordered-containers, parsers, pretty-show, prettyprinter
+     , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, terminal-size
+     , text, text-show, time, transformers, trifecta
+     , unordered-containers, utf8-string, vector
+     , vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "1.4.0";
+       sha256 = "1i0zmz26p35hfp89s45s6g7x2rvhyjc3lrx35r06cnllw6xvp60z";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal array attoparsec base
+         base16-bytestring binary bytestring clash-prelude concurrent-supply
+         containers cryptohash-sha256 data-binary-ieee754 data-default
+         deepseq directory dlist errors exceptions extra filepath ghc
+         ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
+         lens mtl ordered-containers parsers pretty-show prettyprinter
+         primitive process reducers template-haskell temporary terminal-size
+         text text-show time transformers trifecta unordered-containers
+         utf8-string vector vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base base16-bytestring bytestring clash-prelude
+         concurrent-supply containers data-default deepseq ghc
+         ghc-typelits-knownnat haskell-src-exts lens pretty-show
+         quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell
+         text transformers unordered-containers
+       ];
+       description = "Clash: a functional hardware description language - As a library";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "clash-multisignal" = callPackage
     ({ mkDerivation, base, clash-prelude, deepseq
      , ghc-typelits-knownnat, QuickCheck
@@ -55388,6 +55395,48 @@ self: {
        broken = true;
      }) {};
 
+  "clash-prelude_1_4_0" = callPackage
+    ({ mkDerivation, array, arrows, base, bifunctors, binary
+     , bytestring, Cabal, cabal-doctest, constraints, containers
+     , criterion, data-binary-ieee754, data-default-class, deepseq
+     , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, half, hashable, hedgehog, hint
+     , integer-gmp, interpolate, lens, QuickCheck
+     , quickcheck-classes-base, recursion-schemes, reflection
+     , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+     , tasty-th, template-haskell, text, text-show, th-abstraction
+     , th-lift, th-orphans, time, transformers, type-errors, uniplate
+     , vector
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "1.4.0";
+       sha256 = "168gjdjj9v69gr4d44njly70qr30nz3z4gfdy4nd4pay377i6vlw";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array arrows base bifunctors binary bytestring constraints
+         containers data-binary-ieee754 data-default-class deepseq ghc-prim
+         ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
+         half hashable integer-gmp interpolate lens QuickCheck
+         recursion-schemes reflection singletons template-haskell text
+         text-show th-abstraction th-lift th-orphans time transformers
+         type-errors uniplate vector
+       ];
+       testHaskellDepends = [
+         base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base
+         tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
+         template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq template-haskell
+       ];
+       description = "Clash: a functional hardware description language - Prelude library";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "clash-prelude-quickcheck" = callPackage
     ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
@@ -57539,8 +57588,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.3.17";
-       sha256 = "1x289bmzrj1yrr934b51v3amldhjdanjv4kxnay89n8avix899yw";
+       version = "0.1.3.18";
+       sha256 = "1xyri98rlg4ph9vyjicivq8vb1kk085pbpv43ydw6qvpqlp97wk5";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -58053,8 +58102,8 @@ self: {
      }:
      mkDerivation {
        pname = "coinbase-pro";
-       version = "0.9.0.0";
-       sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1";
+       version = "0.9.2.0";
+       sha256 = "0x7wmm123rf7zk9802bymx1b9pbsnmzhkabyacwini01gb56bwxy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60877,34 +60926,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.4";
-       sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       description = "Streaming data processing library";
-       license = lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_4_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, kan-extensions
-     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
-     , resourcet, safe, silently, split, text, transformers, unix
-     , unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
        version = "1.3.4.1";
        sha256 = "1w96q9nqxvl1s9js1rrzy9x711jpkj8mm6s5nz67jmrdby6knx45";
        libraryHaskellDepends = [
@@ -60922,7 +60943,6 @@ self: {
        ];
        description = "Streaming data processing library";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -61428,25 +61448,6 @@ self: {
      }:
      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 = lib.licenses.mpl20;
-     }) {};
-
-  "conferer_1_1_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , filepath, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "conferer";
        version = "1.1.0.0";
        sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09";
        libraryHaskellDepends = [
@@ -61458,7 +61459,6 @@ self: {
        ];
        description = "Configuration management library";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conferer-aeson" = callPackage
@@ -61467,28 +61467,10 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-aeson";
-       version = "1.0.0.0";
-       sha256 = "0adqblmpbyqfqybgmjnnwsnaxw8qiqvw5c2bj4avsikz7fhcp0nl";
-       libraryHaskellDepends = [
-         aeson base bytestring conferer directory text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base bytestring conferer directory hspec text
-         unordered-containers vector
-       ];
-       description = "conferer's source for reading json files";
-       license = lib.licenses.mpl20;
-     }) {};
-
-  "conferer-aeson_1_1_0_0" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
-     , directory, hspec, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "conferer-aeson";
        version = "1.1.0.0";
        sha256 = "0kslxj2wcycygj07x7v06fcx2i47dwp96da9djws6mjdmr1a9i96";
+       revision = "1";
+       editedCabalFile = "1ic6nichx1c3s7fnr2q90hzm1qykg8rkqfwl2k5yhhwb1fdnhb6q";
        libraryHaskellDepends = [
          aeson base bytestring conferer directory text unordered-containers
          vector
@@ -61499,7 +61481,6 @@ self: {
        ];
        description = "conferer's source for reading json files";
        license = lib.licenses.mpl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "conferer-dhall" = callPackage
@@ -61510,6 +61491,8 @@ self: {
        pname = "conferer-dhall";
        version = "1.1.0.0";
        sha256 = "0whxxjz5askw1qxcxdn5094bqm2hy3zp49567v57gqikgv6rcnp1";
+       revision = "1";
+       editedCabalFile = "1bbc5a3iy5fcp7ahxndhfg8v0sk74q0hs00miiv8gqg7f3l5b20j";
        libraryHaskellDepends = [
          base bytestring conferer conferer-aeson dhall dhall-json directory
          text
@@ -61528,8 +61511,8 @@ self: {
     ({ mkDerivation, base, conferer, hedis, hspec, text }:
      mkDerivation {
        pname = "conferer-hedis";
-       version = "1.0.0.0";
-       sha256 = "0x150z08x1grzr80fdpkbxprldn08908fgz2mpg3qg219nx4r5n2";
+       version = "1.1.0.0";
+       sha256 = "10rk5w3f99ql46yvzg7a0ac59dvpyfhdpv138w0w5ghgz5azcd19";
        libraryHaskellDepends = [ base conferer hedis text ];
        testHaskellDepends = [ base conferer hedis hspec text ];
        description = "conferer's FromConfig instances for hedis settings";
@@ -61540,8 +61523,8 @@ self: {
     ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
      mkDerivation {
        pname = "conferer-hspec";
-       version = "1.0.0.0";
-       sha256 = "02c4z2999pa04r78n8xzx7idvgg028wlb2fgyk0878wb1gahzsxp";
+       version = "1.1.0.0";
+       sha256 = "0q9v26df3c2rxll6rk2zmmd9yrpqz1j1wdp59qlw2s6c2w7dxq35";
        libraryHaskellDepends = [ base conferer hspec-core text ];
        testHaskellDepends = [ base conferer hspec hspec-core text ];
        description = "conferer's FromConfig instances for hspec Config";
@@ -61620,6 +61603,8 @@ self: {
        pname = "conferer-snap";
        version = "1.0.0.0";
        sha256 = "15gz77b5jf35hmcnd6kza1wgzpbgk3pcvhi7mp7yk64ybksld98r";
+       revision = "1";
+       editedCabalFile = "08bji5mw7lzxpx9s1mlim5nfcz7j6828zj75pn670jfip0in4j19";
        libraryHaskellDepends = [
          base conferer snap-core snap-server text
        ];
@@ -61698,8 +61683,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-warp";
-       version = "1.0.0.0";
-       sha256 = "14wrd50dfgc2m6lyfvsx4w605r8krf6ha96j3685vgy6fylff1bd";
+       version = "1.1.0.0";
+       sha256 = "0zbgxq229jr7xwzw6q20rwnslbci07b1vk324izm8hxcp3kb76mj";
        libraryHaskellDepends = [ base conferer http-types text wai warp ];
        testHaskellDepends = [
          base conferer hspec http-types text wai warp
@@ -61714,6 +61699,8 @@ self: {
        pname = "conferer-yaml";
        version = "1.1.0.0";
        sha256 = "0pqxwwaskj96virs65p7cb6shkjbczmnqwla7rbfga2l0rw9ww0r";
+       revision = "1";
+       editedCabalFile = "0lw22wp8ivza6inm17pbjvr9mwj6p778wn6w6975hb8gf3wa8grf";
        libraryHaskellDepends = [ base conferer conferer-aeson yaml ];
        testHaskellDepends = [ base conferer conferer-aeson hspec yaml ];
        description = "Configuration for reading yaml files";
@@ -61837,10 +61824,10 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "1.2.1.0";
-       sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf";
+       version = "1.2.2.0";
+       sha256 = "10mp76j2gxcb51865lb6cf3nkc2nc7fwarkghb6yz71q6sbrg3yx";
        revision = "1";
-       editedCabalFile = "056iks8k9lhbv34pqk8nisqc7vwzqq0shknixbpkd3vgbd3yksyf";
+       editedCabalFile = "0wswgb6m2whyxddm214fbrq69d9i2wrr6j2hhq1dn8p3gx91q3kv";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -62616,8 +62603,8 @@ self: {
      }:
      mkDerivation {
        pname = "construct";
-       version = "0.3";
-       sha256 = "06h3b1lbq0gdpzz2q5ga0dpgbvyh186z1brzslrwdmkp8qxx883x";
+       version = "0.3.0.1";
+       sha256 = "09x70cvfvkl2rw3r850whw3rbc47yp2w66qmfjzdd9fki31612kc";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -63710,15 +63697,14 @@ self: {
      }:
      mkDerivation {
        pname = "copilot";
-       version = "3.2";
-       sha256 = "1d1b70kal17aiflhvzz59ahc6iyyln3d70xvhjjjh7j7la03xm8h";
+       version = "3.2.1";
+       sha256 = "1gxa2sc6n7hswkzqrr9dzzgwynw7sdvccyigfhm7gcy1l79gl3iq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base copilot-c99 copilot-core copilot-language copilot-libraries
          copilot-theorem directory filepath optparse-applicative
        ];
-       executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -63733,8 +63719,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-c99";
-       version = "3.2";
-       sha256 = "0q0v8xwmcbvi2yvz0nn1kc3ms0i3g74f2k66gwhnznnvldr99qh2";
+       version = "3.2.1";
+       sha256 = "0wi4bd0hmh05z6m7mjl69z1arhnw08v75hnwzxl6dibkrymmq286";
        libraryHaskellDepends = [
          base containers copilot-core directory filepath language-c99
          language-c99-simple language-c99-util mtl pretty
@@ -63771,8 +63757,8 @@ self: {
     ({ mkDerivation, base, dlist, mtl, pretty }:
      mkDerivation {
        pname = "copilot-core";
-       version = "3.2";
-       sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga";
+       version = "3.2.1";
+       sha256 = "1h9wqv75s49vvqagcdkxx8n5vwn0fsh271v2jm60msssdd7ljwp6";
        libraryHaskellDepends = [ base dlist mtl pretty ];
        description = "An intermediate representation for Copilot";
        license = lib.licenses.bsd3;
@@ -63784,8 +63770,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-language";
-       version = "3.2";
-       sha256 = "1vx2i20ndphcb7gl252wnk2bim2dcg3552yfa0rpkh8axkiwmnpa";
+       version = "3.2.1";
+       sha256 = "03r50k3i24rzjkc1maklq7351flzjv3cc2i6d1shib3dklzjsw8l";
        libraryHaskellDepends = [
          array base containers copilot-core copilot-theorem data-reify
          ghc-prim mtl
@@ -63802,8 +63788,8 @@ self: {
      }:
      mkDerivation {
        pname = "copilot-libraries";
-       version = "3.2";
-       sha256 = "0sjl6bk2fzba2zj0m41si0i2jr8pcwf96zc1vscwmhfg48hqxjg1";
+       version = "3.2.1";
+       sha256 = "1grcpc9lmqvsi3cb9j45w6hvqdljv7z0yylxf3i2i5y931gj6gpv";
        libraryHaskellDepends = [
          array base containers copilot-language data-reify mtl parsec
        ];
@@ -63831,17 +63817,19 @@ self: {
      }) {};
 
   "copilot-theorem" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bimap, containers
-     , copilot-core, data-default, directory, mtl, parsec, pretty
-     , process, random, transformers, xml
+    ({ mkDerivation, ansi-terminal, base, bimap, bv-sized, containers
+     , copilot-core, data-default, directory, filepath, mtl, panic
+     , parameterized-utils, parsec, pretty, process, random
+     , transformers, what4, xml
      }:
      mkDerivation {
        pname = "copilot-theorem";
-       version = "3.2";
-       sha256 = "1l0vmxlrygvxq23nvjss8x53qlfhbshp5vlh3cs6mviv1hmpbg7v";
+       version = "3.2.1";
+       sha256 = "1vns5bavlm95hc57qwwjpzaq0xj5pv3dk2n1ac0rbjdbpsa3dl4l";
        libraryHaskellDepends = [
-         ansi-terminal base bimap containers copilot-core data-default
-         directory mtl parsec pretty process random transformers xml
+         ansi-terminal base bimap bv-sized containers copilot-core
+         data-default directory filepath mtl panic parameterized-utils
+         parsec pretty process random transformers what4 xml
        ];
        description = "k-induction for Copilot";
        license = lib.licenses.bsd3;
@@ -65711,8 +65699,8 @@ self: {
        pname = "crypt-sha512";
        version = "0";
        sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
-       revision = "4";
-       editedCabalFile = "0a4282bhh21l7vk79hpgcz7kj9n05r0ilgdksjkimkydg7sxgldb";
+       revision = "5";
+       editedCabalFile = "0gyfz45izn6s7syd028bbwczp4a8qfhbkbvpir5ssfhqbql4qsv1";
        libraryHaskellDepends = [
          attoparsec base bytestring cryptohash-sha512
        ];
@@ -66815,8 +66803,8 @@ self: {
      }:
      mkDerivation {
        pname = "css-selectors";
-       version = "0.2.0.0";
-       sha256 = "1wyc06f14nj5v5ysjly3jimja3y47pvnm8vm2knlw3sli1h0pgxi";
+       version = "0.2.1.0";
+       sha256 = "1kcxbvp96imhkdrd7w9g2z4d586lmdcpnbgl8g5w04ri85qsq162";
        libraryHaskellDepends = [
          aeson array base blaze-markup data-default Decimal QuickCheck
          shakespeare template-haskell text
@@ -72135,28 +72123,6 @@ self: {
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.9.16";
-       sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1";
-       libraryHaskellDepends = [
-         base bytestring containers foldl hashable primitive text
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "Abstractions over deferred folds";
-       license = lib.licenses.mit;
-     }) {};
-
-  "deferred-folds_0_9_17" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "deferred-folds";
        version = "0.9.17";
        sha256 = "1dn7ylqsqrc5s734xc4bsif6f53hg84i8w7zi929pikjl7xkbrch";
        libraryHaskellDepends = [
@@ -72169,7 +72135,6 @@ self: {
        ];
        description = "Abstractions over deferred folds";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "definitive-base" = callPackage
@@ -74328,8 +74293,6 @@ self: {
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -74474,8 +74437,6 @@ self: {
        ];
        description = "Collection of user contributions to diagrams EDSL";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-core" = callPackage
@@ -74495,8 +74456,6 @@ self: {
        ];
        description = "Core libraries for diagrams EDSL";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -74633,8 +74592,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion diagrams-core ];
        description = "Embedded domain-specific language for declarative graphics";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -74722,8 +74679,6 @@ self: {
        ];
        description = "Postscript backend for diagrams drawing EDSL";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -74836,8 +74791,6 @@ self: {
        ];
        description = "SVG backend for diagrams drawing EDSL";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -76005,8 +75958,8 @@ self: {
        pname = "directory";
        version = "1.3.6.1";
        sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi";
-       revision = "1";
-       editedCabalFile = "1rf2w9gx0vy74mgsf5q1y82bhm5ngb9mi0i2v2h6ss9gscyvgb7j";
+       revision = "2";
+       editedCabalFile = "14kwmqa1pf1bij7qang5aihw38ch7m5prsics0p0y72jkxx98y48";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -78357,8 +78310,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "doctest-exitcode-stdio" = callPackage
@@ -79845,20 +79796,20 @@ self: {
 
   "dsv" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cassava, containers
-     , doctest, foldl, hedgehog, pipes, pipes-bytestring, pipes-safe
+     , foldl, hedgehog, pipes, pipes-bytestring, pipes-safe
      , safe-exceptions, template-haskell, text, validation, vector
      }:
      mkDerivation {
        pname = "dsv";
-       version = "1.0.0.0";
-       sha256 = "0fjfpa8qfaiy7wxmq9lsacxywrsqahl8s8wamxfiai7mzq2201gn";
+       version = "1.0.0.1";
+       sha256 = "1lf6fan0mis0hs30yfpslfyj0gpk028z24wca3lylq877pq7z6nz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring cassava containers foldl pipes
          pipes-bytestring pipes-safe template-haskell text validation vector
        ];
        testHaskellDepends = [
-         base bytestring containers doctest foldl hedgehog safe-exceptions
+         base bytestring containers foldl hedgehog pipes safe-exceptions
          text vector
        ];
        description = "DSV (delimiter-separated values)";
@@ -80014,8 +79965,6 @@ self: {
        ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "dualizer" = callPackage
@@ -88484,8 +88433,6 @@ self: {
        ];
        description = "Library for producing fake data";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "fakedata-parser" = callPackage
@@ -88513,8 +88460,6 @@ self: {
        ];
        description = "Fake a -> Gen a";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "fakefs" = callPackage
@@ -88565,8 +88510,8 @@ self: {
      }:
      mkDerivation {
        pname = "faktory";
-       version = "1.0.2.0";
-       sha256 = "1i16g4sj5qrbyldyylggcammr2fs0dvi9hc986ijpv3iy0ryqkmw";
+       version = "1.0.2.1";
+       sha256 = "0n1pcchzb5bxhykdjdri84g0hnbrzd76brpqqx8f6yhwll5vaxsq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89740,27 +89685,25 @@ self: {
      }) {};
 
   "feed" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, HUnit
-     , markdown-unlit, old-locale, old-time, safe, syb, test-framework
-     , test-framework-hunit, text, time, time-locale-compat, utf8-string
-     , xml-conduit, xml-types
+    ({ mkDerivation, base, base-compat, bytestring, doctest
+     , doctest-driver-gen, HUnit, markdown-unlit, old-locale, old-time
+     , safe, syb, test-framework, test-framework-hunit, text, time
+     , time-locale-compat, utf8-string, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "feed";
-       version = "1.3.0.1";
-       sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj";
-       revision = "1";
-       editedCabalFile = "0wlffsawz87ks8zf686q01qvcwzi3352l45f1yww5w063ih6j7ld";
+       version = "1.3.2.0";
+       sha256 = "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
          time-locale-compat utf8-string xml-conduit xml-types
        ];
        testHaskellDepends = [
-         base base-compat HUnit old-time syb test-framework
-         test-framework-hunit text time xml-conduit xml-types
+         base base-compat doctest doctest-driver-gen HUnit old-time syb
+         test-framework test-framework-hunit text time xml-conduit xml-types
        ];
-       testToolDepends = [ markdown-unlit ];
+       testToolDepends = [ doctest-driver-gen markdown-unlit ];
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = lib.licenses.bsd3;
      }) {};
@@ -90680,8 +90623,8 @@ self: {
        pname = "file-embed-lzma";
        version = "0";
        sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78";
-       revision = "5";
-       editedCabalFile = "1rkya7m491b3asfhpygwz97gzfh46f9h1bi6b4isbslpj50k2h6l";
+       revision = "6";
+       editedCabalFile = "0m2ay6krrjs2cgmy7divlavx0wvgwhwgba97f1m3ppcxxm1y4ikv";
        libraryHaskellDepends = [
          base base-compat bytestring directory filepath lzma
          template-haskell text th-lift-instances transformers
@@ -91550,16 +91493,14 @@ self: {
      }) {};
 
   "first-class-families" = callPackage
-    ({ mkDerivation, base, doctest, Glob }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "first-class-families";
-       version = "0.8.0.0";
-       sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav";
-       revision = "1";
-       editedCabalFile = "02z6wixk9kdgshxsz99lag29lb70kadg9wn6vsgk906wj014fv52";
+       version = "0.8.0.1";
+       sha256 = "0wnsq69f2br9h9hnf8sx41pchwjag86hb41ivjl7wx81psyqy72a";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest Glob ];
-       description = "First class type families";
+       testHaskellDepends = [ base ];
+       description = "First-class type families";
        license = lib.licenses.mit;
      }) {};
 
@@ -91766,6 +91707,24 @@ self: {
        broken = true;
      }) {};
 
+  "fix-whitespace" = callPackage
+    ({ mkDerivation, base, directory, extra, filepath, filepattern
+     , text, yaml
+     }:
+     mkDerivation {
+       pname = "fix-whitespace";
+       version = "0.0.5";
+       sha256 = "1774h18dqarkbsdq47cx1zrxx0k1a7asxngz85yz5vrc2aa37hy7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory extra filepath filepattern text yaml
+       ];
+       description = "Fixes whitespace issues";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fixed" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -92757,10 +92716,8 @@ self: {
      }:
      mkDerivation {
        pname = "flock";
-       version = "0.3.1.8";
-       sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
-       revision = "6";
-       editedCabalFile = "04cz4avwglnjgmsbkaadlfrzaadcfkcqzrbc4x9nbzi695zs8k21";
+       version = "0.3.2";
+       sha256 = "0zi04gmrjda11zp8y7zx6r9hkz00wplvjj7sn6q7lbm2h5kv20xr";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
@@ -93928,8 +93885,6 @@ self: {
        ];
        description = "Simple force-directed layout";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "fordo" = callPackage
@@ -99901,6 +99856,32 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "genvalidity-persistent" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, genvalidity
+     , genvalidity-containers, genvalidity-criterion, genvalidity-hspec
+     , hspec, persistent, persistent-template, QuickCheck
+     , validity-containers, validity-persistent
+     }:
+     mkDerivation {
+       pname = "genvalidity-persistent";
+       version = "0.0.0.0";
+       sha256 = "01gnwvfa1hlyr35rafvdb9rz8axbnqw7nl182wf6j4pjy40iff17";
+       libraryHaskellDepends = [
+         base containers genvalidity genvalidity-containers persistent
+         QuickCheck validity-containers validity-persistent
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec persistent
+         persistent-template QuickCheck validity-containers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq genvalidity genvalidity-criterion persistent
+         persistent-template
+       ];
+       description = "GenValidity support for Persistent";
+       license = lib.licenses.mit;
+     }) {};
+
   "genvalidity-property" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, pretty-show, QuickCheck, validity
@@ -99935,6 +99916,107 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "genvalidity-sydtest" = callPackage
+    ({ mkDerivation, base, genvalidity, pretty-show, QuickCheck
+     , sydtest, sydtest-discover, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-sydtest";
+       version = "0.0.0.0";
+       sha256 = "1jgrhdjxin1zwgf2b03fpcfivyq30idnh2qcw3604bsq5cn0wca0";
+       libraryHaskellDepends = [
+         base genvalidity pretty-show QuickCheck sydtest validity
+       ];
+       testHaskellDepends = [ base genvalidity QuickCheck sydtest ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Standard properties for functions on `Validity` types for the sydtest framework";
+       license = lib.licenses.mit;
+     }) {};
+
+  "genvalidity-sydtest-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, genvalidity
+     , genvalidity-aeson, genvalidity-sydtest, genvalidity-text
+     , QuickCheck, sydtest, sydtest-discover, text, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-sydtest-aeson";
+       version = "0.0.0.0";
+       sha256 = "1lpiinb06hl8y91nxp4n4id2vyxs3yww5wb5jczpr9fk1fbb6qbz";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq genvalidity genvalidity-sydtest
+         QuickCheck sydtest
+       ];
+       testHaskellDepends = [
+         aeson base genvalidity genvalidity-aeson genvalidity-sydtest
+         genvalidity-text QuickCheck sydtest text validity
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Standard spec's for aeson-related instances in sydtest";
+       license = lib.licenses.mit;
+     }) {};
+
+  "genvalidity-sydtest-hashable" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-sydtest, hashable
+     , QuickCheck, sydtest, sydtest-discover, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-sydtest-hashable";
+       version = "0.0.0.0";
+       sha256 = "0ii3s69alncyrjz410d1cvx5rgdff1cyc9ddin0xrsrz23sxi06m";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-sydtest hashable QuickCheck sydtest
+         validity
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-sydtest hashable QuickCheck sydtest
+         validity
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Standard spec's for Hashable instances for sydtest";
+       license = lib.licenses.mit;
+     }) {};
+
+  "genvalidity-sydtest-lens" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-sydtest, microlens
+     , QuickCheck, sydtest, sydtest-discover, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-sydtest-lens";
+       version = "0.0.0.0";
+       sha256 = "1f8wb0pa703r6hgdbhi343rfjcf2q78qfn6x3dmc94d3vd17wyvj";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-sydtest microlens QuickCheck sydtest
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-sydtest microlens sydtest validity
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Standard spec's for lens for sydtest";
+       license = lib.licenses.mit;
+     }) {};
+
+  "genvalidity-sydtest-persistent" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-sydtest
+     , genvalidity-text, persistent, QuickCheck, sydtest
+     , sydtest-discover, text, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-sydtest-persistent";
+       version = "0.0.0.1";
+       sha256 = "07y7478lcmpb44bwj7pppv4pfb44wh9hynwawx1czkjf6jnggwcm";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-sydtest persistent QuickCheck sydtest
+         text
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-sydtest genvalidity-text persistent
+         QuickCheck sydtest text validity
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "Standard spec's for persistent-related instances for sydtest";
+       license = lib.licenses.mit;
+     }) {};
+
   "genvalidity-text" = callPackage
     ({ mkDerivation, array, base, criterion, genvalidity
      , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck
@@ -100749,6 +100831,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "ghc-events_0_16_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "ghc-events";
+       version = "0.16.0";
+       sha256 = "0cr6aj4v9j2fadwhhifjlbg4anyc05phfmy3pvd9h7gn12a2ydr9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers text vector
+       ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base ];
+       description = "Library and tool for parsing .eventlog files from GHC";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "ghc-events-analyze" = callPackage
     ({ mkDerivation, base, blaze-svg, bytestring, containers
      , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens
@@ -101054,14 +101156,14 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib-parser-ex_9_0_0_3" = callPackage
+  "ghc-lib-parser-ex_9_0_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, extra
      , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "9.0.0.3";
-       sha256 = "1kc6p5ciymq8rbgk4jj1hawmjhkj1yjzkxj9jjyqlgzs09i3dsw3";
+       version = "9.0.0.4";
+       sha256 = "11j1k26h7px9fydrwi5x9d9ckivc4xdsw4gzb7xhpzdq60f8af66";
        libraryHaskellDepends = [
          base bytestring containers ghc-lib-parser uniplate
        ];
@@ -101507,6 +101609,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "ghc-syntax-highlighter_0_0_7_0" = callPackage
+    ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text
+     }:
+     mkDerivation {
+       pname = "ghc-syntax-highlighter";
+       version = "0.0.7.0";
+       sha256 = "123kvcdlzx18n14122xbpp587byfd8w0z886grlxkzinb53bmzg6";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ghc-lib-parser text ];
+       testHaskellDepends = [ base hspec text ];
+       testToolDepends = [ hspec-discover ];
+       description = "Syntax highlighter for Haskell using lexer of GHC itself";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "ghc-tags-core" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion
      , deepseq, directory, filepath, filepath-bytestring, ghc, lattices
@@ -101958,68 +102076,6 @@ self: {
 
   "ghcide" = callPackage
     ({ mkDerivation, aeson, array, async, base, base16-bytestring
-     , binary, bytestring, case-insensitive, containers, cryptohash-sha1
-     , data-default, deepseq, directory, dlist, extra, filepath
-     , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
-     , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
-     , haddock-library, hashable, haskell-lsp, haskell-lsp-types
-     , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty
-     , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
-     , opentelemetry, optparse-applicative, parallel, prettyprinter
-     , prettyprinter-ansi-terminal, process, QuickCheck
-     , quickcheck-instances, record-dot-preprocessor, record-hasfield
-     , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
-     , shake, shake-bench, sorted-list, stm, syb, tasty
-     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, text, time, transformers, unix, unordered-containers
-     , utf8-string, vector, yaml
-     }:
-     mkDerivation {
-       pname = "ghcide";
-       version = "0.7.3.0";
-       sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array async base base16-bytestring binary bytestring
-         case-insensitive containers cryptohash-sha1 data-default deepseq
-         directory dlist extra filepath fingertree fuzzy ghc ghc-boot
-         ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library
-         hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat
-         hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri
-         opentelemetry parallel prettyprinter prettyprinter-ansi-terminal
-         regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake
-         sorted-list stm syb text time transformers unix
-         unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers data-default directory extra
-         filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
-         hie-bios hls-plugin-api lens lsp-test optparse-applicative process
-         safe-exceptions shake text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base binary bytestring containers data-default directory
-         extra filepath ghc ghc-typelits-knownnat haddock-library
-         haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test
-         network-uri optparse-applicative process QuickCheck
-         quickcheck-instances record-dot-preprocessor record-hasfield
-         rope-utf16-splay safe safe-exceptions shake tasty
-         tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
-         text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base directory filepath shake shake-bench text yaml
-       ];
-       benchmarkToolDepends = [ hp2pretty ];
-       description = "The core of an IDE";
-       license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {shake-bench = null;};
-
-  "ghcide_1_0_0_0" = callPackage
-    ({ mkDerivation, aeson, array, async, base, base16-bytestring
      , binary, bytestring, bytestring-encoding, case-insensitive
      , containers, cryptohash-sha1, data-default, deepseq, dependent-map
      , dependent-sum, Diff, directory, dlist, extra, filepath
@@ -102079,9 +102135,7 @@ self: {
        benchmarkToolDepends = [ hp2pretty implicit-hie ];
        description = "The core of an IDE";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {shake-bench = null;};
+     }) {};
 
   "ghcjs-ajax" = callPackage
     ({ mkDerivation, aeson, base, http-types, text }:
@@ -103804,8 +103858,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20210223";
-       sha256 = "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832";
+       version = "8.20210310";
+       sha256 = "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -105346,15 +105400,15 @@ self: {
      , bytestring, Cabal, config-schema, config-value, containers
      , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
      , HUnit, irc-core, kan-extensions, lens, network, process, psqueues
-     , random, regex-tdfa, semigroupoids, split, stm, template-haskell
-     , text, time, transformers, unix, unordered-containers, vector, vty
+     , random, regex-tdfa, split, stm, template-haskell, text, time
+     , transformers, unix, unordered-containers, vector, vty
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.37";
-       sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn";
+       version = "2.38";
+       sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7";
        revision = "1";
-       editedCabalFile = "19y9hhn24w6lqdwv1skijrvj5plqs3xqcz3h8wv1ax8g8ak07xsx";
+       editedCabalFile = "04f35w57jq6gpi6d3d83c9bswwl724rbd0dbl835ilhl18kpfscj";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -105362,8 +105416,8 @@ self: {
          async attoparsec base base64-bytestring bytestring config-schema
          config-value containers directory filepath free gitrev hashable
          hookup HsOpenSSL irc-core kan-extensions lens network process
-         psqueues random regex-tdfa semigroupoids split stm template-haskell
-         text time transformers unix unordered-containers vector vty
+         psqueues random regex-tdfa split stm template-haskell text time
+         transformers unix unordered-containers vector vty
        ];
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
@@ -109208,8 +109262,8 @@ self: {
      }:
      mkDerivation {
        pname = "gothic";
-       version = "0.1.5";
-       sha256 = "1f8n15cxh4c5m3pylssfksiw3qary8jkl7wabq4gl5zqw2r9ki62";
+       version = "0.1.6";
+       sha256 = "0p1hc4gpgn0djvyksc9nyi4r4lqapk6x5vfv2x514szw8z11h44s";
        libraryHaskellDepends = [
          aeson base binary bytestring connection exceptions hashable
          http-client http-client-tls http-conduit http-types lens lens-aeson
@@ -109497,22 +109551,22 @@ self: {
      }) {};
 
   "grammatical-parsers" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest
-     , checkers, containers, criterion, deepseq, doctest, input-parsers
+    ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, checkers
+     , containers, criterion, deepseq, doctest, input-parsers
      , markdown-unlit, monoid-subclasses, parsers, QuickCheck
      , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat
-     , text, transformers
+     , text, transformers, witherable-class
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.5";
-       sha256 = "1kf3wwbk1skp6cm78h6fs2494597sdz82gaq5zx3cwfzgn4swmgx";
+       version = "0.5.1";
+       sha256 = "1y5w49bcfbadchy580q5dnkgl0k5daqykc2jhz8yai94pr43ishg";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         attoparsec base bytestring containers input-parsers
-         monoid-subclasses parsers rank2classes transformers
+         attoparsec base containers input-parsers monoid-subclasses parsers
+         rank2classes transformers witherable-class
        ];
        executableHaskellDepends = [
          base containers monoid-subclasses parsers rank2classes
@@ -113444,8 +113498,8 @@ self: {
        pname = "hackage-repo-tool";
        version = "0.1.1.2";
        sha256 = "1zgsmibi24w2wsd828hnls1yv9lrl9xwsi2aay3d603j8mg8vd0r";
-       revision = "1";
-       editedCabalFile = "1x8cqmfyc168jrmvg2c8as1gj4qys10hyr71nmcyskvqrk5bsxf8";
+       revision = "2";
+       editedCabalFile = "1djx6x1y6d7j319ba211hl7scwh4pfyd7vrrbvhdralwnwsx5zkp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113471,8 +113525,8 @@ self: {
        pname = "hackage-security";
        version = "0.6.0.1";
        sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli";
-       revision = "4";
-       editedCabalFile = "06d4xqmpqarisxlm0sp87w2z9rl62p08z5ra5swkvfwn36i9zr15";
+       revision = "5";
+       editedCabalFile = "0vr2fcgp3pjjnp0sy7mvbabqh92215alw62f70pjys9i4z1ks977";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -113496,6 +113550,8 @@ self: {
        pname = "hackage-security-HTTP";
        version = "0.1.1.1";
        sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2";
+       revision = "1";
+       editedCabalFile = "18b22jjg5nbfvb83yc36gy25y9v5d1p4z2n89cazzn16hlf813xk";
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
@@ -113990,35 +114046,6 @@ self: {
      }) {};
 
   "hadolint" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit
-     , language-docker, megaparsec, mtl, optparse-applicative, parallel
-     , ShellCheck, split, text, void
-     }:
-     mkDerivation {
-       pname = "hadolint";
-       version = "1.22.1";
-       sha256 = "0138hn6c7lrq9xjsmngdj1h2m2ayxx6wqqgjw66pv7sgxsfy0zji";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers cryptonite directory
-         filepath HsYAML language-docker megaparsec mtl parallel ShellCheck
-         split text void
-       ];
-       executableHaskellDepends = [
-         base containers gitrev language-docker megaparsec
-         optparse-applicative text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec HsYAML HUnit language-docker megaparsec
-         ShellCheck split text
-       ];
-       description = "Dockerfile Linter JavaScript API";
-       license = lib.licenses.gpl3;
-     }) {};
-
-  "hadolint_1_23_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, colourista
      , containers, cryptonite, deepseq, directory, filepath, gitrev
      , hspec, HsYAML, HUnit, ilist, language-docker, megaparsec, mtl
@@ -114045,7 +114072,6 @@ self: {
        ];
        description = "Dockerfile Linter JavaScript API";
        license = lib.licenses.gpl3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -114753,10 +114779,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-convert";
-       version = "0.3.0.3";
-       sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf";
-       revision = "2";
-       editedCabalFile = "0jzc6c8z173mcvrndxny5dx24mx5p10p7pkp68lkl1jl135np6bp";
+       version = "0.3.0.4";
+       sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118541,49 +118565,51 @@ self: {
      }) {};
 
   "haskell-language-server" = callPackage
-    ({ mkDerivation, aeson, base, binary, blaze-markup, brittany
-     , bytestring, containers, data-default, deepseq, directory, extra
-     , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths
-     , ghcide, gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin
-     , hls-eval-plugin, hls-explicit-imports-plugin
-     , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api
-     , hls-retrie-plugin, hls-splice-plugin, hls-tactics-plugin
-     , hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test
+    ({ mkDerivation, aeson, async, base, base16-bytestring, binary
+     , blaze-markup, brittany, bytestring, containers, cryptohash-sha1
+     , data-default, deepseq, directory, extra, filepath, floskell
+     , fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev
+     , hashable, hie-bios, hiedb, hls-class-plugin, hls-eval-plugin
+     , hls-explicit-imports-plugin, hls-haddock-comments-plugin
+     , hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
+     , hls-splice-plugin, hls-tactics-plugin, hslogger, hspec
+     , hspec-core, hspec-expectations, lens, lsp, lsp-test, megaparsec
      , mtl, optparse-applicative, optparse-simple, ormolu, process
-     , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty
-     , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
-     , tasty-rerun, temporary, text, transformers, unordered-containers
-     , with-utf8, yaml
+     , regex-tdfa, safe-exceptions, shake, sqlite-simple, stm
+     , stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure
+     , tasty-golden, tasty-hunit, tasty-rerun, temporary, text
+     , transformers, unordered-containers, with-utf8, yaml
      }:
      mkDerivation {
        pname = "haskell-language-server";
-       version = "0.9.0.0";
-       sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm";
-       revision = "7";
-       editedCabalFile = "11dfc9887aq521ywm0m5gpmihvvkypkr3y1cfk6afg210ij6ka40";
+       version = "1.0.0.0";
+       sha256 = "0jchps7rwsbfq1fsyyf4jgxb4b11d8c3iaq2p4c5vz7vz2d6w1s3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-default directory extra filepath ghc ghcide
-         gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
-         optparse-simple process shake text unordered-containers
+         async base base16-bytestring bytestring containers cryptohash-sha1
+         data-default directory extra filepath ghc ghcide gitrev hie-bios
+         hiedb hls-plugin-api hslogger lsp optparse-applicative
+         optparse-simple process safe-exceptions shake sqlite-simple text
+         unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base binary brittany bytestring containers deepseq directory
-         extra filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths
-         ghcide gitrev hashable haskell-lsp hie-bios hls-class-plugin
-         hls-eval-plugin hls-explicit-imports-plugin
-         hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api
-         hls-retrie-plugin hls-splice-plugin hls-tactics-plugin hslogger
-         lens mtl optparse-applicative optparse-simple ormolu process
-         regex-tdfa safe-exceptions shake stylish-haskell temporary text
-         transformers unordered-containers with-utf8
+         aeson async base base16-bytestring binary brittany bytestring
+         containers cryptohash-sha1 data-default deepseq directory extra
+         filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide
+         gitrev hashable hie-bios hiedb hls-class-plugin hls-eval-plugin
+         hls-explicit-imports-plugin hls-haddock-comments-plugin
+         hls-hlint-plugin hls-plugin-api hls-retrie-plugin hls-splice-plugin
+         hls-tactics-plugin hslogger lens lsp mtl optparse-applicative
+         optparse-simple ormolu process regex-tdfa safe-exceptions shake
+         sqlite-simple stylish-haskell temporary text transformers
+         unordered-containers with-utf8
        ];
        testHaskellDepends = [
-         aeson base blaze-markup bytestring containers data-default
-         directory extra filepath ghcide haskell-lsp hie-bios hls-plugin-api
-         hslogger hspec hspec-core hspec-expectations lens lsp-test process
-         stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
+         aeson base blaze-markup bytestring containers data-default deepseq
+         directory extra filepath ghcide hie-bios hls-plugin-api hslogger
+         hspec hspec-core hspec-expectations lens lsp lsp-test megaparsec
+         process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
          tasty-hunit tasty-rerun temporary text transformers
          unordered-containers yaml
        ];
@@ -119439,21 +119465,21 @@ self: {
 
   "haskell-to-elm" = callPackage
     ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop, text
-     , time, unordered-containers
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "haskell-to-elm";
-       version = "0.3.1.0";
-       sha256 = "0gplmz0s874zi8y8m06mlr3lipyffw0p6lfz6snl0sgdmynjg786";
+       version = "0.3.2.0";
+       sha256 = "17r1yf2xp1idpq22f67192i511w7ydpfw728f5g3fz67lbahpq3k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bound elm-syntax generics-sop text time
-         unordered-containers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bound elm-syntax generics-sop text time
-         unordered-containers
+         unordered-containers vector
        ];
        description = "Generate Elm types and JSON encoders and decoders from Haskell types";
        license = lib.licenses.bsd3;
@@ -120806,8 +120832,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.17.1";
-       sha256 = "07p58jf2vn7hyk260ijimg2lyg3jcsqnza8v6kjcn6rjlsvcakvp";
+       version = "0.17.2";
+       sha256 = "04i8016qrrwzbz8yxnppfzlrba1d86zp2j71dqd0p7lc3341caa8";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra containers
          data-default hashable haskoin-core monad-logger mtl network nqe
@@ -120891,8 +120917,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.47.3";
-       sha256 = "0z3rhxfnk1985lmfzajipkzajya2vrfh0p5c66kk03vysvssjzpi";
+       version = "0.49.0";
+       sha256 = "126krbi29jxi978my3wg8cl2gqpr0xn0fmbz6fxqcbbcwi75fa30";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120937,8 +120963,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store-data";
-       version = "0.47.3";
-       sha256 = "0i7jf832q2lv8h82sf4y3a81j8y4ipw653q32jfnxhjjbnfxccly";
+       version = "0.49.0";
+       sha256 = "1v9zb3m1pvhbqm6pxzy2w8ipyxnv80gw8xlsr25fj0g2ylifkjb2";
        libraryHaskellDepends = [
          aeson base binary bytes bytestring cereal containers data-default
          deepseq hashable haskoin-core http-client http-types lens mtl
@@ -123272,18 +123298,16 @@ self: {
      , bytestring, clock, concurrent-extra, containers, data-default
      , directory, ekg, ekg-core, exceptions, fast-logger, filepath
      , hashable, hashtables, heavy-logger, hsyslog, http-types
-     , megaparsec, microlens, monad-metrics, mtl, mwc-random
+     , megaparsec, microlens, monad-metrics, mtl, mwc-random, network
      , optparse-applicative, psqueues, random, random-access-file
-     , scotty, stm, stm-containers, store, template-haskell, text
-     , text-format-heavy, unix, unix-bytestring, unordered-containers
-     , yaml
+     , random-shuffle, scotty, stm, stm-containers, store
+     , template-haskell, text, text-format-heavy, unix, unix-bytestring
+     , unordered-containers, vector, wai, warp, yaml
      }:
      mkDerivation {
        pname = "hcheckers";
-       version = "0.1.0.0";
-       sha256 = "17px41lgaqxpwmmj315s49hnchq5pn017k58wcla8cmw4n3a2aw0";
-       revision = "1";
-       editedCabalFile = "1bfm9wndgwz18gxws456h4faw3fa6d1020kxjc7b3rzb9c0nr2vq";
+       version = "0.1.0.1";
+       sha256 = "1l4cj7v4scnz5cq05294ym4gyv163ry09bpxp1vg1m1v88ww5i2w";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123291,9 +123315,10 @@ self: {
          concurrent-extra containers data-default directory ekg ekg-core
          exceptions fast-logger filepath hashable hashtables heavy-logger
          hsyslog http-types megaparsec microlens monad-metrics mtl
-         mwc-random optparse-applicative psqueues random random-access-file
-         scotty stm stm-containers store template-haskell text
-         text-format-heavy unix unix-bytestring unordered-containers yaml
+         mwc-random network optparse-applicative psqueues random
+         random-access-file random-shuffle scotty stm stm-containers store
+         template-haskell text text-format-heavy unix unix-bytestring
+         unordered-containers vector wai warp yaml
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
        license = lib.licenses.bsd3;
@@ -124019,33 +124044,6 @@ self: {
      }) {};
 
   "headroom" = callPackage
-    ({ mkDerivation, aeson, base, data-default-class, doctest, either
-     , file-embed, hspec, hspec-discover, microlens, microlens-th
-     , mustache, optparse-applicative, pcre-heavy, pcre-light
-     , QuickCheck, rio, template-haskell, time, yaml
-     }:
-     mkDerivation {
-       pname = "headroom";
-       version = "0.3.2.0";
-       sha256 = "0770d1b8ikijkmqqnb6nygqj7cv6fphz1165x478ry61sr3i6hs3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base data-default-class either file-embed microlens
-         microlens-th mustache optparse-applicative pcre-heavy pcre-light
-         rio template-haskell time yaml
-       ];
-       executableHaskellDepends = [ base optparse-applicative rio ];
-       testHaskellDepends = [
-         aeson base doctest hspec optparse-applicative pcre-light QuickCheck
-         rio time
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "License Header Manager";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "headroom_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, doctest, either, file-embed
      , generic-data, hspec, hspec-discover, microlens, microlens-th, mtl
      , mustache, optparse-applicative, pcre-heavy, pcre-light
@@ -124070,7 +124068,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "License Header Manager";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "heap" = callPackage
@@ -124450,6 +124447,31 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_1_0_5" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, deepseq, directory, erf
+     , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show
+     , primitive, random, resourcet, stm, template-haskell, text, time
+     , transformers, transformers-base, wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "1.0.5";
+       sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         deepseq directory erf exceptions lifted-async mmorph monad-control
+         mtl pretty-show primitive random resourcet stm template-haskell
+         text time transformers transformers-base wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers mmorph mtl pretty-show text transformers
+       ];
+       description = "Release with confidence";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -125406,40 +125428,41 @@ self: {
      , bdw-gc, binary, binary-conduit, boost, bytestring, cachix
      , cachix-api, conduit, conduit-extra, containers, directory, dlist
      , exceptions, filepath, hercules-ci-api-agent, hercules-ci-api-core
-     , hostname, hspec, http-client, http-client-tls, http-conduit
-     , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async
-     , lifted-base, monad-control, mtl, network, network-uri, nix
-     , optparse-applicative, process, protolude, safe-exceptions
-     , servant, servant-auth-client, servant-client, servant-client-core
-     , stm, temporary, text, time, tomland, transformers
-     , transformers-base, unbounded-delays, unix, unliftio
+     , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec
+     , http-client, http-client-tls, http-conduit, inline-c
+     , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base
+     , monad-control, mtl, network, network-uri, nix
+     , optparse-applicative, process, process-extras, protolude
+     , safe-exceptions, servant, servant-auth-client, servant-client
+     , servant-client-core, stm, temporary, text, time, tomland
+     , transformers, transformers-base, unbounded-delays, unix, unliftio
      , unliftio-core, unordered-containers, uuid, vector, websockets
      , wuss
      }:
      mkDerivation {
        pname = "hercules-ci-agent";
-       version = "0.7.5";
-       sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq";
+       version = "0.8.0";
+       sha256 = "1nwdi442ccm1x2isxdlh3rpcw627wjccdb4y40w2qna6dchx7v9z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base binary binary-conduit bytestring cachix conduit
-         containers dlist exceptions hercules-ci-api-agent inline-c
-         inline-c-cpp katip lifted-async lifted-base monad-control mtl
-         network-uri optparse-applicative process protolude safe-exceptions
-         stm text time transformers-base unbounded-delays unliftio
-         unliftio-core uuid websockets wuss
+         aeson async base binary binary-conduit bytestring conduit
+         containers directory dlist exceptions filepath
+         hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store
+         katip lens lens-aeson lifted-async lifted-base monad-control mtl
+         network-uri process process-extras protolude safe-exceptions stm
+         temporary text time transformers-base unbounded-delays unix
+         unliftio unliftio-core uuid websockets wuss
        ];
-       librarySystemDepends = [ boost ];
-       libraryPkgconfigDepends = [ bdw-gc nix ];
        executableHaskellDepends = [
          aeson async attoparsec base base64-bytestring binary binary-conduit
          bytestring cachix cachix-api conduit conduit-extra containers
          directory dlist exceptions filepath hercules-ci-api-agent
-         hercules-ci-api-core hostname http-client http-client-tls
-         http-conduit inline-c inline-c-cpp katip lens lens-aeson
-         lifted-async lifted-base monad-control mtl network network-uri
-         optparse-applicative process protolude safe-exceptions servant
+         hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store
+         hostname http-client http-client-tls http-conduit inline-c
+         inline-c-cpp katip lens lens-aeson lifted-async lifted-base
+         monad-control mtl network network-uri optparse-applicative process
+         process-extras protolude safe-exceptions servant
          servant-auth-client servant-client servant-client-core stm
          temporary text time tomland transformers transformers-base unix
          unliftio unliftio-core unordered-containers uuid vector websockets
@@ -125450,41 +125473,69 @@ self: {
        testHaskellDepends = [
          aeson async attoparsec base binary binary-conduit bytestring
          conduit containers exceptions filepath hercules-ci-api-agent
-         hercules-ci-api-core hspec katip lifted-async lifted-base
-         monad-control optparse-applicative process protolude
+         hercules-ci-api-core hercules-ci-cnix-store hspec katip
+         lifted-async lifted-base monad-control process protolude
          safe-exceptions text transformers-base unliftio-core
        ];
-       doHaddock = false;
        description = "Runs Continuous Integration tasks on your machines";
        license = lib.licenses.asl20;
        maintainers = with lib.maintainers; [ roberth ];
      }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
 
+  "hercules-ci-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, cookie
+     , exceptions, hashable, hercules-ci-api-core, http-api-data
+     , http-media, lens, lens-aeson, memory, network-uri, profunctors
+     , servant, servant-auth, servant-auth-swagger, servant-swagger
+     , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid
+     }:
+     mkDerivation {
+       pname = "hercules-ci-api";
+       version = "0.6.0.0";
+       sha256 = "11ha3jvwg501n9all4v5r057qr9m9qbmbrkiv5l04mrsi5pvhpw7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers cookie exceptions hashable
+         hercules-ci-api-core http-api-data http-media lens lens-aeson
+         memory network-uri profunctors servant servant-auth
+         servant-auth-swagger servant-swagger servant-swagger-ui-core
+         string-conv swagger2 text time uuid
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers cookie exceptions hashable
+         http-api-data http-media lens memory network-uri profunctors
+         servant servant-auth servant-auth-swagger servant-swagger
+         servant-swagger-ui-core string-conv swagger2 text time uuid
+       ];
+       description = "Hercules CI API definition with Servant";
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
+     }) {};
+
   "hercules-ci-api-agent" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring-type, bytestring
-     , containers, cookie, exceptions, hashable, hercules-ci-api-core
-     , hspec, http-api-data, http-media, lens, lens-aeson, memory
-     , network-uri, profunctors, QuickCheck, servant, servant-auth
-     , servant-auth-swagger, servant-swagger, servant-swagger-ui-core
-     , string-conv, swagger2, text, time, uuid, vector
+     , containers, cookie, deepseq, exceptions, hashable
+     , hercules-ci-api-core, hspec, http-api-data, http-media, lens
+     , lens-aeson, memory, network-uri, profunctors, QuickCheck
+     , quickcheck-classes, servant, servant-auth, string-conv, swagger2
+     , text, time, uuid, vector
      }:
      mkDerivation {
        pname = "hercules-ci-api-agent";
-       version = "0.2.2.0";
-       sha256 = "1pp0ink132wwj2wzj7ficxzxhj09bl3fm62fmslrl3l579ycbp7d";
+       version = "0.3.0.0";
+       sha256 = "161ghlz5n6na4sviwyxxq78hj37yk89kri0367xx9dbsllgfc7g6";
        libraryHaskellDepends = [
          aeson base base64-bytestring-type bytestring containers cookie
-         exceptions hashable hercules-ci-api-core http-api-data http-media
-         lens lens-aeson memory servant servant-auth servant-auth-swagger
-         servant-swagger servant-swagger-ui-core string-conv swagger2 text
-         time uuid vector
+         deepseq exceptions hashable hercules-ci-api-core http-api-data
+         http-media lens lens-aeson memory servant servant-auth string-conv
+         swagger2 text time uuid vector
        ];
        testHaskellDepends = [
          aeson base bytestring containers cookie exceptions hashable hspec
          http-api-data http-media lens memory network-uri profunctors
-         QuickCheck servant servant-auth servant-auth-swagger
-         servant-swagger servant-swagger-ui-core string-conv swagger2 text
-         time uuid
+         QuickCheck quickcheck-classes servant servant-auth string-conv
+         swagger2 text time uuid vector
        ];
        description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
        license = lib.licenses.asl20;
@@ -125493,17 +125544,17 @@ self: {
 
   "hercules-ci-api-core" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cookie
-     , exceptions, hashable, http-api-data, http-media, katip, lens
-     , lifted-base, memory, monad-control, safe-exceptions, servant
-     , servant-auth, servant-auth-swagger, servant-swagger
+     , deepseq, exceptions, hashable, http-api-data, http-media, katip
+     , lens, lifted-base, memory, monad-control, safe-exceptions
+     , servant, servant-auth, servant-auth-swagger, servant-swagger
      , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid
      }:
      mkDerivation {
        pname = "hercules-ci-api-core";
-       version = "0.1.1.0";
-       sha256 = "19qxbarnl65gqg52ysl12nggyc64860chdcl0vm3i3fny4vsqbcq";
+       version = "0.1.2.0";
+       sha256 = "1p2vv5dviac73qi42x7kf09wgc3qjdkpldn7yj5vhmxhcnj7yj6x";
        libraryHaskellDepends = [
-         aeson base bytestring containers cookie exceptions hashable
+         aeson base bytestring containers cookie deepseq exceptions hashable
          http-api-data http-media katip lens lifted-base memory
          monad-control safe-exceptions servant servant-auth
          servant-auth-swagger servant-swagger servant-swagger-ui-core
@@ -125514,6 +125565,67 @@ self: {
        maintainers = with lib.maintainers; [ roberth ];
      }) {};
 
+  "hercules-ci-cli" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, atomic-write, attoparsec
+     , base, bytestring, conduit, containers, data-has, directory
+     , exceptions, filepath, hercules-ci-agent, hercules-ci-api
+     , hercules-ci-api-core, hercules-ci-cnix-expr
+     , hercules-ci-cnix-store, hercules-ci-optparse-applicative
+     , hostname, hspec, http-client, http-client-tls, http-types, katip
+     , lifted-base, monad-control, network-uri, process, protolude
+     , QuickCheck, rio, safe-exceptions, servant, servant-auth-client
+     , servant-client, servant-client-core, servant-conduit, temporary
+     , text, transformers-base, unix, unliftio, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hercules-ci-cli";
+       version = "0.1.0";
+       sha256 = "1fcg1fd2jd0334nhwsipyf468a4kkdhbibyhhjyspqagswaanm9q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty atomic-write attoparsec base bytestring conduit
+         containers data-has directory exceptions filepath hercules-ci-agent
+         hercules-ci-api hercules-ci-api-core hercules-ci-cnix-expr
+         hercules-ci-cnix-store hercules-ci-optparse-applicative hostname
+         http-client http-client-tls http-types katip lifted-base
+         monad-control network-uri process protolude rio safe-exceptions
+         servant servant-auth-client servant-client servant-client-core
+         servant-conduit temporary text transformers-base unix unliftio
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec protolude QuickCheck
+         unordered-containers
+       ];
+       description = "The hci command for working with Hercules CI";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ roberth ];
+       broken = true;
+     }) {hercules-ci-optparse-applicative = null;};
+
+  "hercules-ci-cnix-expr" = callPackage
+    ({ mkDerivation, aeson, base, bdw-gc, boost, bytestring, conduit
+     , containers, exceptions, hercules-ci-cnix-store, inline-c
+     , inline-c-cpp, nix, protolude, text
+     }:
+     mkDerivation {
+       pname = "hercules-ci-cnix-expr";
+       version = "0.1.0.0";
+       sha256 = "1f9pq6z5xvmq7hd136dshazybazydsmah5f5h8w82yi12ccyqlaz";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers exceptions
+         hercules-ci-cnix-store inline-c inline-c-cpp protolude text
+       ];
+       librarySystemDepends = [ boost ];
+       libraryPkgconfigDepends = [ bdw-gc nix ];
+       description = "Bindings for the Nix evaluator";
+       license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
+     }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
+
   "hercules-ci-cnix-store" = callPackage
     ({ mkDerivation, base, boost, bytestring, conduit, containers
      , inline-c, inline-c-cpp, nix, protolude, unliftio-core
@@ -125530,6 +125642,7 @@ self: {
        libraryPkgconfigDepends = [ nix ];
        description = "Haskell bindings for Nix's libstore";
        license = lib.licenses.asl20;
+       maintainers = with lib.maintainers; [ roberth ];
      }) {inherit (pkgs) boost; inherit (pkgs) nix;};
 
   "here" = callPackage
@@ -127416,8 +127529,6 @@ self: {
        ];
        description = "Generates a references DB from .hie files";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -129114,8 +129225,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.20.4";
-       sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95";
+       version = "1.21";
+       sha256 = "07fcfkmv4cy92njnf2qc7jh0naz96q962hxldcd7hk4k7ddv0mss";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129240,10 +129351,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.12";
-       sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048";
-       revision = "2";
-       editedCabalFile = "1n43j7fh3d9f8jn1y40vhkfh7yfwb4sixm3wyrfj20mkr7yyr732";
+       version = "1.3.13";
+       sha256 = "19i5cr11zm4d27x2gddxy4993jgmf4ghgpvx8fw4acadwbvlnjvg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129271,10 +129380,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-interest";
-       version = "1.6.0";
-       sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq";
-       revision = "1";
-       editedCabalFile = "10v3fwyzbaqzrldaswvn031hncxy2sra302n10k4zkxg41bz7f73";
+       version = "1.6.1";
+       sha256 = "0i97y7rs5kd2dqk3qwd2jg17vs9ib4yvkaqlljnb32x16gphpvhc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129311,20 +129418,20 @@ self: {
      , cassava, cassava-megaparsec, cmdargs, containers, data-default
      , Decimal, directory, doctest, extra, file-embed, filepath, Glob
      , hashtables, megaparsec, mtl, old-time, parser-combinators
-     , pretty-simple, regex-tdfa, safe, split, tabular, tasty
-     , tasty-hunit, template-haskell, text, time, timeit, transformers
-     , uglymemo, unordered-containers, utf8-string
+     , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit
+     , template-haskell, text, time, timeit, transformers, uglymemo
+     , unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.20.4";
-       sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw";
+       version = "1.21";
+       sha256 = "00prslqk8vnbyz388cpc0nsamzy8xcjzday5q9n3m9lx4p2dhb5y";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal array base base-compat-batteries
          blaze-markup bytestring call-stack cassava cassava-megaparsec
          cmdargs containers data-default Decimal directory extra file-embed
          filepath Glob hashtables megaparsec mtl old-time parser-combinators
-         pretty-simple regex-tdfa safe split tabular tasty tasty-hunit
+         pretty-simple regex-tdfa safe tabular tasty tasty-hunit
          template-haskell text time timeit transformers uglymemo
          unordered-containers utf8-string
        ];
@@ -129333,9 +129440,9 @@ self: {
          blaze-markup bytestring call-stack cassava cassava-megaparsec
          cmdargs containers data-default Decimal directory doctest extra
          file-embed filepath Glob hashtables megaparsec mtl old-time
-         parser-combinators pretty-simple regex-tdfa safe split tabular
-         tasty tasty-hunit template-haskell text time timeit transformers
-         uglymemo unordered-containers utf8-string
+         parser-combinators pretty-simple regex-tdfa safe tabular tasty
+         tasty-hunit template-haskell text time timeit transformers uglymemo
+         unordered-containers utf8-string
        ];
        description = "A reusable library providing the core functionality of hledger";
        license = lib.licenses.gpl3;
@@ -129394,8 +129501,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.20.4";
-       sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i";
+       version = "1.21";
+       sha256 = "1h9d686z0y8cvq6780g6r8fdrs76y9649js0c350b6xnhzggbx0l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -129441,8 +129548,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.20.4";
-       sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4";
+       version = "1.21";
+       sha256 = "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129711,23 +129818,6 @@ self: {
 
   "hls-class-plugin" = callPackage
     ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
-     , ghcide, haskell-lsp, hls-plugin-api, lens, shake, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-class-plugin";
-       version = "0.1.0.1";
-       sha256 = "198r8kly4fgm9xsngkzhljbq1j764asc0xba757zasmgndvri2r7";
-       libraryHaskellDepends = [
-         aeson base containers ghc ghc-exactprint ghcide haskell-lsp
-         hls-plugin-api lens shake text transformers unordered-containers
-       ];
-       description = "Class/instance management plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-class-plugin_1_0_0_0" = callPackage
-    ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
      , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers
      , unordered-containers
      }:
@@ -129741,27 +129831,26 @@ self: {
        ];
        description = "Class/instance management plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-eval-plugin" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory
      , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
-     , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens
-     , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck
-     , safe-exceptions, shake, temporary, text, time, transformers
+     , hashable, hls-plugin-api, lens, lsp, lsp-types, megaparsec, mtl
+     , parser-combinators, pretty-simple, QuickCheck, safe-exceptions
+     , shake, temporary, text, time, transformers, unliftio
      , unordered-containers
      }:
      mkDerivation {
        pname = "hls-eval-plugin";
-       version = "0.2.0.0";
-       sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5";
+       version = "1.0.0.0";
+       sha256 = "0pslyhgvs6xrwijkyf4jdh873mnsb8iijmkbc9aq3dljdy080fdg";
        libraryHaskellDepends = [
          aeson base containers deepseq Diff directory dlist extra filepath
-         ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp
-         haskell-lsp-types hls-plugin-api lens megaparsec mtl
-         parser-combinators pretty-simple QuickCheck safe-exceptions shake
-         temporary text time transformers unordered-containers
+         ghc ghc-boot-th ghc-paths ghcide hashable hls-plugin-api lens lsp
+         lsp-types megaparsec mtl parser-combinators pretty-simple
+         QuickCheck safe-exceptions shake temporary text time transformers
+         unliftio unordered-containers
        ];
        description = "Eval plugin for Haskell Language Server";
        license = lib.licenses.asl20;
@@ -129786,58 +129875,22 @@ self: {
 
   "hls-explicit-imports-plugin" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
-     , haskell-lsp-types, hls-plugin-api, shake, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-explicit-imports-plugin";
-       version = "0.1.0.0";
-       sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2";
-       revision = "1";
-       editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms";
-       libraryHaskellDepends = [
-         aeson base containers deepseq ghc ghcide haskell-lsp-types
-         hls-plugin-api shake text unordered-containers
-       ];
-       description = "Explicit imports plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-explicit-imports-plugin_0_1_0_2" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
      , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers
      }:
      mkDerivation {
        pname = "hls-explicit-imports-plugin";
-       version = "0.1.0.2";
-       sha256 = "0cfkb7ph6ryakybjxmyf6cc615p57wzv6ys2zy4fak1iib8bzwyx";
+       version = "1.0.0.0";
+       sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w";
        libraryHaskellDepends = [
          aeson base containers deepseq ghc ghcide hls-plugin-api lsp
          lsp-types shake text unordered-containers
        ];
        description = "Explicit imports plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-haddock-comments-plugin" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
-     , haskell-lsp-types, hls-plugin-api, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-haddock-comments-plugin";
-       version = "0.1.1.0";
-       sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn";
-       libraryHaskellDepends = [
-         base containers ghc ghc-exactprint ghcide haskell-lsp-types
-         hls-plugin-api text unordered-containers
-       ];
-       description = "Haddock comments plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-haddock-comments-plugin_1_0_0_0" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
      , hls-plugin-api, lsp-types, text, unordered-containers
      }:
      mkDerivation {
@@ -129850,49 +129903,30 @@ self: {
        ];
        description = "Haddock comments plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-hlint-plugin" = callPackage
     ({ mkDerivation, aeson, apply-refact, base, binary, bytestring
      , containers, data-default, deepseq, Diff, directory, extra
-     , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp
-     , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake
-     , temporary, text, transformers, unordered-containers
+     , filepath, ghc, ghc-exactprint, ghcide, hashable, hlint
+     , hls-plugin-api, hslogger, lens, lsp, regex-tdfa, shake, temporary
+     , text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hls-hlint-plugin";
-       version = "0.2.0.0";
-       sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d";
+       version = "1.0.0.1";
+       sha256 = "0hnfh6x8l20nrj54hpkkq2yj8xkgw15xcba27hagapam2yxi1xga";
        libraryHaskellDepends = [
          aeson apply-refact base binary bytestring containers data-default
          deepseq Diff directory extra filepath ghc ghc-exactprint ghcide
-         hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa
-         shake temporary text transformers unordered-containers
+         hashable hlint hls-plugin-api hslogger lens lsp regex-tdfa shake
+         temporary text transformers unordered-containers
        ];
        description = "Hlint integration plugin with Haskell Language Server";
        license = lib.licenses.asl20;
      }) {};
 
   "hls-plugin-api" = callPackage
-    ({ mkDerivation, aeson, base, containers, data-default, Diff
-     , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
-     , text, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-plugin-api";
-       version = "0.7.0.0";
-       sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55";
-       libraryHaskellDepends = [
-         aeson base containers data-default Diff hashable haskell-lsp
-         hslogger lens process regex-tdfa shake text unix
-         unordered-containers
-       ];
-       description = "Haskell Language Server API for plugin communication";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-plugin-api_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default
      , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger
      , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix
@@ -129909,37 +129943,17 @@ self: {
        ];
        description = "Haskell Language Server API for plugin communication";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-retrie-plugin" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
-     , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
-     , hls-plugin-api, retrie, safe-exceptions, shake, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-retrie-plugin";
-       version = "0.1.1.0";
-       sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj";
-       libraryHaskellDepends = [
-         aeson base containers deepseq directory extra ghc ghcide hashable
-         haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
-         shake text transformers unordered-containers
-       ];
-       description = "Retrie integration plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-retrie-plugin_0_1_1_1" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
      , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
      , safe-exceptions, shake, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hls-retrie-plugin";
-       version = "0.1.1.1";
-       sha256 = "1k85wgnd5f1jqjd09y9gacc5w8kypy84qaly32411xsw4hfsil8a";
+       version = "1.0.0.0";
+       sha256 = "1m4r6nxbq1lvjkl6g1i0lbxdx4zimw6g478alnqv8n208q6fiw26";
        libraryHaskellDepends = [
          aeson base containers deepseq directory extra ghc ghcide hashable
          hls-plugin-api lsp lsp-types retrie safe-exceptions shake text
@@ -129947,56 +129961,27 @@ self: {
        ];
        description = "Retrie integration plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-splice-plugin" = callPackage
-    ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc
-     , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie
-     , shake, syb, text, transformers, unordered-containers
+    ({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc
+     , ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake
+     , syb, text, transformers, unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "hls-splice-plugin";
-       version = "0.3.0.0";
-       sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv";
+       version = "1.0.0.0";
+       sha256 = "1xm9ji64g89fn4b81gd5g0ijv88b2zhyn303hr3jxhydqpfcipjb";
        libraryHaskellDepends = [
-         aeson base containers dlist foldl ghc ghc-exactprint ghcide
-         haskell-lsp hls-plugin-api lens retrie shake syb text transformers
-         unordered-containers
+         aeson base containers dlist extra foldl ghc ghc-exactprint ghcide
+         hls-plugin-api lens lsp retrie shake syb text transformers
+         unliftio-core unordered-containers
        ];
        description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
        license = lib.licenses.asl20;
      }) {};
 
   "hls-tactics-plugin" = callPackage
-    ({ mkDerivation, aeson, base, checkers, containers, deepseq
-     , directory, extra, filepath, fingertree, generic-lens, ghc
-     , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp
-     , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl
-     , QuickCheck, refinery, retrie, shake, syb, text, transformers
-     }:
-     mkDerivation {
-       pname = "hls-tactics-plugin";
-       version = "0.5.1.0";
-       sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52";
-       revision = "1";
-       editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl";
-       libraryHaskellDepends = [
-         aeson base containers deepseq directory extra filepath fingertree
-         generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
-         haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
-         transformers
-       ];
-       testHaskellDepends = [
-         base checkers containers ghc hie-bios hls-plugin-api hspec mtl
-         QuickCheck
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Tactics plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-tactics-plugin_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, checkers, containers
      , data-default, deepseq, directory, extra, filepath, fingertree
      , generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen
@@ -130031,7 +130016,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Wingman plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hlwm" = callPackage
@@ -130109,8 +130093,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix";
-       version = "0.20.1";
-       sha256 = "0v690zml7yqj6ndjszwqpfsad2vma3m6rdkjs6bnb9k2v35l905i";
+       version = "0.20.2";
+       sha256 = "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg";
        configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
        libraryHaskellDepends = [
          array base binary bytestring deepseq primitive random semigroups
@@ -130641,18 +130625,19 @@ self: {
 
   "hmp3-ng" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, clock, containers
-     , directory, hscurses, monad-extras, mtl, ncurses, pcre-light
-     , process, random, unix, utf8-string, zlib
+     , directory, filepath, hscurses, monad-extras, mtl, ncurses
+     , pcre-light, process, random, unix, utf8-string, zlib
      }:
      mkDerivation {
        pname = "hmp3-ng";
-       version = "2.9.3";
-       sha256 = "0h1lg4faffqf86wk2hi68x3f0y2r2nypqcvb879wal24whh31v7v";
+       version = "2.11.0";
+       sha256 = "1wxjxx7ijw7fsvsfjvfdss5cg8yyd885i3wpnzryv0bhqqa96i1d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base binary bytestring clock containers directory hscurses
-         monad-extras mtl pcre-light process random unix utf8-string zlib
+         array base binary bytestring clock containers directory filepath
+         hscurses monad-extras mtl pcre-light process random unix
+         utf8-string zlib
        ];
        executableSystemDepends = [ ncurses ];
        description = "A 2019 fork of an ncurses mp3 player written in Haskell";
@@ -131952,8 +131937,8 @@ self: {
      }:
      mkDerivation {
        pname = "hookup";
-       version = "0.5";
-       sha256 = "1kpwg5jik2z8xrw192mglacgnm2clg9yca68jzk4gk0569krysnf";
+       version = "0.6";
+       sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528";
        libraryHaskellDepends = [
          async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system
          network stm
@@ -132930,8 +132915,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpath";
-       version = "0.11.0";
-       sha256 = "07p5h68sz079rvhbz9sig4146127l29xsrphd1i3y4gskzwdvy1a";
+       version = "0.12.1";
+       sha256 = "1v5i8gdsb05s2klsrby82ms4sphvgk6k1xvhj2c7g2r3zsn6rxws";
        libraryHaskellDepends = [
          base bytestring deepseq exceptions hpath-filepath template-haskell
          utf8-string word8
@@ -132948,8 +132933,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpath-directory";
-       version = "0.14.0";
-       sha256 = "1rv2f0vqbivzqgpk3msxgymqmwp159bi6h2hcdgf65v5j3rhv52n";
+       version = "0.14.2";
+       sha256 = "04lkan37v8i1clw459csn8jvkzasz0p8ik8q8slqb9g3a5j68hjy";
        libraryHaskellDepends = [
          base bytestring exceptions hpath-filepath hpath-posix IfElse
          safe-exceptions streamly streamly-bytestring streamly-posix time
@@ -132981,8 +132966,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpath-io";
-       version = "0.14.0";
-       sha256 = "12awqghnway7fhcyzyy6dj5f9p1z15gbp31r1781n892w3vvk4l9";
+       version = "0.14.2";
+       sha256 = "1xbxkzajzf46qdbhnyn866v12rkynhbsk610ypcfgaj2rm413flr";
        libraryHaskellDepends = [
          base bytestring exceptions hpath hpath-directory hpath-posix
          safe-exceptions streamly time unix
@@ -132995,8 +132980,8 @@ self: {
     ({ mkDerivation, base, bytestring, hpath-filepath, unix }:
      mkDerivation {
        pname = "hpath-posix";
-       version = "0.13.2";
-       sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf";
+       version = "0.13.3";
+       sha256 = "1qnz2y6k5axy1pzgx1hgygxv6rdqx9w9kzjmaf890zifv0vv46as";
        libraryHaskellDepends = [ base bytestring hpath-filepath unix ];
        description = "Some low-level POSIX glue code, that is not in 'unix'";
        license = lib.licenses.bsd3;
@@ -141327,8 +141312,8 @@ self: {
      }:
      mkDerivation {
        pname = "hurl";
-       version = "2.1.0.0";
-       sha256 = "0n467hgj8ybgqa69snsj6c199f0ipavxwjn2pb47q1vns6prlwd0";
+       version = "2.1.0.1";
+       sha256 = "16j7kxxp60i0nbiscc1x5a14s7n8qyv8rzjm6a03pqdpbmfzrrwq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142543,6 +142528,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hw-tar" = callPackage
+    ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog
+     , hw-hspec-hedgehog, process
+     }:
+     mkDerivation {
+       pname = "hw-tar";
+       version = "0.0.0.1";
+       sha256 = "0hzmw0xb10h09q3h25f4lk2pygl0w7nckysa04qr1c26n4hsvrq2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-hedgehog hw-hspec-hedgehog process
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Library for creating and extracting tar archives";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "hw-uri" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-optparse-applicative, antiope-s3, base
@@ -146186,8 +146191,8 @@ self: {
      }:
      mkDerivation {
        pname = "incremental-parser";
-       version = "0.5.0.1";
-       sha256 = "1j0x52rwp44wdjdyxw3jh6m61vhwa2bf80dfxhqi6iniyc8qzm68";
+       version = "0.5.0.2";
+       sha256 = "15437dkn8j17ba71c3h6ck2f6sbnmp3acg2grg97awb962azm9fj";
        libraryHaskellDepends = [
          base input-parsers monoid-subclasses parsers rank2classes
          transformers
@@ -146659,8 +146664,8 @@ self: {
      }:
      mkDerivation {
        pname = "infernal";
-       version = "0.5.0";
-       sha256 = "0zn4zj9c9jhvchg6yli3ig2c0hnwpk9na2r0bbizjlngzky6vfrr";
+       version = "0.6.0";
+       sha256 = "1qk0d5k7kjkhqxpkm1fnah1syd0la1z88l5mwv3z6ly5njvj78fl";
        libraryHaskellDepends = [
          aeson base binary bytestring case-insensitive exceptions hashable
          http-client http-types little-logger little-rio microlens
@@ -146796,6 +146801,34 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "influxdb_1_9_1_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, clock, containers, doctest, foldl, http-client
+     , http-types, lens, network, optional-args, raw-strings-qq
+     , scientific, tagged, tasty, tasty-hunit, template-haskell, text
+     , time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "influxdb";
+       version = "1.9.1.1";
+       sha256 = "1qdfrl5ragkn726ymh16p0shgc6sn72gd1hh6a6bw19m527pdcc0";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific tagged text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base containers doctest lens raw-strings-qq tasty tasty-hunit
+         template-haskell time vector
+       ];
+       description = "InfluxDB client library for Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "informative" = callPackage
     ({ mkDerivation, base, containers, csv, highlighting-kate
      , http-conduit, monad-logger, pandoc, persistent
@@ -147122,8 +147155,8 @@ self: {
      }:
      mkDerivation {
        pname = "input-parsers";
-       version = "0.1.0.1";
-       sha256 = "0wqp98ly2f9vnqd97q9jphmxqr284aal40dlrgi4hwy216p67vzz";
+       version = "0.2.1";
+       sha256 = "0hxadh4p007785knx8vah3b2bawaidvi7z4kgyyahj98a5k7qr18";
        libraryHaskellDepends = [
          attoparsec base binary bytestring monoid-subclasses parsec parsers
          text transformers
@@ -147243,16 +147276,17 @@ self: {
 
   "instana-haskell-trace-sdk" = callPackage
     ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring
-     , containers, directory, ekg-core, exceptions, hslogger
-     , http-client, http-client-tls, http-types, HUnit, network, process
-     , random, regex-base, regex-compat, regex-pcre, regex-tdfa, retry
-     , scientific, servant, servant-server, stm, sysinfo, text, time
-     , transformers, unix, unordered-containers, wai, warp
+     , case-insensitive, containers, directory, ekg-core, exceptions
+     , hslogger, http-client, http-client-tls, http-types, HUnit
+     , network, process, random, regex-base, regex-compat, regex-pcre
+     , regex-tdfa, retry, scientific, servant, servant-server, stm
+     , sysinfo, text, time, transformers, unix, unordered-containers
+     , wai, warp
      }:
      mkDerivation {
        pname = "instana-haskell-trace-sdk";
-       version = "0.5.0.1";
-       sha256 = "1414c9jahmkszpag40iyzrr0g346dp9l1ssz60693ivcm0q16pii";
+       version = "0.6.0.0";
+       sha256 = "0b27fvvq1xxici2w33m823xnj7fwq1irjhwrcaav1khz3h93qv85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147262,9 +147296,9 @@ self: {
          scientific stm sysinfo text time unix unordered-containers wai
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring hslogger http-client http-types
-         servant servant-server text time transformers unix
-         unordered-containers wai warp
+         aeson base binary bytestring case-insensitive containers hslogger
+         http-client http-types servant servant-server text time
+         transformers unix unordered-containers wai warp
        ];
        testHaskellDepends = [
          aeson aeson-extra base bytestring directory ekg-core exceptions
@@ -148294,25 +148328,25 @@ self: {
      }) {};
 
   "inventory" = callPackage
-    ({ mkDerivation, appendmap, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit
+    ({ mkDerivation, appendmap, array, base, bytestring, containers
+     , directory, filepath, ghc, ghc-paths, mtl, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "inventory";
-       version = "0.1.0.2";
-       sha256 = "1ykfxlsgnim45b4birflpwj0p3grjw8y4p9vwqnmhss6krl2qk3x";
+       version = "0.1.0.3";
+       sha256 = "1zja3w6xkah7ydzkn5ydibagn4g3fa16xdjsqvkrkv6yfq54g2j7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         appendmap base bytestring containers directory filepath ghc
+         appendmap array base bytestring containers directory filepath ghc
          ghc-paths mtl
        ];
        executableHaskellDepends = [
-         appendmap base bytestring containers directory filepath ghc
+         appendmap array base bytestring containers directory filepath ghc
          ghc-paths mtl
        ];
        testHaskellDepends = [
-         appendmap base bytestring containers directory filepath ghc
+         appendmap array base bytestring containers directory filepath ghc
          ghc-paths mtl tasty tasty-hunit
        ];
        description = "Project statistics and definition analysis";
@@ -148870,22 +148904,23 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, directory, directory-tree
      , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson
      , monad-logger, QuickCheck, regex-compat, rio, servant
-     , servant-client, servant-server, swagger2, text, vector, yaml
+     , servant-client, servant-multipart, servant-server, swagger2, text
+     , vector, yaml
      }:
      mkDerivation {
        pname = "ipfs";
-       version = "1.2.0.0";
-       sha256 = "12aibxpdkgwym8k8hibb8a77bbf7wd6z5czwpakg48x9gxmvhygn";
+       version = "1.3.0.0";
+       sha256 = "1ag3rx7p4gp39rhgwap083ny5x00z5p8aks1lwvrsmdlvn83ym6l";
        libraryHaskellDepends = [
          aeson base bytestring envy flow Glob http-media ip lens
-         monad-logger regex-compat rio servant servant-client servant-server
-         swagger2 text vector
+         monad-logger regex-compat rio servant servant-client
+         servant-multipart servant-server swagger2 text vector
        ];
        testHaskellDepends = [
          aeson base bytestring directory directory-tree doctest envy flow
          Glob http-media ip lens lens-aeson monad-logger QuickCheck
-         regex-compat rio servant servant-client servant-server swagger2
-         text vector yaml
+         regex-compat rio servant servant-client servant-multipart
+         servant-server swagger2 text vector yaml
        ];
        description = "Access IPFS locally and remotely";
        license = lib.licenses.asl20;
@@ -148975,10 +149010,8 @@ self: {
      }:
      mkDerivation {
        pname = "iproute";
-       version = "1.7.10";
-       sha256 = "0libq5v22cm6bj1lga1rrkgww50bhnpns7rz7da90yycqv2k7d5m";
-       revision = "1";
-       editedCabalFile = "02nh8r0c1p8gzq2y82q8n210y3bs146kjv2v7mr8z0m3k0sh5qqs";
+       version = "1.7.11";
+       sha256 = "12wa59b1zgjqp8dmygq2x44ml0cb89fhn1k0zkj4aqz7rhkwsp90";
        libraryHaskellDepends = [
          appar base byteorder bytestring containers network
        ];
@@ -149164,10 +149197,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.9";
-       sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b";
-       revision = "1";
-       editedCabalFile = "12z28f96iw9jni57rdzy8kz7sa1zwfs5k3fvfmf6sgx6wzhwcm6h";
+       version = "2.10";
+       sha256 = "1x1vmpzmgwxkwcza20yzmymgb7bj04f17xiqvcqg29h53pimnvxj";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -152860,13 +152891,13 @@ self: {
 
   "jsonrpc-conduit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
-     , conduit-extra, hspec, mtl, text, transformers
+     , conduit-extra, hspec, hspec-discover, mtl, text, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "jsonrpc-conduit";
-       version = "0.3.0";
-       sha256 = "0kh1s78zqgb4zdy18vckhzjadg33lr98jzpcqgad51phlbkhf94y";
+       version = "0.3.2";
+       sha256 = "00ssz471iv1vc67cbn3q3ghfd0ic8rjrsvkidx7vd6jd1mgw94ga";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra mtl text
          transformers unordered-containers
@@ -152874,6 +152905,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring conduit conduit-extra hspec text
        ];
+       testToolDepends = [ hspec-discover ];
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = lib.licenses.gpl3;
        hydraPlatforms = lib.platforms.none;
@@ -154404,8 +154436,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "keep-alive";
-       version = "0.1.1.0";
-       sha256 = "1h1x28adh7y561pmmbw064vyz9qx013spkcr8pwg9hjcnzn03yvw";
+       version = "0.2.0.0";
+       sha256 = "1hkmm1933y6dlzr88p75kkl6qiw5jnb1f4klfbwbl2d3jx8fg92k";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "TCP keep alive implementation";
@@ -159666,8 +159698,8 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "leanpub-concepts";
-       version = "1.1";
-       sha256 = "0zy26sccxyqhmlk6dfbd7jghwmfi9zkcljb9rcl82ysw7cwyl3qw";
+       version = "1.1.0.1";
+       sha256 = "0ip2kkkkbjf95h9dk9h4c21jz5ygpl1r1rsjdm47dmbvwih6v14c";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Leanpub API";
        license = lib.licenses.mit;
@@ -159675,15 +159707,17 @@ self: {
 
   "leanpub-wreq" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions
-     , leanpub-concepts, lens, rando, text, time, transformers
+     , leanpub-concepts, mwc-random, text, time, transformers
      , unordered-containers, wreq
      }:
      mkDerivation {
        pname = "leanpub-wreq";
-       version = "1.1";
-       sha256 = "1mk188r1bxg3qhv24nxkqw5vk5jyifxvg171h8bx93s9mmrikzdv";
+       version = "1.1.0.2";
+       sha256 = "1d1lj4ppvir8s2pv0zcsnadhns30h2axzppf6pkgbcnyis75an1h";
+       revision = "1";
+       editedCabalFile = "0zmwi2sfxv29rj28lri4xky0rbz8xky7jnwmbsynqckzn767a2k9";
        libraryHaskellDepends = [
-         aeson base bytestring exceptions leanpub-concepts lens rando text
+         aeson base bytestring exceptions leanpub-concepts mwc-random text
          time transformers unordered-containers wreq
        ];
        description = "Use the Leanpub API via Wreq";
@@ -160217,6 +160251,8 @@ self: {
        pname = "lens-family";
        version = "2.0.0";
        sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7";
+       revision = "1";
+       editedCabalFile = "1nf0zxhwqkg54mc3kimnqcvg9b732rn35r1rjs1fzf0vwssla3zw";
        libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
@@ -160224,14 +160260,14 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "lens-family_2_1_0" = callPackage
+  "lens-family_2_1_1" = callPackage
     ({ mkDerivation, base, containers, lens-family-core, mtl
      , transformers
      }:
      mkDerivation {
        pname = "lens-family";
-       version = "2.1.0";
-       sha256 = "06imgyd97zyvhd3ifq7wvfvfs10x6gsg4cw4a0y9wa0rm81960hl";
+       version = "2.1.1";
+       sha256 = "1ra31r3y672nyqf7147kxws1qvksgics8pgd6fasyf1v0l3c798j";
        libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
@@ -167752,8 +167788,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
-       revision = "5";
-       editedCabalFile = "1m1a3w8cjqz8h4iibkgykzgmrmkxxgz9sm0zn52dbvczdiqbs5y5";
+       revision = "6";
+       editedCabalFile = "1sh2g5wkh0m6646cxnii0k20f0crwdcnprfl9jfg7gxn5875bkip";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -170035,8 +170071,8 @@ self: {
      }:
      mkDerivation {
        pname = "mason";
-       version = "0.2.3";
-       sha256 = "0iwbdkrlbjn44gj0g43lfajx35jbihw4in5pc8by33ajwix43y5j";
+       version = "0.2.4";
+       sha256 = "1ic2h2mj31hb972x146wn7p29hlmx9p30f5gi2ccqv2ww96l56fv";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp network text
        ];
@@ -172337,9 +172373,7 @@ self: {
        ];
        description = "Support for using mergeful from persistent-based databases";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {genvalidity-persistent = null; validity-persistent = null;};
+     }) {};
 
   "mergeless" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity
@@ -172377,9 +172411,7 @@ self: {
        ];
        description = "Support for using mergeless from persistent-based databases";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {genvalidity-persistent = null;};
+     }) {};
 
   "merkle-log" = callPackage
     ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite
@@ -174755,6 +174787,24 @@ self: {
        broken = true;
      }) {};
 
+  "mit-3qvpPyAi6mH" = callPackage
+    ({ mkDerivation, base, base64, clock, directory, process
+     , record-dot-preprocessor, record-hasfield, text, text-ansi, unix
+     }:
+     mkDerivation {
+       pname = "mit-3qvpPyAi6mH";
+       version = "2";
+       sha256 = "1cdax4sjjpv7jiszv1319b7n26510pcir1icl6rfq4qbynrg4l00";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base base64 clock directory process record-dot-preprocessor
+         record-hasfield text text-ansi unix
+       ];
+       description = "A git wrapper with a streamlined UX";
+       license = lib.licenses.mit;
+     }) {};
+
   "miv" = callPackage
     ({ mkDerivation, async, base, bytestring, concurrent-output
      , containers, directory, filepath, filepattern, ghc-prim, hspec
@@ -174977,10 +175027,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.7.2";
-       sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm";
-       revision = "3";
-       editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p";
+       version = "0.0.7.3";
+       sha256 = "1gfl9jhqm1jaqxi0yxd8r4z3ai5c3f1wv53vjs0ln84qjpcqp30s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers deepseq dlist email-validate
@@ -175031,10 +175079,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmark-ext";
-       version = "0.2.1.2";
-       sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c";
-       revision = "3";
-       editedCabalFile = "02i6577qislr0qvgmfamcixpxgb7bh68lg18n3vkq6xbnjxdpwpx";
+       version = "0.2.1.3";
+       sha256 = "1hc95gvw4dyjlf2y4nli68zavjd0aj9br55n7417r7g70si1m82s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
@@ -175511,32 +175557,6 @@ self: {
      }:
      mkDerivation {
        pname = "modern-uri";
-       version = "0.3.4.0";
-       sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk";
-       libraryHaskellDepends = [
-         base bytestring containers contravariant deepseq exceptions
-         megaparsec mtl profunctors QuickCheck reflection tagged
-         template-haskell text
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq megaparsec text weigh
-       ];
-       description = "Modern library for working with URIs";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "modern-uri_0_3_4_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , criterion, deepseq, exceptions, hspec, hspec-discover
-     , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
-     , reflection, tagged, template-haskell, text, weigh
-     }:
-     mkDerivation {
-       pname = "modern-uri";
        version = "0.3.4.1";
        sha256 = "09yzn5lim3wv0120lfdwlc8ynx15z3p6p0js2r6ij3rzx26nchqd";
        libraryHaskellDepends = [
@@ -175553,7 +175573,6 @@ self: {
        ];
        description = "Modern library for working with URIs";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "modify-fasta" = callPackage
@@ -177113,8 +177132,8 @@ self: {
     ({ mkDerivation, base, base-compat, stm }:
      mkDerivation {
        pname = "monad-var";
-       version = "0.2.1.0";
-       sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
+       version = "0.2.2.0";
+       sha256 = "0idmp912pwlahl5rb9bfx8fr088h9im8pz32bjqm2141b9ci10h8";
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
        license = lib.licenses.bsd3;
@@ -177741,8 +177760,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-owns" = callPackage
@@ -177809,6 +177826,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "monoid-subclasses_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "1.1";
+       sha256 = "1bv0ripdw53121aj39zalczkfwrajpzzd1i99jn49sr4bfwgy3p4";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       description = "Subclasses of Monoid";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
@@ -177967,22 +178004,18 @@ self: {
      }) {};
 
   "months" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, cassava
-     , deepseq, hashable, http-api-data, intervals, lens, lucid
-     , QuickCheck, swagger2, text, time-compat
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, deepseq
+     , hashable, intervals, QuickCheck, text, time-compat
      }:
      mkDerivation {
        pname = "months";
-       version = "0.1";
-       sha256 = "000fqmd5j3pxmfa5bpyk5fd0hbn9iq3g5v1slk4hrjdjm8k19wa0";
-       revision = "4";
-       editedCabalFile = "0rww4x5c4a9n1yrs6ll1irwn1c1fm8s9k1zri3n2n1d6x75brny5";
+       version = "0.2";
+       sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija";
        libraryHaskellDepends = [
-         aeson attoparsec base base-compat cassava deepseq hashable
-         http-api-data intervals lens lucid QuickCheck swagger2 text
-         time-compat
+         aeson attoparsec base base-compat deepseq hashable intervals
+         QuickCheck text time-compat
        ];
-       description = "Month, YearMonth, Quarter, YearQuarter types";
+       description = "MonthName";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
@@ -179729,8 +179762,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-graphql";
-       version = "0.5.0.1";
-       sha256 = "1mcm8db1q0sjzxyjhxd140l966vq6yh8hj1p2xx8yzqmagsfv7kx";
+       version = "0.5.0.2";
+       sha256 = "0kr8gqi34zgg8vj5x0c0mx3xjkhjr4ynparplysga7qzzj58a7f3";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -185922,8 +185955,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.7.3";
-       sha256 = "18pdvmyhqil98d5mzh8a4r5i3pc4vyj13jcrjjw4q73prcj4mg6p";
+       version = "1.7.4";
+       sha256 = "11qmyj0cdmj9il2w5b25k45q59f1paia5yc98z999lj1fw7x27w6";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -186457,8 +186490,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-tree";
-       version = "0.1.5";
-       sha256 = "1iymfgffafqh57m0b8mrsrcd8m6x3wycwm2lly0bz1q4z784k66v";
+       version = "0.1.6";
+       sha256 = "0v8ll12z073g1c9zrgniljvrvniv1nf8p2ak6f24sixnhr8f2hhl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -187197,6 +187230,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "nonempty-zipper" = callPackage
+    ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }:
+     mkDerivation {
+       pname = "nonempty-zipper";
+       version = "1.0.0.0";
+       sha256 = "0qqdrp1rr1qmgxxzwn21gy1gc9mwdhliyp72d74bndqr3yki46fm";
+       libraryHaskellDepends = [ base comonad deepseq safe ];
+       testHaskellDepends = [ base comonad deepseq doctest Glob safe ];
+       description = "A non-empty comonadic list zipper";
+       license = lib.licenses.mit;
+     }) {};
+
   "nonemptymap" = callPackage
     ({ mkDerivation, base, containers, semigroupoids }:
      mkDerivation {
@@ -187685,20 +187730,6 @@ self: {
      }:
      mkDerivation {
        pname = "nri-env-parser";
-       version = "0.1.0.4";
-       sha256 = "01s2346rdccnqrymxb947kx68jqdyh29v3s2mq3c707pvmxlhw4y";
-       libraryHaskellDepends = [
-         base modern-uri network-uri nri-prelude text
-       ];
-       description = "Read environment variables as settings to build 12-factor apps";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "nri-env-parser_0_1_0_5" = callPackage
-    ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text
-     }:
-     mkDerivation {
-       pname = "nri-env-parser";
        version = "0.1.0.5";
        sha256 = "18xxgr82fqnl1s24gcwn7sdq50nsjk4zjl52h14f8zgw4cvkql1h";
        libraryHaskellDepends = [
@@ -187706,7 +187737,6 @@ self: {
        ];
        description = "Read environment variables as settings to build 12-factor apps";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nri-observability" = callPackage
@@ -187741,32 +187771,6 @@ self: {
      }:
      mkDerivation {
        pname = "nri-prelude";
-       version = "0.4.0.0";
-       sha256 = "032j7wy9wjjv0pbn1g16vdj15j03brkkwa3ssjv7g0v61hjaq4z7";
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal async auto-update base bytestring
-         containers directory exceptions filepath ghc hedgehog junit-xml
-         pretty-diff pretty-show safe-exceptions terminal-size text time
-         vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty ansi-terminal async auto-update base bytestring
-         containers directory exceptions filepath ghc hedgehog junit-xml
-         pretty-diff pretty-show safe-exceptions terminal-size text time
-         vector
-       ];
-       description = "A Prelude inspired by the Elm programming language";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "nri-prelude_0_5_0_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async
-     , auto-update, base, bytestring, containers, directory, exceptions
-     , filepath, ghc, hedgehog, junit-xml, pretty-diff, pretty-show
-     , safe-exceptions, terminal-size, text, time, vector
-     }:
-     mkDerivation {
-       pname = "nri-prelude";
        version = "0.5.0.0";
        sha256 = "1avpj21scw9c45208wf8q86n0fs73k3lgm54mgqdwln1m1ajfnvg";
        libraryHaskellDepends = [
@@ -187783,7 +187787,6 @@ self: {
        ];
        description = "A Prelude inspired by the Elm programming language";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "nsis" = callPackage
@@ -189366,8 +189369,8 @@ self: {
      }:
      mkDerivation {
        pname = "oeis2";
-       version = "1.0.4";
-       sha256 = "1parmfwdxrmvzz81dy8mb9ry4bbp1bvsqsr593zld7hnfx6cvlh9";
+       version = "1.0.5";
+       sha256 = "1incjy5si6lwsvh2hfdw61m3jq9qad06nrrylj5b8n5yj54wzna8";
        libraryHaskellDepends = [
          aeson base containers http-conduit lens lens-aeson text vector
        ];
@@ -189823,14 +189826,13 @@ self: {
      }) {};
 
   "one-line-aeson-text" = callPackage
-    ({ mkDerivation, aeson, base, doctest, text, unordered-containers
-     }:
+    ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
        pname = "one-line-aeson-text";
-       version = "0.1.0.0";
-       sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn";
+       version = "0.1.0.2";
+       sha256 = "033dqj6qc0fjq9nq22mbdrhn8nllmx95x785dwv5l7yj7q1rm7q9";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [ aeson base text ];
        description = "Pretty-printing short Aeson values as text";
        license = lib.licenses.asl20;
      }) {};
@@ -190396,45 +190398,6 @@ self: {
      }:
      mkDerivation {
        pname = "openapi3";
-       version = "3.0.1.0";
-       sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc";
-       revision = "1";
-       editedCabalFile = "017mikhl12iyrgn40mmis3m05bfjxmg9y09nsk7i8xfjzkqcnly0";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat-batteries bytestring containers
-         cookie generics-sop hashable http-media insert-ordered-containers
-         lens mtl network optics-core optics-th QuickCheck scientific
-         template-haskell text time transformers unordered-containers
-         uuid-types vector
-       ];
-       executableHaskellDepends = [ aeson base lens text ];
-       testHaskellDepends = [
-         aeson base base-compat-batteries bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         quickcheck-instances template-haskell text time
-         unordered-containers utf8-string vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "OpenAPI 3.0 data model";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "openapi3_3_0_2_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
-     , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
-     , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
-     , HUnit, insert-ordered-containers, lens, mtl, network, optics-core
-     , optics-th, QuickCheck, quickcheck-instances, scientific
-     , template-haskell, text, time, transformers, unordered-containers
-     , utf8-string, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "openapi3";
        version = "3.0.2.0";
        sha256 = "00qpbj2lvaysbwgbax7z1vyixzd0x7yzbz26aw5zxd4asddypbfg";
        isLibrary = true;
@@ -192852,23 +192815,26 @@ self: {
   "overloaded" = callPackage
     ({ mkDerivation, assoc, base, bin, boring, bytestring, constraints
      , containers, fin, generic-lens-lite, ghc, hmatrix, HUnit, lens
-     , optics-core, QuickCheck, ral, record-hasfield, singleton-bool
-     , sop-core, split, syb, symbols, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, vec
+     , optics-core, profunctors, QuickCheck, ral, record-hasfield
+     , semigroupoids, singleton-bool, sop-core, split, splitmix, syb
+     , symbols, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, th-compat, time, vec
      }:
      mkDerivation {
        pname = "overloaded";
-       version = "0.2.1";
-       sha256 = "1qa2xq2hf792ivi92mimznwj86x9y1dpwz7rwcz99zvfk7a3hsis";
+       version = "0.3";
+       sha256 = "151xnpk7l1jg63m4bwr91h3dh1xb0d4xinc4vn1jsbhr96p662ap";
        libraryHaskellDepends = [
-         assoc base bin bytestring containers fin ghc optics-core ral
-         record-hasfield sop-core split syb symbols text time vec
+         assoc base bin bytestring containers fin ghc optics-core
+         profunctors ral record-hasfield semigroupoids sop-core split syb
+         symbols template-haskell text th-compat time vec
        ];
        testHaskellDepends = [
          assoc base bin boring bytestring constraints containers fin
          generic-lens-lite hmatrix HUnit lens optics-core QuickCheck ral
-         record-hasfield singleton-bool sop-core symbols tasty tasty-hunit
-         tasty-quickcheck text time vec
+         record-hasfield singleton-bool sop-core splitmix symbols tasty
+         tasty-hunit tasty-quickcheck template-haskell text th-compat time
+         vec
        ];
        doHaddock = false;
        description = "Overloaded pragmas as a plugin";
@@ -193331,10 +193297,8 @@ self: {
     ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
      mkDerivation {
        pname = "pagination";
-       version = "0.2.1";
-       sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48";
-       revision = "2";
-       editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2";
+       version = "0.2.2";
+       sha256 = "0k5rd55ssrk2f4vfzwnz09az6p1d6igbfmyyyjvnwwjrgcsmynig";
        libraryHaskellDepends = [ base deepseq exceptions ];
        testHaskellDepends = [ base exceptions hspec QuickCheck ];
        description = "Framework-agnostic pagination boilerplate";
@@ -193565,6 +193529,65 @@ self: {
        maintainers = with lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_12" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , case-insensitive, citeproc, commonmark, commonmark-extensions
+     , commonmark-pandoc, connection, containers, data-default, deepseq
+     , Diff, directory, doclayout, doctemplates, emojis, exceptions
+     , executable-path, file-embed, filepath, Glob, haddock-library
+     , hslua, hslua-module-path, hslua-module-system, hslua-module-text
+     , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb
+     , jira-wiki-markup, JuicyPixels, mtl, network, network-uri
+     , pandoc-types, parsec, process, QuickCheck, random, safe
+     , scientific, SHA, skylighting, skylighting-core, split, syb
+     , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua
+     , tasty-quickcheck, temporary, texmath, text, text-conversions
+     , time, unicode-transforms, unix, unordered-containers, xml
+     , xml-conduit, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.12";
+       sha256 = "0z7j6hqfjis0a9bng7dlkwilksrambdcr72gj3aijv827hmz45sm";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring binary
+         blaze-html blaze-markup bytestring case-insensitive citeproc
+         commonmark commonmark-extensions commonmark-pandoc connection
+         containers data-default deepseq directory doclayout doctemplates
+         emojis exceptions file-embed filepath Glob haddock-library hslua
+         hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP
+         http-client http-client-tls http-types ipynb jira-wiki-markup
+         JuicyPixels mtl network network-uri pandoc-types parsec process
+         random safe scientific SHA skylighting skylighting-core split syb
+         tagsoup temporary texmath text text-conversions time
+         unicode-transforms unix unordered-containers xml xml-conduit
+         zip-archive zlib
+       ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring containers Diff directory
+         doctemplates exceptions executable-path filepath Glob hslua mtl
+         pandoc-types process QuickCheck tasty tasty-golden tasty-hunit
+         tasty-lua tasty-quickcheck temporary text time xml zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers mtl tasty tasty-bench text time
+       ];
+       postInstall = ''
+         mkdir -p $out/share/man/man1
+         mv "man/"*.1 $out/share/man/man1/
+       '';
+       description = "Conversion between markup formats";
+       license = lib.licenses.gpl2Plus;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -193626,8 +193649,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.9.1";
-       sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx";
+       version = "0.3.10.0";
+       sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -193953,40 +193976,6 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-plot";
-       version = "1.0.2.1";
-       sha256 = "0yi1dh6d1zxzrpmh32v0c7v921qjyxmmapzv56vh0ih8mi3ggbji";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers data-default directory filepath hashable
-         lifted-async lifted-base mtl pandoc pandoc-types shakespeare
-         tagsoup template-haskell text typed-process yaml
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath githash optparse-applicative
-         pandoc pandoc-types template-haskell text typed-process
-       ];
-       testHaskellDepends = [
-         base containers directory filepath hspec hspec-expectations
-         pandoc-types tasty tasty-hspec tasty-hunit text
-       ];
-       benchmarkHaskellDepends = [
-         base criterion pandoc-types template-haskell text
-       ];
-       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
-       license = lib.licenses.gpl2Plus;
-     }) {};
-
-  "pandoc-plot_1_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion
-     , data-default, directory, filepath, githash, hashable, hspec
-     , hspec-expectations, lifted-async, lifted-base, mtl
-     , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup
-     , tasty, tasty-hspec, tasty-hunit, template-haskell, text
-     , typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-plot";
        version = "1.1.0";
        sha256 = "1dk9s37z3hah1kiha3q9d1yzl0vfgivdazhdcraivaspzi78iry8";
        isLibrary = true;
@@ -194009,7 +193998,6 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
        license = lib.licenses.gpl2Plus;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pandoc-pyplot" = callPackage
@@ -194167,8 +194155,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.3.7";
-       sha256 = "0laqf7mfzdpdbg583l3mr25qxdqryq1cd1141gl713d5m9s1b4fs";
+       version = "0.3.8";
+       sha256 = "093m8hds7x5i2kh478l7vcjjv60x68z96dzyxllaw9aijxrw9h3p";
        description = "A box of patterns and paradigms";
        license = lib.licenses.mit;
      }) {};
@@ -195339,8 +195327,8 @@ self: {
        pname = "parsec";
        version = "3.1.14.0";
        sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67";
-       revision = "2";
-       editedCabalFile = "1xyjd06nns0k65k4ig2azrijy43gnbvpcfwb3jpd8vmn2fnk0yib";
+       revision = "3";
+       editedCabalFile = "1qclpv599691710g321x1864js3gqyfv35xbh6kxlshjdrzcbmbj";
        libraryHaskellDepends = [ base bytestring mtl text ];
        testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
@@ -196104,6 +196092,31 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "password_3_0_0_0" = callPackage
+    ({ mkDerivation, base, base-compat, base64, bytestring, Cabal
+     , cabal-doctest, cryptonite, doctest, memory, password-types
+     , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "password";
+       version = "3.0.0.0";
+       sha256 = "0x6f4zkqqsa6vi5dvy5sj0f7pqkqq9zw3ph9f0d8vl631zcs2inb";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base64 bytestring cryptonite memory password-types
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring cryptonite doctest memory
+         password-types QuickCheck quickcheck-instances scrypt tasty
+         tasty-hunit tasty-quickcheck template-haskell text
+       ];
+       description = "Hashing and checking of passwords";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "password-instances" = callPackage
     ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest
      , doctest, http-api-data, password, persistent, QuickCheck
@@ -196127,6 +196140,49 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "password-instances_3_0_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest
+     , doctest, http-api-data, password, password-types, persistent
+     , QuickCheck, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "password-instances";
+       version = "3.0.0.0";
+       sha256 = "08y42r165n3d7lry160rdmn8akhhfyx76fwjhsqb25zc5a9d5glj";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base http-api-data password-types persistent text
+       ];
+       testHaskellDepends = [
+         aeson base base-compat doctest http-api-data password
+         password-types persistent QuickCheck quickcheck-instances tasty
+         tasty-hunit tasty-quickcheck template-haskell text
+       ];
+       description = "typeclass instances for password package";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "password-types" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, Cabal
+     , cabal-doctest, doctest, memory, QuickCheck, quickcheck-instances
+     , tasty, tasty-quickcheck, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "password-types";
+       version = "1.0.0.0";
+       sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base bytestring memory text ];
+       testHaskellDepends = [
+         base base-compat doctest QuickCheck quickcheck-instances tasty
+         tasty-quickcheck template-haskell text
+       ];
+       description = "Types for handling passwords";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "passwords" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -196328,6 +196384,8 @@ self: {
        pname = "path";
        version = "0.8.0";
        sha256 = "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4";
+       revision = "1";
+       editedCabalFile = "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath hashable template-haskell
          text
@@ -198591,6 +198649,8 @@ self: {
        pname = "persistent-mysql";
        version = "2.10.3.1";
        sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7";
+       revision = "1";
+       editedCabalFile = "1nd3l499kpv2rfhqqjw1b3qsn558rwz3794cy2x493l98rsspszp";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          mysql mysql-simple persistent resource-pool resourcet text
@@ -205659,8 +205719,8 @@ self: {
        pname = "postgresql-simple-url";
        version = "0.2.1.0";
        sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk";
-       revision = "3";
-       editedCabalFile = "02l1g5jiw6idnnax7q2lzayjycgi029pv41njdmwdch57k59vai5";
+       revision = "4";
+       editedCabalFile = "092gkvwzdf0nmm6q6lgjb81j8vpn5d3pybavs39ya2v92mbhrpmm";
        libraryHaskellDepends = [
          base network-uri postgresql-simple split
        ];
@@ -208443,8 +208503,8 @@ self: {
     ({ mkDerivation, base, directory, mmsyn3, process, sublists }:
      mkDerivation {
        pname = "process-sequential";
-       version = "0.1.0.0";
-       sha256 = "11s6ki1cgqav8i06np63cj2l6z1wdszjrq2rslx1pk7af5dxz9r0";
+       version = "0.1.1.0";
+       sha256 = "19dv9sk1hk4ny0zh8amr9bddmjxc94r8h3cims9ylhrrb34zz90f";
        libraryHaskellDepends = [ base directory mmsyn3 process sublists ];
        description = "A test suite for the complex multi files multi level processment";
        license = lib.licenses.mit;
@@ -210196,17 +210256,18 @@ self: {
      }) {};
 
   "proton" = callPackage
-    ({ mkDerivation, adjunctions, base, bifunctors, comonad
-     , compactable, containers, contravariant, distributive, linear, mtl
-     , profunctors, tagged
+    ({ mkDerivation, adjunctions, async, base, bifunctors, comonad
+     , compactable, containers, contravariant, distributive, folds
+     , linear, mtl, profunctors, tagged, transformers
      }:
      mkDerivation {
        pname = "proton";
-       version = "0.0.1";
-       sha256 = "0l3176d1vjvknns2dx7qnwi7n45mc6v4qx9iv3z4488msjfqx6gf";
+       version = "0.0.3";
+       sha256 = "0w68v8sglyg99jni1p1cz6x87cm6x1ayll08wlijaiwpqc2pma2n";
        libraryHaskellDepends = [
-         adjunctions base bifunctors comonad compactable containers
-         contravariant distributive linear mtl profunctors tagged
+         adjunctions async base bifunctors comonad compactable containers
+         contravariant distributive folds linear mtl profunctors tagged
+         transformers
        ];
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -210336,6 +210397,36 @@ self: {
        broken = true;
      }) {};
 
+  "prune-juice" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal
+     , cabal-install-parsers, containers, directory, file-embed
+     , file-path-th, filepath, hspec, megaparsec, monad-logger, mtl
+     , optparse-applicative, process, text, yaml
+     }:
+     mkDerivation {
+       pname = "prune-juice";
+       version = "0.6";
+       sha256 = "0g7gn0158hkr5b27iqlzmhnarb05y5id92qk2jl6azqnzrb2p5j7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cabal-install-parsers containers
+         directory filepath megaparsec monad-logger mtl process text yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring Cabal cabal-install-parsers containers
+         directory filepath megaparsec monad-logger mtl optparse-applicative
+         process text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring Cabal cabal-install-parsers containers
+         directory file-embed file-path-th filepath hspec megaparsec
+         monad-logger mtl process text yaml
+       ];
+       description = "Prune unused Haskell dependencies";
+       license = lib.licenses.mit;
+     }) {};
+
   "psc-ide" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , edit-distance, either, filepath, fsnotify, hspec, http-client
@@ -211505,27 +211596,6 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "2.0.0.3";
-       sha256 = "0h53y0jxk1nyqwyr4f0nry0gl64s1w8ay15fips4drql37apbq1v";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
-         http-client http-client-tls http-types memory text time
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec QuickCheck text unordered-containers
-       ];
-       description = "Haskell client library for the Pusher Channels HTTP API";
-       license = lib.licenses.mit;
-     }) {};
-
-  "pusher-http-haskell_2_1_0_0" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-client-tls
-     , http-types, memory, QuickCheck, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
        version = "2.1.0.0";
        sha256 = "1zmcpbd20m7pc1bc0dwkhy33vbakdwc478dmzpr4l80kck0mpmy6";
        libraryHaskellDepends = [
@@ -211538,7 +211608,6 @@ self: {
        ];
        description = "Haskell client library for the Pusher Channels HTTP API";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -214932,8 +215001,8 @@ self: {
        pname = "range-set-list";
        version = "0.1.3.1";
        sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j";
-       revision = "1";
-       editedCabalFile = "0ma1gxmk2in2fj4rxhwshy2zq690ylw1zz0c9cnyin8mxkp96inc";
+       revision = "2";
+       editedCabalFile = "08b5zlc2q3nyxxjzzigjbjygvd2001i2w3vslacib3kxm4569n8v";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        testHaskellDepends = [
          base containers deepseq hashable tasty tasty-quickcheck
@@ -215339,8 +215408,8 @@ self: {
        pname = "rasterific-svg";
        version = "0.3.3.2";
        sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2";
-       revision = "1";
-       editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv";
+       revision = "2";
+       editedCabalFile = "1938sp9m0yi7ypxk74bzrbkp9b4yk6hsaqhlhbraf9yb7w61228v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216637,8 +216706,8 @@ self: {
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "1.1.3.3";
-       sha256 = "1d348fpfzfqi3vm8qzdxbbdrx62awxx0hrnj3vw1szp41an6ya30";
+       version = "1.1.4.0";
+       sha256 = "0gz651ipn5w6w7adxkvkcgi6nb1d2vs72l8glz5jdll44mchdk55";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal array attoparsec base base64-bytestring
@@ -216856,23 +216925,6 @@ self: {
      }:
      mkDerivation {
        pname = "record-dot-preprocessor";
-       version = "0.2.9";
-       sha256 = "02g36p14waf66lwwy2s4jy19pmkxv46kqfkkipy7qix3vaffbzir";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base extra ghc uniplate ];
-       executableHaskellDepends = [ base extra ];
-       testHaskellDepends = [ base extra filepath record-hasfield ];
-       description = "Preprocessor to allow record.field syntax";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "record-dot-preprocessor_0_2_10" = callPackage
-    ({ mkDerivation, base, extra, filepath, ghc, record-hasfield
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "record-dot-preprocessor";
        version = "0.2.10";
        sha256 = "1zwkc5mqcxlv4cm7qd75sdmvjckvpchcrqphsq82val41mp27nk5";
        isLibrary = true;
@@ -216882,7 +216934,6 @@ self: {
        testHaskellDepends = [ base extra filepath record-hasfield ];
        description = "Preprocessor to allow record.field syntax";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "record-encode" = callPackage
@@ -217049,6 +217100,26 @@ self: {
        broken = true;
      }) {};
 
+  "recover-rtti" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, ghc-heap
+     , ghc-prim, mtl, QuickCheck, sop-core, stm, tasty, tasty-quickcheck
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "recover-rtti";
+       version = "0.1.0.0";
+       sha256 = "19bf4279nfq8sv20v56sah30mv2g10zy2yxcylhc33w85d9jkisl";
+       libraryHaskellDepends = [
+         aeson base bytestring containers ghc-heap mtl sop-core stm text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers ghc-heap ghc-prim mtl QuickCheck
+         sop-core stm tasty tasty-quickcheck text vector
+       ];
+       description = "Recover run-time type information from the GHC heap";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "recursion" = callPackage
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
@@ -218931,6 +219002,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "regex-pcre-builtin_0_95_2_3_8_43" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, regex-base
+     , text
+     }:
+     mkDerivation {
+       pname = "regex-pcre-builtin";
+       version = "0.95.2.3.8.43";
+       sha256 = "02c6vzxcy1zkqwy6w4dsc97xvvdwlh8xr7imrlx2qs2521rvswr7";
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base text
+       ];
+       description = "PCRE Backend for \"Text.Regex\" (regex-base)";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "regex-pcre-text" = callPackage
     ({ mkDerivation, array, base, bytestring, regex-base
      , regex-pcre-builtin, regex-tdfa-text, text
@@ -221081,8 +221168,8 @@ self: {
      }:
      mkDerivation {
        pname = "rescue";
-       version = "0.3.0";
-       sha256 = "0lfvd5x845m2by8n67lgcybp22ppf7yxgglcqzwwfmmpa9qnchq2";
+       version = "0.4.0";
+       sha256 = "0hv2q8mkd94ksxgvijn83bkxf9lgnqn92g6k4ryl05z21sc8wl8d";
        libraryHaskellDepends = [
          base exceptions ghc mtl text transformers transformers-base
          world-peace
@@ -222610,8 +222697,8 @@ self: {
      }:
      mkDerivation {
        pname = "ridley";
-       version = "0.3.1.4";
-       sha256 = "120yqfrkp4ziz8yn6xgzzhdszrvq1dk1szzh3q2m8w36c0g2qdhy";
+       version = "0.3.2.1";
+       sha256 = "14k7cmbcwqxf4d7r6yz77wpj88q3v9vx90agx16wd8dk1zzmcbx5";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          async base containers ekg-core ekg-prometheus-adapter inline-c
@@ -222636,8 +222723,8 @@ self: {
      }:
      mkDerivation {
        pname = "ridley-extras";
-       version = "0.1.0.2";
-       sha256 = "0ckc9amxp6picp1xmpxgplnxsn39p5h6j0y8h3mj5ik3720qn6c8";
+       version = "0.1.1.0";
+       sha256 = "1syqjc1002cxdk8bsa3k2c232dkmhlw9r4bi5h68a0ddvi86x0ha";
        libraryHaskellDepends = [
          base ekg-prometheus-adapter microlens mtl prometheus ridley shelly
          text transformers
@@ -225275,6 +225362,17 @@ self: {
        broken = true;
      }) {};
 
+  "safe-coloured-text" = callPackage
+    ({ mkDerivation, base, bytestring, terminfo, text }:
+     mkDerivation {
+       pname = "safe-coloured-text";
+       version = "0.0.0.0";
+       sha256 = "0c07527g35gpxif8ia07x766pmzcf4m1cgjz9lkac973n12iwllx";
+       libraryHaskellDepends = [ base bytestring terminfo text ];
+       description = "Safely output coloured text";
+       license = lib.licenses.mit;
+     }) {};
+
   "safe-decimal" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
      , exceptions, hspec, hspec-discover, QuickCheck, scientific
@@ -226609,30 +226707,30 @@ self: {
 
   "sbv" = callPackage
     ({ mkDerivation, array, async, base, bench-show, bytestring
-     , containers, crackNum, deepseq, directory, doctest, filepath
-     , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random
-     , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+     , containers, deepseq, directory, doctest, filepath, gauge, Glob
+     , hlint, libBF, mtl, pretty, process, QuickCheck, random, silently
+     , syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
      , template-haskell, text, time, transformers, uniplate, z3
      }:
      mkDerivation {
        pname = "sbv";
-       version = "8.10";
-       sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji";
+       version = "8.12";
+       sha256 = "0qr9z5vm4py072a23nc263ma7k5hg6n9xy2pq9pra8z16sq4bnb3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         array async base containers crackNum deepseq directory filepath mtl
+         array async base containers deepseq directory filepath libBF mtl
          pretty process QuickCheck random syb template-haskell text time
          transformers uniplate
        ];
        testHaskellDepends = [
-         base bytestring containers crackNum directory doctest filepath Glob
-         hlint mtl QuickCheck random tasty tasty-golden tasty-hunit
+         base bytestring containers directory doctest filepath Glob hlint
+         mtl QuickCheck random tasty tasty-golden tasty-hunit
          tasty-quickcheck
        ];
        testSystemDepends = [ z3 ];
        benchmarkHaskellDepends = [
-         base bench-show containers crackNum deepseq directory filepath
-         gauge mtl process random silently syb text time
+         base bench-show containers deepseq directory filepath gauge mtl
+         process random silently syb text time
        ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = lib.licenses.bsd3;
@@ -230088,8 +230186,8 @@ self: {
      }:
      mkDerivation {
        pname = "sequence-formats";
-       version = "1.6.0";
-       sha256 = "1vy2wwzpnqd2c0ma3jm46gx3w3al0j61ncr22bcahsb1nrgmg0dq";
+       version = "1.6.1";
+       sha256 = "0r2p8aap9z82yhw6gagl1h7s8v05zf6w82qzhqr6p1msv183fm2a";
        libraryHaskellDepends = [
          attoparsec base bytestring containers errors exceptions foldl
          lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe
@@ -232819,13 +232917,15 @@ self: {
      }) {};
 
   "servant-to-elm" = callPackage
-    ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm
-     , http-types, servant, servant-multipart, text
+    ({ mkDerivation, aeson, base, bound, bytestring, directory
+     , elm-syntax, filepath, generics-sop, haskell-to-elm, hspec
+     , http-types, prettyprinter, process, servant, servant-multipart
+     , temporary, text, unordered-containers
      }:
      mkDerivation {
        pname = "servant-to-elm";
-       version = "0.4.1.0";
-       sha256 = "0kxkyijkxvpb5jv815i9s6pg7rnq437jj7hrwr0xprxd709mc648";
+       version = "0.4.2.0";
+       sha256 = "1hbz6c9233wgpgmgnplg9qv5hrniynkn5n4zsmkyansw07gmaw05";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -232833,8 +232933,9 @@ self: {
          servant-multipart text
        ];
        testHaskellDepends = [
-         aeson base bound elm-syntax haskell-to-elm http-types servant
-         servant-multipart text
+         aeson base bound bytestring directory elm-syntax filepath
+         generics-sop haskell-to-elm hspec http-types prettyprinter process
+         servant servant-multipart temporary text unordered-containers
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = lib.licenses.bsd3;
@@ -234155,6 +234256,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "shake-bench" = callPackage
+    ({ mkDerivation, aeson, base, Chart, Chart-diagrams, diagrams
+     , diagrams-svg, directory, extra, filepath, shake, text
+     }:
+     mkDerivation {
+       pname = "shake-bench";
+       version = "0.1.0.0";
+       sha256 = "09lgmiw77nr3xycxksvzmcw1c2j66h51d5vxpm0lngv1dnsrad64";
+       libraryHaskellDepends = [
+         aeson base Chart Chart-diagrams diagrams diagrams-svg directory
+         extra filepath shake text
+       ];
+       description = "Build rules for historical benchmarking";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "shake-bindist" = callPackage
     ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake
      , zlib, zstd
@@ -235517,6 +235636,8 @@ self: {
        pname = "shower";
        version = "0.2.0.2";
        sha256 = "0flad49vvqww2pbf6j8557szffd7wb3z375avhvzwqyklimwipgn";
+       revision = "1";
+       editedCabalFile = "0d5vfb65lq6f36lagsf89dj45gs68dyv6cc6lqxz0c23bv91qarc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base megaparsec pretty ];
@@ -237516,8 +237637,6 @@ self: {
        ];
        description = "Sized functors, for size-based enumerations";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "sized" = callPackage
@@ -243888,42 +244007,6 @@ self: {
      }:
      mkDerivation {
        pname = "stache";
-       version = "2.2.0";
-       sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g";
-       revision = "3";
-       editedCabalFile = "1wjdn7qsrfnz2cqwx2pggi8ak3pj01zsmax14gvb8xsq4w9crdvx";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory filepath
-         megaparsec mtl template-haskell text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base filepath gitrev optparse-applicative text
-         unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec template-haskell text yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base criterion deepseq megaparsec text
-       ];
-       description = "Mustache templates for Haskell";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "stache_2_2_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, directory, file-embed, filepath, gitrev, hspec
-     , hspec-discover, hspec-megaparsec, megaparsec, mtl
-     , optparse-applicative, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
        version = "2.2.1";
        sha256 = "1vkvi9rrf15a8lbihvcmrslykby4qc4jmc5zaqm1ikxsid9x5704";
        isLibrary = true;
@@ -243947,7 +244030,6 @@ self: {
        ];
        description = "Mustache templates for Haskell";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -244368,6 +244450,8 @@ self: {
        pname = "stack2cabal";
        version = "1.0.12";
        sha256 = "0424qz4fy8218a0zr8pw5kbaldrb3wddvsb87sjqbb4q5qcm7rj7";
+       revision = "1";
+       editedCabalFile = "12i5fnjf393jnfqq1qchfd0bpa0isj4j0bzs14wp80s7sh8f10kz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -245186,8 +245270,6 @@ self: {
        ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "statethread" = callPackage
@@ -248181,8 +248263,6 @@ self: {
        ];
        description = "A library for generating random string from a regular experession";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "string-similarity" = callPackage
@@ -248380,8 +248460,8 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "stripe-concepts";
-       version = "1.0.2.4";
-       sha256 = "0n4q3hsgqrqypmkkim8mcksdlljgldr908wqxlcz6k1wsv9klyc6";
+       version = "1.0.2.6";
+       sha256 = "0vz8kiwg9q27jhr6gfvhqy9gykrl3zgy3m2ldk1np4v7y4fg7906";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Types for the Stripe API";
        license = lib.licenses.mit;
@@ -248422,8 +248502,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-hs";
-       version = "0.2.1.0";
-       sha256 = "1f8snldj183yz20f50kkwg6kqcr5zigp3n9k32hxa6dah8xvvnh1";
+       version = "0.3.0.0";
+       sha256 = "0hcni1fqvw2p7jyvl5nmaxp5dhp52dqyp4x3wk8i2j3ix4zjn6xi";
        libraryHaskellDepends = [
          aeson base bytestring casing cpphs cryptonite http-client
          http-types memory safe servant servant-client stripe-servant text
@@ -248488,8 +248568,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-scotty";
-       version = "1.0.0.6";
-       sha256 = "1x7dsk2m66ka8qd76mj5aww52rjs0b49vx1lws5bl2xl0asyb03v";
+       version = "1.0.0.8";
+       sha256 = "1r91lf3yjivfcxdnqy1ayfzs2ckszyx8x6f6fn8rjiz0gfv1v6hn";
        libraryHaskellDepends = [
          aeson base bytestring http-types scotty stripe-concepts
          stripe-signature text unordered-containers
@@ -248506,8 +248586,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-servant";
-       version = "0.2.1.0";
-       sha256 = "0vvzf4wh2d9bv5af2al2hdgvy5ds7v7p8w14l018cn3f3iynwh3f";
+       version = "0.3.0.0";
+       sha256 = "0zk9pbf498liq9sxqsb0hfk6w3jv03m4amlqqxr4dh3l98i03cli";
        libraryHaskellDepends = [
          aeson base casing http-api-data servant text time
          unordered-containers vector
@@ -248522,8 +248602,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-signature";
-       version = "1.0.0.6";
-       sha256 = "0lp3fli9g5yvlxy8f0md2d3wv6z45mw0929b8c0y2xkcsdjvpp5l";
+       version = "1.0.0.8";
+       sha256 = "0cybjsvzknsldqhf7fjd4ar2qjyym43x2ymmgw01f9a1ixyaxgmn";
        libraryHaskellDepends = [
          base base16-bytestring bytestring cryptonite memory stripe-concepts
          text
@@ -248556,8 +248636,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-wreq";
-       version = "1.0.1.6";
-       sha256 = "1lwwyzj4gi6rav8al3mkld4vq8rdvi4ir1y51nywflkcfiqjjjsx";
+       version = "1.0.1.8";
+       sha256 = "1km0h94d1clgba0yy520yx54axdkf4xl5p5hnmn8ghg40r0pax73";
        libraryHaskellDepends = [
          aeson base bytestring lens stripe-concepts text
          unordered-containers wreq
@@ -248723,10 +248803,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured";
-       version = "0.1";
-       sha256 = "0xm0m7jxwrbz8jgcn2dl5vhlz0gcg7wxcbbgaqidm2msmnc6fqww";
-       revision = "2";
-       editedCabalFile = "0l9ls0r1v5bjcznjd0jcpml8vpr4iq8shp4dm4jkv96i3x277gdv";
+       version = "0.1.0.1";
+       sha256 = "1ai760kzx0y901zwimsgiwbms88cyhg9mblhpqr0813dxqy31d5f";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          hashable scientific tagged text time-compat transformers
@@ -249009,8 +249087,8 @@ self: {
        pname = "stylist";
        version = "2.4.0.0";
        sha256 = "0nkz6jnfx7si473lz0b907lq6zjpw2apbcph61s2aw44j5zgdg96";
-       revision = "1";
-       editedCabalFile = "18amb2sbp4qh2lszc21vpvnyqsbsy7s9396ivkcw7dmg7hljvk9a";
+       revision = "2";
+       editedCabalFile = "104rdqv33v54sj6yf8438sk7d0x0964b3gr1cj42qlxa8wl2idx0";
        libraryHaskellDepends = [
          async base css-syntax hashable network-uri regex-tdfa text
          unordered-containers
@@ -250086,8 +250164,6 @@ self: {
        ];
        description = "DSL for building SVG";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "svg-builder-fork" = callPackage
@@ -250634,28 +250710,135 @@ self: {
   "sydtest" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, Diff, dlist
      , envparse, MonadRandom, mtl, optparse-applicative, path, path-io
-     , pretty-show, QuickCheck, quickcheck-io, rainbow, random-shuffle
-     , safe, split, stm, sydtest-discover, text, yaml
+     , pretty-show, QuickCheck, quickcheck-io, random-shuffle, safe
+     , safe-coloured-text, split, stm, sydtest-discover, text, yaml
      , yamlparse-applicative
      }:
      mkDerivation {
        pname = "sydtest";
-       version = "0.0.0.0";
-       sha256 = "0ii5fmhksfhl7a6a8bkqih4y20q8964879x3fb5nzv6dah5qq7x5";
+       version = "0.1.0.0";
+       sha256 = "1r5p9vai0krzcnwxyicw9b00vzdqdm8zpj70y8snn4mdxxvhvyvq";
        libraryHaskellDepends = [
          async base bytestring containers Diff dlist envparse MonadRandom
          mtl optparse-applicative path path-io pretty-show QuickCheck
-         quickcheck-io rainbow random-shuffle safe split text yaml
-         yamlparse-applicative
+         quickcheck-io random-shuffle safe safe-coloured-text split text
+         yaml yamlparse-applicative
+       ];
+       testHaskellDepends = [
+         base bytestring path path-io QuickCheck safe-coloured-text stm text
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "A modern testing framework for Haskell with good defaults and advanced testing features";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "sydtest-discover" = callPackage
+    ({ mkDerivation, base, filepath, optparse-applicative, path
+     , path-io
+     }:
+     mkDerivation {
+       pname = "sydtest-discover";
+       version = "0.0.0.0";
+       sha256 = "1kyjcvi9paax0hi05d2qab8pdkvvabq8s0gl772qiq8rhmrmazsx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath optparse-applicative path path-io
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Automatic test suite discovery for sydtest";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "sydtest-persistent-sqlite" = callPackage
+    ({ mkDerivation, base, monad-logger, mtl, persistent
+     , persistent-sqlite, persistent-template, sydtest, sydtest-discover
+     }:
+     mkDerivation {
+       pname = "sydtest-persistent-sqlite";
+       version = "0.0.0.0";
+       sha256 = "0p9xy2pdjnzd61dadvrzrnnxxz04xm0ypn2h1ssmrilfglic80iz";
+       libraryHaskellDepends = [
+         base monad-logger mtl persistent persistent-sqlite
+         persistent-template sydtest
+       ];
+       testHaskellDepends = [
+         base persistent persistent-sqlite persistent-template sydtest
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "A persistent-sqlite companion library for sydtest";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "sydtest-servant" = callPackage
+    ({ mkDerivation, base, http-client, servant, servant-client
+     , servant-server, stm, sydtest, sydtest-discover, sydtest-wai
+     }:
+     mkDerivation {
+       pname = "sydtest-servant";
+       version = "0.0.0.0";
+       sha256 = "147v5s10qvpp67aq7c240rsc4f356hvznc5gb538slh03d5vas4j";
+       libraryHaskellDepends = [
+         base http-client servant servant-client servant-server sydtest
+         sydtest-wai
+       ];
+       testHaskellDepends = [
+         base servant servant-client servant-server stm sydtest
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "A servant companion library for sydtest";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "sydtest-wai" = callPackage
+    ({ mkDerivation, base, http-client, http-types, stm, sydtest
+     , sydtest-discover, wai, warp
+     }:
+     mkDerivation {
+       pname = "sydtest-wai";
+       version = "0.0.0.0";
+       sha256 = "01fqys32zj1rg9ciq04l7d4av3i1ynw3yinkgc84c3ia330i98ws";
+       libraryHaskellDepends = [ base http-client sydtest wai warp ];
+       testHaskellDepends = [
+         base http-client http-types stm sydtest wai
+       ];
+       testToolDepends = [ sydtest-discover ];
+       description = "A wai companion library for sydtest";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "sydtest-yesod" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+     , conduit, containers, cookie, exceptions, http-client, http-types
+     , monad-logger, mtl, persistent, persistent-sqlite
+     , persistent-template, pretty-show, QuickCheck, resourcet, sydtest
+     , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text
+     , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test
+     }:
+     mkDerivation {
+       pname = "sydtest-yesod";
+       version = "0.0.0.0";
+       sha256 = "0mknn114q495f1bh829fi6c9gag58048c0m06yw0bkl0ikz32k67";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive containers cookie
+         exceptions http-client http-types mtl pretty-show sydtest
+         sydtest-wai text time wai xml-conduit yesod-core yesod-test
        ];
        testHaskellDepends = [
-         base bytestring path path-io QuickCheck rainbow stm text
+         base bytestring conduit cookie http-client http-types monad-logger
+         mtl persistent persistent-sqlite persistent-template QuickCheck
+         resourcet sydtest sydtest-persistent-sqlite text yesod yesod-form
        ];
        testToolDepends = [ sydtest-discover ];
-       description = "An advanced modern testing framework for Haskell with good defaults and advanced testing features";
+       description = "A yesod companion library for sydtest";
        license = "unknown";
        hydraPlatforms = lib.platforms.none;
-     }) {sydtest-discover = null;};
+     }) {};
 
   "syfco" = callPackage
     ({ mkDerivation, array, base, containers, convertible, directory
@@ -256711,8 +256894,6 @@ self: {
        ];
        description = "Functional Enumeration of Algebraic Types";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "testing-type-modifiers" = callPackage
@@ -258101,6 +258282,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "th-compat_0_1_2" = callPackage
+    ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "th-compat";
+       version = "0.1.2";
+       sha256 = "009qc0yy5iq61kgnp9n6vdlqh8zmk4bjawcvpigccgfyk40mvi1b";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [
+         base base-compat hspec mtl template-haskell
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Backward- (and forward-)compatible Quote and Code types";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "th-constraint-compat" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
@@ -258208,6 +258407,21 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "th-expand-syns_0_4_7_0" = callPackage
+    ({ mkDerivation, base, containers, syb, template-haskell }:
+     mkDerivation {
+       pname = "th-expand-syns";
+       version = "0.4.7.0";
+       sha256 = "1gmb89pgy3i0jpd760xmzx254xpg8pczfa8glgw9z1wak09kwv54";
+       revision = "1";
+       editedCabalFile = "0zh77kg86qmr285sn0xhhi2hbn8b9dx2pgmf2fipij8zj32k9ny4";
+       libraryHaskellDepends = [ base containers syb template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
+       description = "Expands type synonyms in Template Haskell ASTs";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "th-extras" = callPackage
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
@@ -267482,6 +267696,8 @@ self: {
        pname = "ucl";
        version = "0.2.0.0";
        sha256 = "1ccf9zavmsk0msq4gz6alv5z32qwnap8a4zvajmqps69bh66b9wv";
+       revision = "1";
+       editedCabalFile = "1gyhy1311wqj5s10pgkpc0vsmvcqja23p4nqn3nv0mbc9fajal2n";
        libraryHaskellDepends = [ base bytestring containers text time ];
        libraryPkgconfigDepends = [ libucl ];
        testHaskellDepends = [ base containers ];
@@ -271845,24 +272061,6 @@ self: {
      }) {};
 
   "validation" = callPackage
-    ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens
-     , semigroupoids, semigroups
-     }:
-     mkDerivation {
-       pname = "validation";
-       version = "1.1";
-       sha256 = "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5";
-       revision = "1";
-       editedCabalFile = "1rrjg9z399k6pb55nv85mlr5bkmdqbjwkvl1cy7ydccdx6ks4syp";
-       libraryHaskellDepends = [
-         base bifunctors deepseq lens semigroupoids semigroups
-       ];
-       testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
-       description = "A data-type like Either but with an accumulating Applicative";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "validation_1_1_1" = callPackage
     ({ mkDerivation, assoc, base, bifunctors, deepseq, hedgehog, HUnit
      , lens, semigroupoids, semigroups
      }:
@@ -271876,7 +272074,6 @@ self: {
        testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "validation-selective" = callPackage
@@ -272017,6 +272214,17 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "validity-persistent" = callPackage
+    ({ mkDerivation, base, hspec, persistent, validity }:
+     mkDerivation {
+       pname = "validity-persistent";
+       version = "0.0.0.0";
+       sha256 = "02kyiwnj53kk11p0178m98gbfs7508lpk0bi4yd1svpj3vryhf6c";
+       libraryHaskellDepends = [ base hspec persistent validity ];
+       description = "Validity instances for persistent-related types";
+       license = lib.licenses.mit;
+     }) {};
+
   "validity-primitive" = callPackage
     ({ mkDerivation, base, primitive, validity }:
      mkDerivation {
@@ -278088,6 +278296,27 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
+  "webmention" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, either
+     , exceptions, hspec, http-client, http-client-tls, http-types
+     , modern-uri, tagsoup, text
+     }:
+     mkDerivation {
+       pname = "webmention";
+       version = "0.1.0.0";
+       sha256 = "12lm7w0isb1dfs28r6yr8pz5czpmw5p6krdbz0rpp4hr487sz9pb";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive either exceptions hspec
+         http-client http-client-tls http-types modern-uri tagsoup text
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive either exceptions hspec
+         http-client http-client-tls http-types modern-uri tagsoup text
+       ];
+       description = "Types and functions for working with Webmentions";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "webp" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, JuicyPixels, libwebp
      , tasty, tasty-hunit, vector
@@ -282016,8 +282245,8 @@ self: {
        pname = "xml-conduit-stylist";
        version = "2.3.0.0";
        sha256 = "15iznb6xpas8044p03w3vll4vv7zwpcbbrh59ywwjr8m45659p4w";
-       revision = "1";
-       editedCabalFile = "0ydqjrk5q3zzgrwk9cqcjlk3vafzcnxjvb7p74ywm5wfnhmfvmyn";
+       revision = "2";
+       editedCabalFile = "16hky6q4v5zmxyarj464i5hlq7s4c9b3vb7skxn2yi66vfy03a32";
        libraryHaskellDepends = [
          base containers css-syntax network-uri stylist text
          unordered-containers xml-conduit
@@ -284158,26 +284387,18 @@ self: {
 
   "yamlparse-applicative" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
-     , genvalidity-aeson, genvalidity-containers, genvalidity-hspec
-     , genvalidity-scientific, genvalidity-text
-     , genvalidity-unordered-containers, hspec, optparse-applicative
-     , path, path-io, prettyprinter, QuickCheck, scientific, text
-     , unordered-containers, validity, validity-text, vector, yaml
+     , optparse-applicative, path, path-io, prettyprinter
+     , safe-coloured-text, scientific, text, unordered-containers
+     , validity, validity-text, vector, yaml
      }:
      mkDerivation {
        pname = "yamlparse-applicative";
-       version = "0.1.0.2";
-       sha256 = "1bzf3kbhccxzg88amyk3ys3bwfi99fhmfa843sxn53nrbgphdw09";
+       version = "0.1.0.3";
+       sha256 = "14fp7qyfh9ax2cqp5amvj2hi8fl9imdq25j8bx5mil8f2jxqr6bi";
        libraryHaskellDepends = [
          aeson base bytestring containers optparse-applicative path path-io
-         prettyprinter scientific text unordered-containers validity
-         validity-text vector yaml
-       ];
-       testHaskellDepends = [
-         aeson base containers genvalidity-aeson genvalidity-containers
-         genvalidity-hspec genvalidity-scientific genvalidity-text
-         genvalidity-unordered-containers hspec QuickCheck scientific text
-         unordered-containers
+         prettyprinter safe-coloured-text scientific text
+         unordered-containers validity validity-text vector yaml
        ];
        description = "Declaritive configuration parsing with free docs";
        license = lib.licenses.mit;
@@ -285254,30 +285475,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.6.1.7";
-       sha256 = "11z4zgzj9j15agnqj9dpfavmi2ns9d6aa4inazk1kig1wai2inp1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring cryptonite errors hoauth2 http-client
-         http-conduit http-types memory microlens safe-exceptions text
-         uri-bytestring yesod-auth yesod-core
-       ];
-       testHaskellDepends = [ base hspec uri-bytestring ];
-       description = "OAuth 2.0 authentication plugins";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "yesod-auth-oauth2_0_6_2_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cryptonite, errors
-     , hoauth2, hspec, http-client, http-conduit, http-types, memory
-     , microlens, safe-exceptions, text, uri-bytestring, yesod-auth
-     , yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-auth-oauth2";
        version = "0.6.2.3";
        sha256 = "1vf4cfbqg4zx3rdihj1iajk6kmj9c8xk4s4n2n40yvz2rmbjy0yb";
        isLibrary = true;
@@ -286063,8 +286260,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.12.6.5";
-       sha256 = "1bs0npryigf7k8gj48i8r8snylc49qdca96610msi6df843c6s6g";
+       version = "0.12.6.6";
+       sha256 = "1myjm5fjcqkzh90bz14mn5rrhy41wfg0i76dihhbkhx7g15z4nwz";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare text xss-sanitize yesod-core yesod-form
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 4d66478f338..86123d8a70f 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -28,4 +28,8 @@ self: super: {
   graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
   # cabal2nix  --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
   graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
+
+  # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
+  # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
+  hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {};
 }
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d53edaad03e..b13c50f18d2 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -51,7 +51,7 @@ let
       # - If you run:
       #     ruby -e "puts RbConfig::CONFIG['configure_args']"
       # - In:
-      #     $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
+      #     $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
       #   Or (usually):
       #     $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
       # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
@@ -177,7 +177,7 @@ let
                 $out/lib/libruby*
               ${removeReferencesTo}/bin/remove-references-to \
                 -t ${stdenv.cc} \
-                $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
+                $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
             ''
           }
           # Bundler tries to create this directory
@@ -189,7 +189,7 @@ let
           addRubyLibPath() {
             addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
             addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
-            addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system}
+            addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system}
           }
 
           addEnvHooks "$hostOffset" addGemPath
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 1dec830566f..2208606a813 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblouis";
-  version = "3.16.1";
+  version = "3.17.0";
 
   src = fetchFromGitHub {
     owner = "liblouis";
     repo = "liblouis";
     rev = "v${version}";
-    sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5";
+    sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k=";
   };
 
   outputs = [ "out" "dev" "man" "info" "doc" ];
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index f88f5614cc5..c62aa77c61a 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -35,6 +35,7 @@ let
       # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
       # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
       license = with licenses; [ mit publicDomain bsd3 asl20 ];
+      maintainers = with maintainers; [ mindavi ];
       platforms = platforms.all;
     };
   };
diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
new file mode 100644
index 00000000000..7f49430c15c
--- /dev/null
+++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
@@ -0,0 +1,21 @@
+{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck
+, transformers, transformers-compat
+}:
+mkDerivation {
+  pname = "hercules-ci-optparse-applicative";
+  version = "0.16.1.0";
+  src = fetchgit {
+    url = "https://github.com/hercules-ci/optparse-applicative.git";
+    sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48";
+    rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [
+    ansi-wl-pprint base process transformers transformers-compat
+  ];
+  testHaskellDepends = [ base QuickCheck ];
+  homepage = "https://github.com/hercules-ci/optparse-applicative";
+  description = "Utilities and combinators for parsing command line options (fork)";
+  license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ roberth ];
+}
diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix
index 0d81110dee8..c29737595af 100644
--- a/pkgs/development/python-modules/deepmerge/default.nix
+++ b/pkgs/development/python-modules/deepmerge/default.nix
@@ -1,22 +1,30 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
-, vcver }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, setuptools-scm
+, vcver
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "deepmerge";
-  version = "0.1.1";
+  version = "0.2.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f";
+    sha256 = "082bvlk65pkf9qzkzzl8fq7s6zfz1b2v5pcb0ikwg1nx0xspggaz";
   };
 
-  propagatedBuildInputs = [
+  nativeBuildInputs = [
+    setuptools-scm
     vcver
   ];
 
-  # depends on https://pypi.org/project/uranium/
-  doCheck = false;
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "deepmerge" ];
 
diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix
index 36025e85bf8..100c7ee6fc1 100644
--- a/pkgs/development/python-modules/defcon/default.nix
+++ b/pkgs/development/python-modules/defcon/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "defcon";
-  version = "0.8.0";
+  version = "0.8.1";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "028j7i39m75fnbyc6jsvwwiz31vq4slxwf47y6yszy1qn61xkcna";
+    sha256 = "1sj9yhwkyvzchglpy07pkx5362mwlap581ibv150b5l9s5mxn2j1";
     extension = "zip";
   };
 
diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix
new file mode 100644
index 00000000000..dfca0c4d388
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/hci/default.nix
@@ -0,0 +1,23 @@
+{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
+let
+  inherit (haskell.lib) overrideCabal addBuildDepends;
+  inherit (lib) makeBinPath;
+  bundledBins = lib.optional stdenv.isLinux runc;
+
+  pkg =
+    # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
+    overrideCabal
+      (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ])
+      (o: {
+        postInstall = ''
+          ${o.postInstall or ""}
+          mkdir -p $out/libexec
+          mv $out/bin/hci $out/libexec
+          makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins}
+        '';
+      });
+in pkg // {
+    meta = pkg.meta // {
+      position = toString ./default.nix + ":1";
+    };
+  }
diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
index c8316f4bb57..ccb8b4eba65 100644
--- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
@@ -1,7 +1,9 @@
-{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }:
+{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
 let
   inherit (haskell.lib) overrideCabal addBuildDepends;
   inherit (lib) makeBinPath;
+  bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
+
   pkg =
     # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
     overrideCabal
@@ -11,7 +13,7 @@ let
           ${o.postInstall or ""}
           mkdir -p $out/libexec
           mv $out/bin/hercules-ci-agent $out/libexec
-          makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]}
+          makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins}
         '';
       });
 in pkg // {
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 047c072c389..cb6ee5aefe0 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.33"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.34"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index a58e933d3c3..17d21d96423 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 76926232b9c92df4832d986513fe89b8c1d53f1f
-  ref: refs/tags/6.0.33
+  revision: 010e4d5a643a857e09bafbcf79b541e607de3c4c
+  ref: refs/tags/6.0.34
   specs:
-    metasploit-framework (6.0.33)
+    metasploit-framework (6.0.34)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -12,7 +12,6 @@ GIT
       aws-sdk-s3
       bcrypt
       bcrypt_pbkdf
-      bit-struct
       bson
       concurrent-ruby (= 1.0.5)
       dnsruby
@@ -31,7 +30,7 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.34)
+      metasploit-payloads (= 2.0.37)
       metasploit_data_models
       metasploit_payloads-mettle (= 1.0.6)
       mqtt
@@ -124,22 +123,22 @@ GEM
     arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.1)
-    aws-partitions (1.431.1)
-    aws-sdk-core (3.112.1)
+    aws-partitions (1.432.0)
+    aws-sdk-core (3.113.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.226.0)
+    aws-sdk-ec2 (1.227.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.48.0)
+    aws-sdk-iam (1.49.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.42.0)
+    aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.89.0)
+    aws-sdk-s3 (1.91.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -148,7 +147,6 @@ GEM
     bcrypt (3.1.16)
     bcrypt_pbkdf (1.1.0)
     bindata (2.4.8)
-    bit-struct (0.16)
     bson (4.12.0)
     builder (3.2.4)
     concurrent-ruby (1.0.5)
@@ -168,7 +166,7 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     erubi (1.10.0)
     eventmachine (1.2.7)
-    faker (2.16.0)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
@@ -214,7 +212,7 @@ GEM
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-payloads (2.0.34)
+    metasploit-payloads (2.0.37)
     metasploit_data_models (4.1.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
@@ -240,7 +238,7 @@ GEM
     network_interface (0.0.2)
     nexpose (7.2.1)
     nio4r (2.5.7)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     octokit (4.20.0)
@@ -325,7 +323,7 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.25)
+    rex-socket (0.1.26)
       rex-core
     rex-sslscan (0.1.6)
       rex-core
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 0887f84410e..b5fb78fd1f3 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.0.33";
+  version = "6.0.34";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "sha256-hIAXqohZyBJfVj4BxxYVpERZDU6sd6EnVgVax7MXQ7Q=";
+    sha256 = "sha256-sKt1hN7thNhA+bjeFF3gxJs/82EPXPiM81zcMpDRDyg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index c66c4c5880b..edd4d305fd8 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -114,60 +114,60 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08574xgyq39z07xhbgc12882v38lgkmj0jpznpcivjca1v7dk53l";
+      sha256 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg";
       type = "gem";
     };
-    version = "1.431.1";
+    version = "1.432.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9";
+      sha256 = "1774xyfqf307qvh5npvf01948ayrviaadq576r4jxin6xvlg8j9z";
       type = "gem";
     };
-    version = "3.112.1";
+    version = "3.113.0";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xa39m2lsdq4i0n9r2bz19nv43pjkrs54dnas7q78gl3c467wqj9";
+      sha256 = "0lhpwxad3yc5c3a8jmp116qx5jmym0ykpv39iwdq5km4h3as6h2d";
       type = "gem";
     };
-    version = "1.226.0";
+    version = "1.227.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02xsqb66r7a53a9nnwrhpvd5s9n7wdrvd51c56gs1hlb38j45y0j";
+      sha256 = "1c7vnkwh6z7nxgpmdw8hy70wxiimszyp644vmj8p1pr7ybz6sv9l";
       type = "gem";
     };
-    version = "1.48.0";
+    version = "1.49.0";
   };
   aws-sdk-kms = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i";
+      sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh";
       type = "gem";
     };
-    version = "1.42.0";
+    version = "1.43.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mznxmpsjqf3gmb6nxkmj2niswy4vvs4ykabf5z9cvamhbvvjhbv";
+      sha256 = "0vs3zg9d3lzi7rwys4qv62mcmga39s4rg4rmb0dalqknz6lqzhrq";
       type = "gem";
     };
-    version = "1.89.0";
+    version = "1.91.0";
   };
   aws-sigv4 = {
     groups = ["default"];
@@ -209,16 +209,6 @@
     };
     version = "2.4.8";
   };
-  bit-struct = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1w7x1fh4a6inpb46imhdf4xrq0z4d6zdpg7sdf8n98pif2hx50sx";
-      type = "gem";
-    };
-    version = "0.16";
-  };
   bson = {
     groups = ["default"];
     platforms = [];
@@ -344,10 +334,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jc6wffxnl7rbhg4hpj572f38fkxgrkgvv5imgzamrdmw55h206b";
+      sha256 = "0z3d4y6xg8prn3zdjw1qpqrnziq1d3zigqil4sxjj0pbr46gc1d6";
       type = "gem";
     };
-    version = "2.16.0";
+    version = "2.17.0";
   };
   faraday = {
     groups = ["default"];
@@ -524,12 +514,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "76926232b9c92df4832d986513fe89b8c1d53f1f";
-      sha256 = "1d232yrwfnh5aqks2xxc9q6mji542lbcf09yargi5j2ri2m1g044";
+      rev = "010e4d5a643a857e09bafbcf79b541e607de3c4c";
+      sha256 = "0a0gs6835p2wyf6ghp0gc7rkz6y4w1fi9pmqz50di17dvs27baxh";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.0.33";
+    version = "6.0.34";
   };
   metasploit-model = {
     groups = ["default"];
@@ -546,10 +536,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n0npcd6im6h225pd3abcydsxg9n3hmarmdssy66x4g8wpiifbrp";
+      sha256 = "1mf1c50j2gszxspnn9f2d356z8aaiv9s9x8lpdi05cf6syvhsa2k";
       type = "gem";
     };
-    version = "2.0.34";
+    version = "2.0.37";
   };
   metasploit_data_models = {
     groups = ["default"];
@@ -706,10 +696,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
+      sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
       type = "gem";
     };
-    version = "1.11.1";
+    version = "1.11.2";
   };
   octokit = {
     groups = ["default"];
@@ -1076,10 +1066,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg";
+      sha256 = "0mgk44f55w2g536nkxbg62qq5cfr05qxldglfr3yf94qkkanl2gg";
       type = "gem";
     };
-    version = "0.1.25";
+    version = "0.1.26";
   };
   rex-sslscan = {
     groups = ["default"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a375ccb1cf..ba0aa4e48db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13489,6 +13489,8 @@ in
 
   hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { };
 
+  hci = callPackage ../development/tools/continuous-integration/hci { };
+
   niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv);
 
   ormolu = haskellPackages.ormolu.bin;