From 283d622397539f196416657da9dc804a4ca89846 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 7 Jun 2021 12:51:17 +0200
Subject: [PATCH 01/20] darwin.xattr: init at 61.60.1

---
 pkgs/os-specific/darwin/xattr/default.nix | 73 +++++++++++++++++++++++
 pkgs/top-level/darwin-packages.nix        |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/xattr/default.nix

diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix
new file mode 100644
index 000000000000..1aa8b49e88aa
--- /dev/null
+++ b/pkgs/os-specific/darwin/xattr/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, stdenv
+, fetchzip
+, buildPythonPackage
+, python
+, ed
+, unifdef
+}:
+
+buildPythonPackage rec {
+  pname = "xattr";
+  version = "61.60.1";
+
+  src = fetchzip rec {
+    url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz";
+    sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi";
+  };
+
+  sourceRoot = "${src.name}/Modules/xattr-0.6.4";
+  format = "other";
+
+  nativeBuildInputs = [
+    ed
+    unifdef
+  ];
+
+  makeFlags = [
+    "OBJROOT=$(PWD)"
+    "DSTROOT=${placeholder "out"}"
+    "OSL=${placeholder "doc"}/share/xattr/OpenSourceLicenses"
+    "OSV=${placeholder "doc"}/share/xattr/OpenSourceVersions"
+  ];
+
+  # need to use `out` instead of `bin` since buildPythonPackage ignores the latter
+  outputs = [ "out" "doc" "python" ];
+
+  # We need to patch a reference to gnutar in an included Makefile
+  postUnpack = ''
+    chmod u+w $sourceRoot/..
+  '';
+
+  postPatch = ''
+    substituteInPlace ../Makefile.inc --replace gnutar tar
+    substituteInPlace Makefile --replace "/usr" ""
+  '';
+
+  preInstall = ''
+    # prevent setup.py from trying to download setuptools
+    sed -i xattr-*/setup.py -e '/ez_setup/d'
+
+    # create our custom target dirs we patch in
+    mkdir -p "$doc/share/xattr/"OpenSource{Licenses,Versions}
+    mkdir -p "$python/lib/${python.libPrefix}"
+  '';
+
+  # move python package to its own output to reduce clutter
+  postInstall = ''
+    mv "$out/lib/python" "$python/${python.sitePackages}"
+    rmdir "$out/lib"
+  '';
+
+  makeWrapperArgs = [
+    "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}"
+  ];
+
+  meta = with lib; {
+    description = "Display and manipulate extended attributes";
+    license = [ licenses.psfl licenses.mit ]; # see $doc/share/xattr/OpenSourceLicenses
+    maintainers = [ maintainers.sternenseemann ];
+    homepage = "https://opensource.apple.com/source/python_modules/";
+    platforms = lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index a7f29d672611..2e031e27307a 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -156,6 +156,8 @@ impure-cmds // appleSourcePackages // chooseLibs // {
 
   usr-include = callPackage ../os-specific/darwin/usr-include { };
 
+  xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { };
+
   inherit (pkgs.callPackages ../os-specific/darwin/xcode { })
     xcode_8_1 xcode_8_2
     xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1

From cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 6 Jun 2021 10:43:36 +0000
Subject: [PATCH 02/20] ghc: 8.10.4 -> 8.10.6

The only big change is required for darwin since GHC 8.10.5 now
runs xattr in the install phase on darwin:

* https://gitlab.haskell.org/ghc/ghc/-/commit/11e1dcde0d3137a8ee5cd32697b2925ea4e84b95
* https://gitlab.haskell.org/ghc/ghc/-/commit/ec451cac39de919621c783fec809c26fb9f0d1c8

Unfortunately, it uses the host /usr/bin/xattr by default which is
present in the build due to a lack of sandboxing on darwin. That xattr
version however still requires Python 2.7 whereas Python 3.8 is in PATH
in our build. We solve this by setting the XATTR environment variable.

We can't use python3Packages.xattr since GHC expects Apple's fork of
xattr which provides some extra flags to utilize.

Co-authored-by: Cheng Shao <cheng.shao@tweag.io>
---
 .../compilers/ghc/{8.10.4.nix => 8.10.6.nix}         | 12 ++++++------
 .../haskell/haskell-language-server/withWrapper.nix  |  2 +-
 pkgs/top-level/all-packages.nix                      |  2 +-
 pkgs/top-level/haskell-packages.nix                  | 12 ++++++++----
 pkgs/top-level/release-haskell.nix                   |  6 +++---
 5 files changed, 19 insertions(+), 15 deletions(-)
 rename pkgs/development/compilers/ghc/{8.10.4.nix => 8.10.6.nix} (97%)

diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.6.nix
similarity index 97%
rename from pkgs/development/compilers/ghc/8.10.4.nix
rename to pkgs/development/compilers/ghc/8.10.6.nix
index 07784c426479..f1223deed85e 100644
--- a/pkgs/development/compilers/ghc/8.10.4.nix
+++ b/pkgs/development/compilers/ghc/8.10.6.nix
@@ -2,7 +2,7 @@
 
 # build-tools
 , bootPkgs
-, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx, xattr
 , bash
 
 , libiconv ? null, ncurses
@@ -135,12 +135,12 @@ let
 
 in
 stdenv.mkDerivation (rec {
-  version = "8.10.4";
+  version = "8.10.6";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
     url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj";
+    sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9";
   };
 
   enableParallelBuilding = true;
@@ -155,9 +155,6 @@ stdenv.mkDerivation (rec {
     # upstream patch. Don't forget to check backport status of the upstream patch
     # when adding new GHC releases in nixpkgs.
     ./respect-ar-path.patch
-    # Fix documentation configuration which causes a syntax error with sphinx 4.*
-    # See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6.
-    ./sphinx-4-configuration.patch
   ] ++ lib.optionals stdenv.isDarwin [
     # Make Block.h compile with c++ compilers. Remove with the next release
     (fetchpatch {
@@ -192,6 +189,9 @@ stdenv.mkDerivation (rec {
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
   '' + lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+
+    # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
+    export XATTR=${lib.getBin xattr}/bin/xattr
   '' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
     sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
   '' + lib.optionalString targetPlatform.isMusl ''
diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
index 23bd3dd3267f..3b57693a28c1 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@@ -1,4 +1,4 @@
-{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages
+{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages
 , haskell }:
 #
 # The recommended way to override this package is
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5adcfd589b8d..8e4ca985ee92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11411,7 +11411,7 @@ with pkgs;
 
   # Please update doc/languages-frameworks/haskell.section.md, “Our
   # current default compiler is”, if you bump this:
-  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104;
+  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106;
 
   inherit (haskellPackages) ghc;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 86a09b4a1fad..d60c20f38e0d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -68,7 +68,7 @@ in {
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
     };
-    ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix {
+    ghc8106 = callPackage ../development/compilers/ghc/8.10.6.nix {
       # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
       # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
       bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
@@ -76,6 +76,10 @@ in {
         else
           packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
+      # Need to use apple's patched xattr until
+      # https://github.com/xattr/xattr/issues/44 and
+      # https://github.com/xattr/xattr/issues/55 are solved.
+      inherit (buildPackages.darwin) xattr;
       buildLlvmPackages = buildPackages.llvmPackages_9;
       llvmPackages = pkgs.llvmPackages_9;
     };
@@ -147,9 +151,9 @@ in {
       ghc = bh.compiler.ghc884;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
     };
-    ghc8104 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc8104;
-      ghc = bh.compiler.ghc8104;
+    ghc8106 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc8106;
+      ghc = bh.compiler.ghc8106;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
     };
     ghc901 = callPackage ../development/haskell-modules {
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 400635740eae..d68b0605dddb 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -50,7 +50,7 @@ let
   # list of all compilers to test specific packages on
   all = with compilerNames; [
     ghc884
-    ghc8104
+    ghc8106
     ghc901
   ];
 
@@ -300,12 +300,12 @@ let
       # package sets (like Cabal, jailbreak-cabal) are
       # working as expected.
       cabal-install = all;
-      Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ];
+      Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ];
       cabal2nix-unstable = all;
       funcmp = all;
       # Doesn't currently work on ghc-9.0:
       # https://github.com/haskell/haskell-language-server/issues/297
-      haskell-language-server = with compilerNames; [ ghc884 ghc8104 ];
+      haskell-language-server = with compilerNames; [ ghc884 ghc8106 ];
       hoogle = all;
       hsdns = all;
       jailbreak-cabal = all;

From 3b1a6b95d482d6380cb5cd7ebe250dc5170294b3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 12 Aug 2021 14:17:36 +0200
Subject: [PATCH 03/20] haskellPackages.odbc: add freetds, unbreak

---
 .../haskell-modules/configuration-hackage2nix/broken.yaml      | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix         | 3 +++
 pkgs/development/haskell-modules/hackage-packages.nix          | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 11a78272fa4b..213edaa9f4fa 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3322,7 +3322,6 @@ broken-packages:
   - oblivious-transfer
   - ocaml-export
   - Octree
-  - odbc
   - OddWord
   - oden-go-packages
   - oeis2
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 1c96024fc0d6..7a820af6b574 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -224,6 +224,9 @@ self: super: builtins.intersectAttrs super {
   # Test suite wants to connect to $DISPLAY.
   hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
 
+  # Wants to check against a real DB, Needs freetds
+  odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]);
+
   # Tests attempt to use NPM to install from the network into
   # /homeless-shelter. Disabled.
   purescript = dontCheck super.purescript;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 72b6f88a9fb8..b1e63e5940d8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -191956,8 +191956,6 @@ self: {
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "odd-jobs" = callPackage

From d07be4c5cb9c4cdbe41635f8a7a468a62c85f2e7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 15 Aug 2021 15:48:53 +0200
Subject: [PATCH 04/20] haskellPackages.graphql-engine: update to 2.0.5 +
 refactor

---
 .../haskell-modules/configuration-common.nix  | 28 +++----
 .../configuration-ghc-8.8.x.nix               |  7 --
 .../haskell-modules/non-hackage-packages.nix  | 21 +++--
 .../patches/graphql-engine-mapkeys.patch      | 13 +++
 .../patches/hasura-884-compat.patch           | 26 ------
 .../{ci-info/default.nix => ci-info.nix}      |  6 +-
 .../misc/haskell/hasura/graphql-engine.nix    | 81 +++++++++++++++++++
 .../haskell/hasura/graphql-engine/default.nix | 75 -----------------
 .../misc/haskell/hasura/graphql-parser.nix    | 32 ++++++++
 .../haskell/hasura/graphql-parser/default.nix | 36 ---------
 .../misc/haskell/hasura/pg-client.nix         | 35 ++++++++
 .../misc/haskell/hasura/pg-client/default.nix | 30 -------
 pkgs/development/misc/haskell/hasura/pool.nix | 23 ++++++
 .../development/misc/haskell/hasura/update.sh | 71 ++++++++++++++++
 14 files changed, 284 insertions(+), 200 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
 delete mode 100644 pkgs/development/haskell-modules/patches/hasura-884-compat.patch
 rename pkgs/development/misc/haskell/hasura/{ci-info/default.nix => ci-info.nix} (72%)
 create mode 100644 pkgs/development/misc/haskell/hasura/graphql-engine.nix
 delete mode 100644 pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
 create mode 100644 pkgs/development/misc/haskell/hasura/graphql-parser.nix
 delete mode 100644 pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
 create mode 100644 pkgs/development/misc/haskell/hasura/pg-client.nix
 delete mode 100644 pkgs/development/misc/haskell/hasura/pg-client/default.nix
 create mode 100644 pkgs/development/misc/haskell/hasura/pool.nix
 create mode 100755 pkgs/development/misc/haskell/hasura/update.sh

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6683dcc55bb1..f250391aa201 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1293,23 +1293,19 @@ self: super: {
   # Fails with "supports custom headers"
   Spock-core = dontCheck super.Spock-core;
 
-  # Needed by Hasura  1.3.1
-  dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override {
-    dependent-sum = self.dependent-sum_0_4;
-  };
-
-  # Hasura 1.3.1
-  # Because of ghc-heap-view, profiling needs to be disabled.
-  graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override {
-     immortal = self.immortal_0_2_2_1;
-     dependent-map = self.dependent-map_0_2_4_0;
-     dependent-sum = self.dependent-sum_0_4;
+  # hasura packages need some extra care
+  graphql-engine = overrideCabal (super.graphql-engine.override {
+    immortal = self.immortal_0_2_2_1;
   }) (drv: {
-     # version in cabal file is invalid
-     version = "1.3.1-beta1";
-     # hasura needs VERSION env exported during build
-     preBuild = "export VERSION=1.3.1-beta1";
-  }));
+    patches = [ ./patches/graphql-engine-mapkeys.patch ];
+    doHaddock = false;
+    version = "2.0.5";
+  });
+  pg-client = overrideCabal super.pg-client (drv: {
+    librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
+    # wants a running DB to check against
+    doCheck = false;
+  });
 
   # https://github.com/bos/statistics/issues/170
   statistics = dontCheck super.statistics;
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 7e495474c84f..a15a3f404fbe 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -41,13 +41,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Hasura 1.3.1
-  # Because of ghc-heap-view, profiling needs to be disabled.
-  graphql-engine = overrideCabal (super.graphql-engine) (drv: {
-     # GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea
-     patches = [ ./patches/hasura-884-compat.patch ];
-  });
-
   # GHC 8.8.x can build haddock version 2.23.*
   haddock = self.haddock_2_23_1;
   haddock-api = self.haddock-api_2_23_1;
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 6bbcabbf5a5e..48ee2ee3a474 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -26,14 +26,19 @@ self: super: {
 
   nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
 
-  # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
-  ci-info = self.callPackage ../misc/haskell/hasura/ci-info {};
-  # cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git
-  pg-client = self.callPackage ../misc/haskell/hasura/pg-client {};
-  # cabal2nix --revision <rev> https://github.com/hasura/graphql-parser-hs.git
-  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 {};
+  # hasura graphql-engine is not released to hackage.
+  # https://github.com/hasura/graphql-engine/issues/7391
+  #
+  # pg-client and graphql-engine depend on a hasura fork of resource-pool
+  # which is provided by pool.nix
+  ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {};
+  pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {
+    resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
+  };
+  graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {};
+  graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {
+    resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
+  };
 
   # 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
diff --git a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
new file mode 100644
index 000000000000..5fcf408b2b0e
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
@@ -0,0 +1,13 @@
+diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs
+index eaff0dfba..5047a0e9d 100644
+--- a/src-lib/Data/HashMap/Strict/Extended.hs
++++ b/src-lib/Data/HashMap/Strict/Extended.hs
+@@ -17,7 +17,7 @@ import qualified Data.Align          as A
+ import qualified Data.Foldable       as F
+ 
+ import           Data.Function
+-import           Data.HashMap.Strict as M
++import           Data.HashMap.Strict as M hiding (mapKeys)
+ import           Data.Hashable
+ import           Data.List.NonEmpty  (NonEmpty (..))
+ import           Data.These
diff --git a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch
deleted file mode 100644
index bc000ba9cca2..000000000000
--- a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
-index 6cb70cf0..0c3789cd 100644
---- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
-+++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
-@@ -45,7 +45,7 @@ import           GHC.AssertNF
- import qualified ListT
- import qualified Network.WebSockets                   as WS
- import qualified StmContainers.Map                    as STMMap
--import qualified System.IO.Error                      as E
-+--import qualified System.IO.Error                      as E
- 
- import qualified Hasura.Logging                       as L
- 
-@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p
-           let rcv = forever $ do
-                 -- Process all messages serially (important!), in a separate thread:
-                 msg <- liftIO $ 
--                  -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" :
--                  --   https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112 
--                  -- as WS exception signaling cleanup below. It's not clear why exactly this gets 
--                  -- raised occasionally; I suspect an equivalent handler is missing from WS itself.
--                  -- Regardless this should be safe:
--                  handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $
-                     WS.receiveData conn
-                 writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing
-                 _hOnMessage wsHandlers wsConn msg
diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info.nix
similarity index 72%
rename from pkgs/development/misc/haskell/hasura/ci-info/default.nix
rename to pkgs/development/misc/haskell/hasura/ci-info.nix
index 2770e74a6988..ce16c9c17f0a 100644
--- a/pkgs/development/misc/haskell/hasura/ci-info/default.nix
+++ b/pkgs/development/misc/haskell/hasura/ci-info.nix
@@ -1,3 +1,5 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
 { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
 , hpack, lib, template-haskell, text, th-lift-instances
 , unordered-containers
@@ -7,8 +9,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/hasura/ci-info-hs.git";
-    sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc";
-    rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab";
+    sha256 = "018vfyg0y2sn497nigjrcs6b1v3i9bna06dsbvgr6wjikcl6dhh4";
+    rev = "68247a83738ac4bb9f719f0e4213aeb7be9565cf";
     fetchSubmodules = true;
   };
   libraryHaskellDepends = [
diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
new file mode 100644
index 000000000000..285094874e99
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
@@ -0,0 +1,81 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
+{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
+, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
+, base, base16-bytestring, base64-bytestring, binary, byteorder
+, bytestring, case-insensitive, ci-info, containers, cron
+, cryptonite, data-has, deepseq, dependent-map, dependent-sum
+, directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit
+, file-embed, filepath, generic-arbitrary, ghc-heap-view
+, graphql-parser, hashable, hashable-time, hspec, hspec-core
+, hspec-expectations, hspec-expectations-lifted, http-api-data
+, http-client, http-client-tls, http-conduit, http-types, immortal
+, insert-ordered-containers, jose, kan-extensions, lens, lens-aeson
+, lib, lifted-async, lifted-base, list-t, memory, mime-types
+, mmorph, monad-control, monad-loops, monad-validate, mtl, mustache
+, mysql, mysql-simple, natural-transformation, network, network-uri
+, odbc, optparse-applicative, pem, pg-client, postgresql-binary
+, postgresql-libpq, process, profunctors, psqueues, QuickCheck
+, quickcheck-instances, random, regex-tdfa, resource-pool, retry
+, safe, safe-exceptions, scientific, semialign, semigroups, semver
+, shakespeare, some, split, Spock-core, stm, stm-containers, tagged
+, template-haskell, text, text-builder, text-conversions, these
+, time, transformers, transformers-base, unix, unordered-containers
+, uri-encode, utf8-string, uuid, validation, vector
+, vector-instances, wai, warp, websockets, wreq, x509, x509-store
+, yaml, zlib
+}:
+mkDerivation {
+  pname = "graphql-engine";
+  version = "1.0.0";
+  src = fetchgit {
+    url = "https://github.com/hasura/graphql-engine.git";
+    sha256 = "0sw7jwj3ixr0nnh3i9yagiqjsvf83w79jd7ac9vdvm410jfjcnxf";
+    rev = "5990ca403bf6e7dd66081720c329e513f0624fb6";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
+    attoparsec attoparsec-iso8601 auto-update base base16-bytestring
+    base64-bytestring binary byteorder bytestring case-insensitive
+    ci-info containers cron cryptonite data-has deepseq dependent-map
+    dependent-sum directory ekg-core ekg-json exceptions fast-logger
+    file-embed filepath ghc-heap-view graphql-parser hashable
+    hashable-time http-api-data http-client http-client-tls
+    http-conduit http-types immortal insert-ordered-containers jose
+    kan-extensions lens lens-aeson lifted-async lifted-base list-t
+    memory mime-types mmorph monad-control monad-loops monad-validate
+    mtl mustache mysql mysql-simple network network-uri odbc
+    optparse-applicative pem pg-client postgresql-binary
+    postgresql-libpq process profunctors psqueues QuickCheck
+    quickcheck-instances random regex-tdfa resource-pool retry
+    safe-exceptions scientific semialign semigroups semver shakespeare
+    some split Spock-core stm stm-containers tagged template-haskell
+    text text-builder text-conversions these time transformers
+    transformers-base unix unordered-containers uri-encode utf8-string
+    uuid validation vector vector-instances wai warp websockets wreq
+    x509 x509-store yaml zlib
+  ];
+  executableHaskellDepends = [
+    base bytestring ekg-core kan-extensions pg-client text
+    text-conversions time unix
+  ];
+  testHaskellDepends = [
+    aeson base bytestring containers cron dependent-map dependent-sum
+    generic-arbitrary graphql-parser hspec hspec-core
+    hspec-expectations hspec-expectations-lifted http-client
+    http-client-tls http-types insert-ordered-containers jose
+    kan-extensions lens lifted-base mmorph monad-control mtl
+    natural-transformation network-uri optparse-applicative pg-client
+    process QuickCheck safe scientific split template-haskell text time
+    transformers-base unordered-containers vector
+  ];
+  doCheck = false;
+  homepage = "https://www.hasura.io";
+  description = "GraphQL API over Postgres";
+  license = lib.licenses.asl20;
+  maintainers = with lib.maintainers; [ lassulus ];
+}
diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
deleted file mode 100644
index 9e7d448e4c1e..000000000000
--- a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
-, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
-, base, base64-bytestring, byteorder, bytestring, case-insensitive
-, ci-info, containers, criterion, cryptonite, data-has, deepseq
-, dependent-map, dependent-sum, directory, ekg-core, ekg-json
-, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary
-, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core
-, hspec-expectations-lifted, http-client, http-client-tls
-, http-types, immortal, insert-ordered-containers, jose, lens
-, lifted-async, lifted-base, list-t, mime-types, monad-control
-, monad-time, monad-validate, mtl, mustache, mwc-probability
-, mwc-random, natural-transformation, network, network-uri
-, optparse-applicative, pem, pg-client, postgresql-binary
-, postgresql-libpq, process, profunctors, psqueues, QuickCheck
-, regex-tdfa, safe, scientific, semver, shakespeare, split
-, Spock-core, lib, stm, stm-containers, template-haskell, text
-, text-builder, text-conversions, th-lift-instances, these, time
-, transformers, transformers-base, unix, unordered-containers
-, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
-, wreq, x509, yaml, zlib, witherable, semialign, validation, cron
-}:
-mkDerivation {
-  pname = "graphql-engine";
-  version = "1.0.0";
-  src = fetchgit {
-    url = "https://github.com/hasura/graphql-engine.git";
-    sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ=";
-    rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202";
-    fetchSubmodules = true;
-  };
- postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
-    attoparsec attoparsec-iso8601 auto-update base base64-bytestring
-    byteorder bytestring case-insensitive ci-info containers cryptonite
-    data-has deepseq dependent-map dependent-sum directory ekg-core
-    ekg-json fast-logger file-embed filepath generic-arbitrary
-    ghc-heap-view graphql-parser hashable http-client http-client-tls
-    http-types immortal insert-ordered-containers jose lens
-    lifted-async lifted-base list-t mime-types monad-control monad-time
-    monad-validate mtl mustache network network-uri
-    optparse-applicative pem pg-client postgresql-binary
-    postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa
-    scientific semver shakespeare split Spock-core stm stm-containers
-    template-haskell text text-builder text-conversions
-    th-lift-instances these time transformers transformers-base unix
-    unordered-containers uri-encode uuid vector wai wai-websockets warp
-    websockets wreq x509 yaml zlib
-    witherable semialign validation
-    cron
-  ];
-  executableHaskellDepends = [
-    base bytestring pg-client text text-conversions
-  ];
-  testHaskellDepends = [
-    aeson base bytestring hspec hspec-core hspec-expectations-lifted
-    http-client http-client-tls lifted-base monad-control mtl
-    natural-transformation optparse-applicative pg-client process
-    QuickCheck safe split text time transformers-base
-    unordered-containers
-  ];
-  benchmarkHaskellDepends = [
-    async base bytestring criterion deepseq mwc-probability mwc-random
-    split text vector
-  ];
-  doCheck = false;
-  homepage = "https://www.hasura.io";
-  description = "GraphQL API over Postgres";
-  license = lib.licenses.asl20;
-  maintainers = with lib.maintainers; [ offline ];
-  hydraPlatforms = [];
-  broken = true;
-}
diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
new file mode 100644
index 000000000000..f8cee5fe2c10
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
@@ -0,0 +1,32 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
+{ mkDerivation, aeson, attoparsec, base, bytestring, containers
+, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib
+, prettyprinter, scientific, template-haskell, text, text-builder
+, th-lift-instances, unordered-containers, vector
+}:
+mkDerivation {
+  pname = "graphql-parser";
+  version = "0.2.0.0";
+  src = fetchgit {
+    url = "https://github.com/hasura/graphql-parser-hs.git";
+    sha256 = "015b1h475k8wmhm9hkrvyxr985x7d8yc0xgcdqj7vmziixvfwwwj";
+    rev = "79beb0e85e00422a8a15318c0bc573765fc7b246";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [
+    aeson attoparsec base bytestring containers deepseq filepath
+    hashable hedgehog prettyprinter scientific template-haskell text
+    text-builder th-lift-instances unordered-containers vector
+  ];
+  testHaskellDepends = [
+    attoparsec base bytestring hedgehog prettyprinter scientific text
+    text-builder
+  ];
+  benchmarkHaskellDepends = [
+    base bytestring criterion prettyprinter text text-builder
+  ];
+  homepage = "https://github.com/hasura/graphql-parser-hs";
+  description = "A native Haskell GraphQL parser";
+  license = lib.licenses.bsd3;
+}
diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
deleted file mode 100644
index dbd3edf00641..000000000000
--- a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, bytestring, containers
-, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
-, protolude, regex-tdfa, scientific, lib, template-haskell, text
-, text-builder, th-lift-instances, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "graphql-parser";
-  version = "0.1.0.1";
-  src = fetchgit {
-    url = "https://github.com/hasura/graphql-parser-hs.git";
-    sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk=";
-    rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f";
-    fetchSubmodules = true;
-  };
-  libraryHaskellDepends = [
-    aeson attoparsec base bytestring containers filepath hedgehog
-    prettyprinter protolude regex-tdfa scientific template-haskell text
-    text-builder th-lift-instances unordered-containers vector
-  ];
-  libraryToolDepends = [ hpack ];
-  testHaskellDepends = [
-    aeson attoparsec base bytestring containers filepath hedgehog
-    prettyprinter protolude regex-tdfa scientific template-haskell text
-    text-builder th-lift-instances unordered-containers vector
-  ];
-  benchmarkHaskellDepends = [
-    aeson attoparsec base bytestring containers criterion filepath
-    hedgehog prettyprinter protolude regex-tdfa scientific
-    template-haskell text text-builder th-lift-instances
-    unordered-containers vector
-  ];
-  doCheck = false;
-  prePatch = "hpack";
-  homepage = "https://github.com/hasura/graphql-parser-hs#readme";
-  license = lib.licenses.bsd3;
-}
diff --git a/pkgs/development/misc/haskell/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client.nix
new file mode 100644
index 000000000000..0f1d9a8cf943
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/pg-client.nix
@@ -0,0 +1,35 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
+{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
+, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable
+, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib
+, mmorph, monad-control, mtl, postgresql, postgresql-binary
+, postgresql-libpq, resource-pool, retry, scientific
+, template-haskell, text, text-builder, time, transformers-base
+, uuid, vector
+}:
+mkDerivation {
+  pname = "pg-client";
+  version = "0.1.0";
+  src = fetchgit {
+    url = "https://github.com/hasura/pg-client-hs.git";
+    sha256 = "1y79s3ai4h82szpm1j5n5ygybqr7cza9l0raxf39vgn66jhy1jd2";
+    rev = "92975d0f8f933c8d06913dc97af259253bf7fb5f";
+    fetchSubmodules = true;
+  };
+  setupHaskellDepends = [ base Cabal ];
+  libraryHaskellDepends = [
+    aeson aeson-casing attoparsec base bytestring ekg-core hashable
+    hashtables mmorph monad-control mtl postgresql-binary
+    postgresql-libpq resource-pool retry scientific template-haskell
+    text text-builder time transformers-base uuid vector
+  ];
+  librarySystemDepends = [ postgresql ];
+  testHaskellDepends = [ base bytestring hspec mtl ];
+  benchmarkHaskellDepends = [
+    base bytestring criterion file-embed hashable hasql hasql-pool
+    hasql-transaction mtl postgresql-libpq text text-builder
+  ];
+  homepage = "https://github.com/hasura/platform";
+  license = lib.licenses.bsd3;
+}
diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix
deleted file mode 100644
index bccb3f6eda3d..000000000000
--- a/pkgs/development/misc/haskell/hasura/pg-client/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
-, criterion, fetchgit, file-embed, hashable, hashtables, hasql
-, hasql-pool, hasql-transaction, monad-control, mtl
-, postgresql-binary, postgresql-libpq, resource-pool, retry
-, scientific, lib, template-haskell, text, text-builder, th-lift
-, th-lift-instances, time, transformers-base, uuid, vector
-}:
-mkDerivation {
-  pname = "pg-client";
-  version = "0.1.0";
-  src = fetchgit {
-    url = "https://github.com/hasura/pg-client-hs.git";
-    sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l";
-    rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0";
-    fetchSubmodules = true;
-  };
-  libraryHaskellDepends = [
-    aeson aeson-casing attoparsec base bytestring hashable hashtables
-    monad-control mtl postgresql-binary postgresql-libpq resource-pool
-    retry scientific template-haskell text text-builder th-lift
-    th-lift-instances time transformers-base uuid vector
-  ];
-  testHaskellDepends = [ base ];
-  benchmarkHaskellDepends = [
-    base bytestring criterion file-embed hashable hasql hasql-pool
-    hasql-transaction mtl postgresql-libpq text text-builder
-  ];
-  homepage = "https://github.com/hasura/platform";
-  license = lib.licenses.bsd3;
-}
diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix
new file mode 100644
index 000000000000..72127ad8d326
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/pool.nix
@@ -0,0 +1,23 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
+{ mkDerivation, base, fetchgit, hashable, hspec, lib, monad-control
+, stm, time, transformers, transformers-base, vector
+}:
+mkDerivation {
+  pname = "resource-pool";
+  version = "0.2.3.2";
+  src = fetchgit {
+    url = "https://github.com/hasura/pool.git";
+    sha256 = "00q1fxh72fgjwl1pi3lnp4xg8f3kfm6q12gs9scinwbymfgzarms";
+    rev = "bc4c3f739a8fb8ec4444336a34662895831c9acf";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [
+    base hashable monad-control stm time transformers transformers-base
+    vector
+  ];
+  testHaskellDepends = [ base hspec ];
+  homepage = "http://github.com/bos/pool";
+  description = "A high-performance striped resource pooling implementation";
+  license = lib.licenses.bsd3;
+}
diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh
new file mode 100755
index 000000000000..227d3229ebe3
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/update.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p cabal2nix curl jq -I nixpkgs=.
+#
+# This script will update the hasura derivations to the latest version using
+# cabal2nix.
+#
+# Note that you should always try building hasura graphql-engine after updating it here, since
+# some of the overrides in pkgs/development/haskell/configuration-nix.nix may
+# need to be updated/changed.
+
+set -eo pipefail
+
+# This is the directory of this update.sh script.
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# graphql-engine derivation created with cabal2nix.
+engine_derivation_file="${script_dir}/graphql-engine.nix"
+parser_derivation_file="${script_dir}/graphql-parser.nix"
+ciinfo_derivation_file="${script_dir}/ci-info.nix"
+pgclient_derivation_file="${script_dir}/pg-client.nix"
+pool_derivation_file="${script_dir}/pool.nix"
+
+# TODO: get current revision of graphql-engine in Nixpkgs.
+# old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")"
+
+# This is the latest release version of graphql-engine on GitHub.
+new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output)
+
+echo "Running cabal2nix and outputting to ${engine_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$engine_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$engine_derivation_file"
+
+# 2.0.5 hardcoded for now, because 2.0.6 failed to build. should be removed when updating
+# cabal2nix --revision "$new_version" --subpath server --maintainer lassulus "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
+cabal2nix --revision "v2.0.5" --subpath server --maintainer lassulus --no-check "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
+
+echo "Running cabal2nix and outputting to ${parser_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$parser_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$parser_derivation_file"
+
+cabal2nix "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file"
+
+echo "Running cabal2nix and outputting to ${ciinfo_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$ciinfo_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$ciinfo_derivation_file"
+
+cabal2nix "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file"
+
+echo "Running cabal2nix and outputting to ${pgclient_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$pgclient_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$pgclient_derivation_file"
+
+cabal2nix "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file"
+
+echo "Running cabal2nix and outputting to ${pool_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$pool_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$pool_derivation_file"
+
+cabal2nix "https://github.com/hasura/pool.git" >> "$pool_derivation_file"
+
+echo "###################"
+echo "please update pkgs/servers/hasura/cli.nix vendorSha256"
+echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version"
+echo "###################"
+
+echo "Finished."

From da03c8aadd59a497bbe5435febfc1f9c13f0a59d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 16 Aug 2021 09:48:46 +0200
Subject: [PATCH 05/20] hasura-cli: 1.0.0 -> 2.0.5

---
 pkgs/servers/hasura/cli.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix
index 4413324e1594..4338f1bcaed8 100644
--- a/pkgs/servers/hasura/cli.nix
+++ b/pkgs/servers/hasura/cli.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/hasura" ];
 
-  vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU=";
+  vendorSha256 = "1pkc9bh5s2vqnpkmnm91zaihh98b3drhiv4lcpi98rhln8r52b1k";
 
   doCheck = false;
 

From 244784d1322ca553c2501abaffbe91b36bf20ef6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 17 Aug 2021 12:20:08 +0200
Subject: [PATCH 06/20] top-level/release-haskell.nix: fix remaining references
 to ghc8104

Attribute was removed in cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.
---
 pkgs/top-level/release-haskell.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index d68b0605dddb..a987dc579dcb 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -278,14 +278,14 @@ let
       # Test some statically linked packages to catch regressions
       # and get some cache going for static compilation with GHC.
       # Use integer-simple to avoid GMP linking problems (LGPL)
-      pkgsStatic.haskell.packages.integer-simple.ghc8104 =
+      pkgsStatic.haskell.packages.integer-simple.ghc8106 =
         removePlatforms
           [
             "aarch64-linux" # times out on Hydra
             "x86_64-darwin" # TODO: reenable when static libiconv works on darwin
           ]
           {
-            inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104)
+            inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8106)
               hello
               lens
               random
@@ -379,7 +379,7 @@ let
         constituents = accumulateDerivations [
           jobs.pkgsMusl.haskell.compiler.ghc8102Binary
           jobs.pkgsMusl.haskell.compiler.ghc884
-          jobs.pkgsMusl.haskell.compiler.ghc8104
+          jobs.pkgsMusl.haskell.compiler.ghc8106
           jobs.pkgsMusl.haskell.compiler.ghc901
         ];
       };
@@ -394,9 +394,9 @@ let
           ];
         };
         constituents = accumulateDerivations [
-          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello
-          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens
-          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens
+          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random
         ];
       };
     }

From a4528a1270403f607702d196f3dd98a62d26e5f2 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 02:12:09 +0200
Subject: [PATCH 07/20] haskellPackages.ghc-api-compat: Use correct versions
 for every ghc

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix   | 1 +
 .../haskell-modules/configuration-hackage2nix/main.yaml        | 1 +
 3 files changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e207413455ec..b0c08f188d09 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1942,4 +1942,7 @@ EOT
     Cabal = self.Cabal_3_6_0_0;
   };
 
+  # ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
+  ghc-api-compat = doJailbreak super.ghc-api-compat;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 a15a3f404fbe..08431ee0dd39 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -129,4 +129,5 @@ self: super: {
   # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
   vector = dontCheck super.vector;
 
+  ghc-api-compat = super.ghc-api-compat_8_6;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 67da108858f9..ec51f8c03ae4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -118,6 +118,7 @@ extra-packages:
   - sbv == 7.13                         # required for pkgs.petrinizer
   - crackNum < 3.0                      # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
   - ShellCheck == 0.7.1                 # 2021-05-09: haskell-ci 0.12.1 pins this version
+  - ghc-api-compat < 8.10.5             # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
 
 package-maintainers:
   abbradar:

From e50885838b03db1ae7c2b9695f9a1e77e592b029 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 02:13:28 +0200
Subject: [PATCH 08/20] all-cabal-hashes: 2021-08-17T22:21:14Z ->
 2021-08-17T22:21:14Z

This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
---
 pkgs/data/misc/hackage/pin.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 764d632ee415..b00021504b4d 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "dfb0b040033334d2e676906786c7a90805310e7d",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz",
-  "sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg",
-  "msg": "Update from Hackage at 2021-08-10T19:15:27Z"
+  "commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz",
+  "sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764",
+  "msg": "Update from Hackage at 2021-08-17T22:21:14Z"
 }

From 06274cd85dede525fec5c992d0133a8758f96f8f Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 02:20:01 +0200
Subject: [PATCH 09/20] haskellPackages: regenerate package set based on
 current config

This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
---
 .../haskell-modules/hackage-packages.nix      | 1295 +++++++++++++----
 1 file changed, 1033 insertions(+), 262 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1a05ab37a03d..84cecb6bdb01 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9336,8 +9336,8 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.7";
        sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg";
-       revision = "1";
-       editedCabalFile = "0s7y606q2q0vnbg9c51kypawyvapva60i2lw1dg1bij50aiv5d3i";
+       revision = "2";
+       editedCabalFile = "082d1lm6q1jb7rrl20jz0y4ca1qf87ihbq3v6mji9ibacl6adjaq";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty semigroups syb
@@ -9347,6 +9347,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "HStringTemplate_0_8_8" = callPackage
+    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
+     , deepseq, directory, filepath, HUnit, mtl, old-locale, parsec
+     , pretty, QuickCheck, random, semigroups, syb, template-haskell
+     , text, time, void
+     }:
+     mkDerivation {
+       pname = "HStringTemplate";
+       version = "0.8.8";
+       sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers deepseq directory
+         filepath mtl old-locale parsec pretty semigroups syb
+         template-haskell text time void
+       ];
+       testHaskellDepends = [ base containers HUnit QuickCheck random ];
+       description = "StringTemplate implementation in Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "HStringTemplateHelpers" = callPackage
     ({ mkDerivation, base, containers, directory, FileManipCompat
      , filepath, HSH, HStringTemplate, mtl, safe, strict
@@ -11588,8 +11609,8 @@ self: {
      }:
      mkDerivation {
        pname = "Jikka";
-       version = "5.2.0.0";
-       sha256 = "0rg96x1y928dd8n2znddp8b2wgmpv6vdkm4s8xcr39rqw4jsqk0l";
+       version = "5.3.0.0";
+       sha256 = "0njy5mgzbpvqdqp343a7bh69sdrmvfd57skr3qwma7dya5m12v2r";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -20808,8 +20829,8 @@ self: {
     ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
      mkDerivation {
        pname = "VulkanMemoryAllocator";
-       version = "0.7";
-       sha256 = "0f7l91lds878s49yjq210sc49y6c6i3m3hys02902b64dqdgslpa";
+       version = "0.7.1";
+       sha256 = "1h9kz02s7ams9fw9x8k947nzji2b82s9xn2yvqzys14ypzc34qpn";
        libraryHaskellDepends = [
          base bytestring transformers vector vulkan
        ];
@@ -21493,6 +21514,25 @@ self: {
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
 
+  "X11_1_10_1" = callPackage
+    ({ mkDerivation, base, data-default-class, libX11, libXext
+     , libXinerama, libXrandr, libXrender, libXScrnSaver
+     }:
+     mkDerivation {
+       pname = "X11";
+       version = "1.10.1";
+       sha256 = "13a0qf8rwn1s43wcl39f1pcq3h1kw1ddfq205j1ry0j3yafnazxg";
+       libraryHaskellDepends = [ base data-default-class ];
+       librarySystemDepends = [
+         libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
+       ];
+       description = "A binding to the X11 graphics library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
+         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
+
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
      mkDerivation {
@@ -27883,6 +27923,26 @@ self: {
        license = lib.licenses.mpl20;
      }) {};
 
+  "amazonka-contrib-rds-utils" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-rds, base
+     , bytestring, lens, optparse-applicative, text, time
+     }:
+     mkDerivation {
+       pname = "amazonka-contrib-rds-utils";
+       version = "1.6.1.0";
+       sha256 = "1j43kn2ia8q6689p8g1b5q8pd8zcmhfjny8kydh3g5zf5360hnaz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-rds base bytestring lens text time
+       ];
+       executableHaskellDepends = [
+         amazonka base bytestring lens optparse-applicative text
+       ];
+       description = "A Haskell equivalent of \"aws rds generate-db-auth-token\"";
+       license = lib.licenses.mpl20;
+     }) {};
+
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite
@@ -34147,26 +34207,25 @@ self: {
      }) {};
 
   "assoc-list" = callPackage
-    ({ mkDerivation, base, contravariant, doctest, hedgehog }:
+    ({ mkDerivation, base, contravariant, hedgehog }:
      mkDerivation {
        pname = "assoc-list";
-       version = "0.1.0.0";
-       sha256 = "13n847aypm39djgpyrkr428y11xj7glpwavp5qxfd49n93ii8zy3";
+       version = "0.1.0.1";
+       sha256 = "1ggvws2ma9cn165h03dx0v0zd1aifhi5qx05lnymf9ca98pa7ls9";
        libraryHaskellDepends = [ base contravariant ];
-       testHaskellDepends = [ base contravariant doctest hedgehog ];
+       testHaskellDepends = [ base contravariant hedgehog ];
        description = "Association lists (lists of tuples)";
        license = lib.licenses.mit;
      }) {};
 
   "assoc-listlike" = callPackage
-    ({ mkDerivation, base, contravariant, doctest, hedgehog, ListLike
-     }:
+    ({ mkDerivation, base, contravariant, hedgehog, ListLike }:
      mkDerivation {
        pname = "assoc-listlike";
-       version = "0.1.0.0";
-       sha256 = "0nph5yvawxk1afnlqm0vizg8dv53wl1cziqqnnlqgv45yimp4fbz";
+       version = "0.1.0.1";
+       sha256 = "1jzv0x8397274ks8azm89xcca8i1h6rgi8drbp4nj05mxzvz6brv";
        libraryHaskellDepends = [ base contravariant ListLike ];
-       testHaskellDepends = [ base contravariant doctest hedgehog ];
+       testHaskellDepends = [ base contravariant hedgehog ListLike ];
        description = "Association lists (list-like collections of tuples)";
        license = lib.licenses.mit;
      }) {};
@@ -38672,15 +38731,15 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "base64-bytestring_1_2_0_1" = callPackage
+  "base64-bytestring_1_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "base64-bytestring";
-       version = "1.2.0.1";
-       sha256 = "0f66mzsyik3zrn72cygg8w3375qpvn3422z3j4fkkc9f0xyv22dg";
+       version = "1.2.1.0";
+       sha256 = "1ja9vkgnpkzaw8gz6sm5jmgha6wg3m1j281m0nv1w9yyxlqfvy7v";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -45491,6 +45550,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "both_0_1_1_2" = callPackage
+    ({ mkDerivation, base, semigroups, zero }:
+     mkDerivation {
+       pname = "both";
+       version = "0.1.1.2";
+       sha256 = "1bf9fvc2ajbwwx31lmmyc1rzp3xzypwb3yjcmbhn6si5xnlbvqhl";
+       libraryHaskellDepends = [ base semigroups zero ];
+       description = "Like Maybe, but with a different Monoid instance";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "botpp" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -47590,13 +47661,13 @@ self: {
        license = lib.licenses.gpl3Only;
      }) {};
 
-  "byte-count-reader_0_10_1_4" = callPackage
+  "byte-count-reader_0_10_1_5" = callPackage
     ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text
      }:
      mkDerivation {
        pname = "byte-count-reader";
-       version = "0.10.1.4";
-       sha256 = "1rscz0dqz8h4cazf1kb0w628a93ysphrih5x0yppvl3w0iy26sh0";
+       version = "0.10.1.5";
+       sha256 = "0iq40gnfw8z1rkri1rpaqx5av1ay45h6518cg0a0m4ypdzf03r0s";
        libraryHaskellDepends = [ base extra parsec parsec-numbers text ];
        testHaskellDepends = [
          base extra hspec parsec parsec-numbers text
@@ -48860,6 +48931,24 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "cabal-clean" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, mtl
+     , optparse-applicative, pretty-terminal, process, split, string-qq
+     }:
+     mkDerivation {
+       pname = "cabal-clean";
+       version = "0.1.20210815";
+       sha256 = "0bx11grnw1x594n6si3lnswb87n2gsnn7fn7lr1ggn3rd0dm2ccg";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory filepath mtl optparse-applicative
+         pretty-terminal process split string-qq
+       ];
+       description = "Remove outdated cabal build artefacts from `dist-newstyle`";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "cabal-constraints" = callPackage
     ({ mkDerivation, base, Cabal, optparse-applicative }:
      mkDerivation {
@@ -49513,6 +49602,28 @@ self: {
        license = lib.licenses.gpl3Only;
      }) {};
 
+  "cabal-rpm_2_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, extra
+     , filepath, http-client, http-client-tls, http-conduit
+     , optparse-applicative, process, simple-cabal, simple-cmd
+     , simple-cmd-args, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "2.0.10";
+       sha256 = "028kvvdm8dqjmk16ag8p1mb4d3nfyz1i6x8ijfcr45hrb93hdd77";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory extra filepath http-client
+         http-client-tls http-conduit optparse-applicative process
+         simple-cabal simple-cmd simple-cmd-args time unix
+       ];
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -51167,8 +51278,8 @@ self: {
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.12.0.0";
-       sha256 = "0wv1rp511vzq7hkzcgcpa0jvc90bflysddz0s69dzl6llr71gb6x";
+       version = "0.14.0.0";
+       sha256 = "15v0s597wq0ipvikd727fzcqg5r6685lvr8y1x93q5mdl975gi8m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55460,7 +55571,7 @@ self: {
        license = lib.licenses.bsd2;
      }) {};
 
-  "citeproc_0_4_1" = callPackage
+  "citeproc_0_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , case-insensitive, containers, data-default, Diff, directory
      , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific
@@ -55469,8 +55580,8 @@ self: {
      }:
      mkDerivation {
        pname = "citeproc";
-       version = "0.4.1";
-       sha256 = "094x2fkhqizy26rzfz5qqjsnifmc95fyiasvnma32mak7j360xzy";
+       version = "0.5";
+       sha256 = "14l7gpa2phgmgcx2mdln1wf1gfqjmbkm5nyxnihrybmrkg9l8yfk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55855,6 +55966,37 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "clash-ghc_1_4_3" = 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.3";
+       sha256 = "00ipx45s2qdjv5cj6v3cg7dgwsw3sd8ai3cr1q9n1k6g26dzc3pw";
+       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;
+     }) {};
+
   "clash-lib" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array
      , attoparsec, base, base16-bytestring, binary, bytestring
@@ -55898,6 +56040,49 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "clash-lib_1_4_3" = 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.3";
+       sha256 = "0p6sf9wn25i1f0isqskpy35x6qm2ym63x9fpb54kbd1pp9xqgysl";
+       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;
+     }) {};
+
   "clash-multisignal" = callPackage
     ({ mkDerivation, base, clash-prelude, deepseq
      , ghc-typelits-knownnat, QuickCheck
@@ -55955,6 +56140,48 @@ self: {
        broken = true;
      }) {};
 
+  "clash-prelude_1_4_3" = 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.3";
+       sha256 = "07mdl3196yb971hpcbysyaj6vciyrm1p5m9prcymkhkqh7vw9igy";
+       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 {
@@ -57954,6 +58181,18 @@ self: {
        license = lib.licenses.mpl20;
      }) {};
 
+  "co-log-concurrent_0_5_1_0" = callPackage
+    ({ mkDerivation, base, co-log-core, stm }:
+     mkDerivation {
+       pname = "co-log-concurrent";
+       version = "0.5.1.0";
+       sha256 = "07qmx9z03vmgq2cgz4352fsav7r1nx8n7svmrhg2lkdiyp0j7a59";
+       libraryHaskellDepends = [ base co-log-core stm ];
+       description = "Asynchronous backend for co-log library";
+       license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "co-log-core" = callPackage
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
@@ -58649,30 +58888,30 @@ self: {
 
   "coinbase-pro" = callPackage
     ({ mkDerivation, aeson, aeson-casing, async, base, binary
-     , bytestring, containers, cryptonite, HsOpenSSL, http-api-data
-     , http-client, http-client-tls, http-streams, http-types
-     , io-streams, memory, network, servant, servant-client
+     , bytestring, containers, cryptonite, exceptions, HsOpenSSL
+     , http-api-data, http-client, http-client-tls, http-streams
+     , http-types, io-streams, memory, network, servant, servant-client
      , servant-client-core, text, time, transformers, unagi-streams
      , unordered-containers, uuid, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "coinbase-pro";
-       version = "0.9.2.0";
-       sha256 = "0x7wmm123rf7zk9802bymx1b9pbsnmzhkabyacwini01gb56bwxy";
+       version = "0.9.2.2";
+       sha256 = "1jfmzzwjk81w5bm9v4zfan2w7qi2sl2a1py9nxisz1wq8vxdyvxn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing async base binary bytestring containers
-         cryptonite HsOpenSSL http-api-data http-client http-client-tls
-         http-streams http-types io-streams memory network servant
-         servant-client servant-client-core text time transformers
+         cryptonite exceptions HsOpenSSL http-api-data http-client
+         http-client-tls http-streams http-types io-streams memory network
+         servant servant-client servant-client-core text time transformers
          unagi-streams unordered-containers uuid vector websockets wuss
        ];
        executableHaskellDepends = [
          aeson aeson-casing async base binary bytestring containers
-         cryptonite HsOpenSSL http-api-data http-client http-client-tls
-         http-streams http-types io-streams memory network servant
-         servant-client servant-client-core text time transformers
+         cryptonite exceptions HsOpenSSL http-api-data http-client
+         http-client-tls http-streams http-types io-streams memory network
+         servant servant-client servant-client-core text time transformers
          unagi-streams unordered-containers uuid vector websockets wuss
        ];
        description = "Client for Coinbase Pro";
@@ -60186,8 +60425,8 @@ self: {
        pname = "compdoc";
        version = "0.3.0.0";
        sha256 = "07gbs64r8qsxw4j0mlk7kldbdjjzz4v34pm8b5cj7a6r1l33w7k5";
-       revision = "3";
-       editedCabalFile = "1k9hahs857mg72krmhb0n1igfqy344pnlllbishrrj6hknc84xfq";
+       revision = "4";
+       editedCabalFile = "14p4gi1wyiwv738m505j6j2v8j2dimw1gp6qb7wfq4f8mf53lpll";
        libraryHaskellDepends = [
          aeson base composite-aeson composite-aeson-throw composite-base
          pandoc pandoc-throw path rio vinyl
@@ -60204,6 +60443,8 @@ self: {
        pname = "compdoc-dhall-decoder";
        version = "0.3.0.0";
        sha256 = "0qsq67zj8gr9xlgcbxgn5fi1cyv4qf7w5vzfl3v4hvil7xf3fn77";
+       revision = "1";
+       editedCabalFile = "0k08bcjjnvs54fjvxzy1hv7zp7z2n0iydsiix83x6a2jii7105v4";
        libraryHaskellDepends = [
          base compdoc composite-aeson composite-base dhall either pandoc
          text
@@ -60553,15 +60794,15 @@ self: {
 
   "composite-dhall" = callPackage
     ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit
-     , text, vinyl
+     , text
      }:
      mkDerivation {
        pname = "composite-dhall";
-       version = "0.0.3.0";
-       sha256 = "1ynamdgamlri6ll0vh02kp4iy04vgsplsrda49by1b4vc9b4hcdz";
-       libraryHaskellDepends = [ base composite-base dhall text vinyl ];
+       version = "0.0.4.1";
+       sha256 = "19lhw02my7dv6gx2zlvmsbc2w4g09j1yxpwg6s203bd5n4dp5v9v";
+       libraryHaskellDepends = [ base composite-base dhall text ];
        testHaskellDepends = [
-         base composite-base dhall tasty tasty-hunit text vinyl
+         base composite-base dhall tasty tasty-hunit text
        ];
        description = "Dhall instances for composite records";
        license = lib.licenses.mit;
@@ -60656,6 +60897,8 @@ self: {
        pname = "composite-tuple";
        version = "0.1.2.0";
        sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41";
+       revision = "1";
+       editedCabalFile = "0j7mj8g3v4x0vy4rbx00kxb7d41r3s3djbfin9f1h592ahyap1va";
        libraryHaskellDepends = [ base composite-base ];
        description = "Tuple functions for composite records";
        license = lib.licenses.mit;
@@ -61179,6 +61422,23 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "concurrency_1_11_0_2" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.11.0.2";
+       sha256 = "0c7nq4d29s49a3h9wzjdi3idm6r68vxn6ybphsbrk2vmwqyfq36y";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "concurrency-benchmarks" = callPackage
     ({ mkDerivation, async, base, bench-graph, bytestring, Chart
      , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
@@ -63624,14 +63884,14 @@ self: {
   "contiguous" = callPackage
     ({ mkDerivation, base, deepseq, primitive, primitive-unlifted
      , QuickCheck, quickcheck-classes, quickcheck-instances, random
-     , random-shuffle, vector, weigh
+     , random-shuffle, run-st, vector, weigh
      }:
      mkDerivation {
        pname = "contiguous";
-       version = "0.5.1";
-       sha256 = "1y02gqgd012zggs7kqxkky0prmbl0k9ji5ynb74i5mym88xrj67h";
+       version = "0.5.2";
+       sha256 = "04ylz0mld2yj0mdj88k38jw9330p88h0ga46p4wzlmazsy0p5s67";
        libraryHaskellDepends = [
-         base deepseq primitive primitive-unlifted
+         base deepseq primitive primitive-unlifted run-st
        ];
        testHaskellDepends = [
          base primitive QuickCheck quickcheck-classes quickcheck-instances
@@ -68165,8 +68425,8 @@ self: {
      }:
      mkDerivation {
        pname = "cursedcsv";
-       version = "0.1.3";
-       sha256 = "0q6pqsv0bvn30nlkfk285hilixa9hi3n3gzil0gb4gic2zpb55dk";
+       version = "0.1.4";
+       sha256 = "1zh71fcp2qp516lzvqc7n3yamg1lwbdjh74k5f3ni1j9ynz6zh28";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68278,8 +68538,8 @@ self: {
      }:
      mkDerivation {
        pname = "curve25519";
-       version = "0.2.5";
-       sha256 = "1j2fc1wv6xx95sicx2m44dm41gdfspb74qmh58592pp5fcv54vbb";
+       version = "0.2.6";
+       sha256 = "11xrr8d4a8mwagqy8wfmja9aj875854bc0ns37x01wdcpwsr3s2h";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        testHaskellDepends = [
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
@@ -70449,16 +70709,18 @@ self: {
      }) {};
 
   "data-pdf-fieldreader" = callPackage
-    ({ mkDerivation, base, bytestring, containers, optparse-applicative
-     , text
+    ({ mkDerivation, base, bytestring, containers, megaparsec
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "data-pdf-fieldreader";
-       version = "0.1.0.0";
-       sha256 = "1h57hva0dkhnshallf2yxwfmzfqzd6wm20cbxn8qm94jp95a627d";
+       version = "0.1.1.0";
+       sha256 = "0mcf676mgjgckzk97qi60z03530zk05mby73dxv7dnbdxw340zn7";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring containers text ];
+       libraryHaskellDepends = [
+         base bytestring containers megaparsec text
+       ];
        executableHaskellDepends = [
          base bytestring containers optparse-applicative text
        ];
@@ -72917,6 +73179,23 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "dejafu_2_4_0_3" = callPackage
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "2.4.0.3";
+       sha256 = "1qzc8jbl6zwbncfmfmcwwmmhwzgbwc7wmnxxxa3mbcjbwhyibf92";
+       libraryHaskellDepends = [
+         base concurrency containers contravariant deepseq exceptions
+         leancheck profunctors random transformers
+       ];
+       description = "A library for unit-testing concurrent programs";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -75053,6 +75332,8 @@ self: {
        pname = "diagrams-canvas";
        version = "1.4.1";
        sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj";
+       revision = "1";
+       editedCabalFile = "12p6n6g4ab81b39d031vzwfj89qi5wm27srpyigf2v0zswppdyvn";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -75120,6 +75401,8 @@ self: {
        pname = "diagrams-core";
        version = "1.5.0";
        sha256 = "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn";
+       revision = "1";
+       editedCabalFile = "1718pkifs74nq8bdwcm6firahy8riiinwarcxkk087brmm2rbfli";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -75167,22 +75450,22 @@ self: {
 
   "diagrams-haddock" = callPackage
     ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring
-     , Cabal, cautious-file, cmdargs, containers, cpphs
-     , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath
-     , haskell-src-exts, lens, linear, mtl, parsec, QuickCheck, split
-     , strict, svg-builder, tasty, tasty-quickcheck, text, uniplate
+     , Cabal, cmdargs, containers, cpphs, diagrams-builder, diagrams-lib
+     , diagrams-svg, directory, filepath, haskell-src-exts, lens, linear
+     , mtl, parsec, QuickCheck, split, strict, svg-builder, tasty
+     , tasty-quickcheck, text, uniplate, unliftio
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.4.0.3";
-       sha256 = "1kv1m9hg2npm2k11svh0c27xknvh2j7x662wcbnpxnc44cxlqyak";
+       version = "0.4.1";
+       sha256 = "0p978saxsfad6d8wkjnp6i300cf58ps02yw7a1zzhjfgk5ih2qlb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base base64-bytestring bytestring cautious-file
-         containers cpphs diagrams-builder diagrams-lib diagrams-svg
-         directory filepath haskell-src-exts lens linear mtl parsec split
-         strict svg-builder text uniplate
+         ansi-terminal base base64-bytestring bytestring containers cpphs
+         diagrams-builder diagrams-lib diagrams-svg directory filepath
+         haskell-src-exts lens linear mtl parsec split strict svg-builder
+         text uniplate unliftio
        ];
        executableHaskellDepends = [
          base Cabal cmdargs cpphs directory filepath
@@ -75465,6 +75748,8 @@ self: {
        pname = "diagrams-solve";
        version = "0.1.3";
        sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17";
+       revision = "1";
+       editedCabalFile = "0dp61igq17l7hvhs3167skdi1vmlm773qrrmsqmj08951l4cgv0h";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
@@ -80690,6 +80975,8 @@ self: {
        pname = "dual-tree";
        version = "0.2.3.0";
        sha256 = "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg";
+       revision = "1";
+       editedCabalFile = "1babd7ybsgk73x57yl35q0n1i7mbbqmv4am710kq1hzg3in4g9dv";
        libraryHaskellDepends = [
          base monoid-extras newtype-generics semigroups
        ];
@@ -91810,6 +92097,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "filepath-bytestring_1_4_2_1_8" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, filepath, QuickCheck
+     , unix
+     }:
+     mkDerivation {
+       pname = "filepath-bytestring";
+       version = "1.4.2.1.8";
+       sha256 = "0qrrvbjpjsk75ghqrdqzwqg7wjgm3rr9kk7p04ax98ilv90pm0ip";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [ base bytestring filepath QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion filepath ];
+       description = "Library for manipulating RawFilePaths in a cross platform way";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "filepath-crypto" = callPackage
     ({ mkDerivation, base, binary, bytestring, case-insensitive
      , cryptoids, cryptoids-class, cryptoids-types, exceptions, filepath
@@ -93385,19 +93688,19 @@ self: {
 
   "flatparse" = callPackage
     ({ mkDerivation, attoparsec, base, bytesmith, bytestring
-     , containers, gauge, megaparsec, parsec, primitive
+     , containers, gauge, integer-gmp, megaparsec, parsec, primitive
      , template-haskell
      }:
      mkDerivation {
        pname = "flatparse";
-       version = "0.2.1.0";
-       sha256 = "19vwh9fqda7fp7nv7sgxafvvc5kckaayizjw2vvmd634ka0bsyrr";
+       version = "0.2.2.0";
+       sha256 = "13cm882c2n0p52dwn802cqgfqrgkmlrb1kaxm2l89yfpb6wqynfz";
        libraryHaskellDepends = [
-         base bytestring containers template-haskell
+         base bytestring containers integer-gmp template-haskell
        ];
        benchmarkHaskellDepends = [
-         attoparsec base bytesmith bytestring gauge megaparsec parsec
-         primitive
+         attoparsec base bytesmith bytestring gauge integer-gmp megaparsec
+         parsec primitive
        ];
        description = "High-performance parsing from strict bytestrings";
        license = lib.licenses.mit;
@@ -98114,16 +98417,17 @@ self: {
 
   "futhark-data" = callPackage
     ({ mkDerivation, base, binary, bytestring, bytestring-to-vector
-     , containers, half, megaparsec, mtl, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text, vector, vector-binary-instances
+     , containers, half, megaparsec, mtl, QuickCheck, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, text, vector
+     , vector-binary-instances
      }:
      mkDerivation {
        pname = "futhark-data";
-       version = "1.0.1.1";
-       sha256 = "1rd3hrsr0zq6v5wwhgn5mam5262lmvihaa8g4pxnl47lh3hc8q5w";
+       version = "1.0.2.0";
+       sha256 = "1z5arzvd3n7cjmws2cwz7i8ji14xngrnza55781h06qh0pakg8dd";
        libraryHaskellDepends = [
          base binary bytestring bytestring-to-vector containers half
-         megaparsec mtl text vector vector-binary-instances
+         megaparsec mtl scientific text vector vector-binary-instances
        ];
        testHaskellDepends = [
          base binary bytestring megaparsec QuickCheck tasty tasty-hunit
@@ -99972,8 +100276,8 @@ self: {
     ({ mkDerivation, base, generics-sop }:
      mkDerivation {
        pname = "generic-match";
-       version = "0.3.0.0";
-       sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv";
+       version = "0.3.0.1";
+       sha256 = "1qznsnb2d3dd9h5bdn54nkmqas4l4rsnp3fzj0bcpmbj3g245lc4";
        libraryHaskellDepends = [ base generics-sop ];
        description = "First class pattern matching";
        license = lib.licenses.mit;
@@ -101365,14 +101669,14 @@ self: {
      }) {};
 
   "geomancy" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hedgehog, linear }:
+    ({ mkDerivation, base, containers, criterion, deepseq, hedgehog
+     , linear
+     }:
      mkDerivation {
        pname = "geomancy";
-       version = "0.2.2.3";
-       sha256 = "17xg6cxyl83dxlb1yv85cnavw8cgqj3mbr1v9sa46fawb4mlv9i8";
-       revision = "1";
-       editedCabalFile = "06cfw1jf1380cxqc5ywj768svym7nm0rmrglhjkfz6p29arc6hwr";
-       libraryHaskellDepends = [ base deepseq ];
+       version = "0.2.2.4";
+       sha256 = "0vx2dz7fxd4hq50whsx0g6i3v1aidr7rpbylf169q1vshhrl8yaf";
+       libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base deepseq hedgehog linear ];
        benchmarkHaskellDepends = [ base criterion deepseq linear ];
        description = "Geometry and matrix manipulation";
@@ -101483,24 +101787,24 @@ self: {
 
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
-     , containers, directory, exceptions, filepath, happy, haskeline
-     , httpd-shed, json, mtl, network, network-uri, parallel, pretty
-     , process, random, terminfo, time, time-compat, unix, utf8-string
+     , containers, directory, exceptions, filepath, ghc-prim, happy
+     , haskeline, httpd-shed, json, mtl, network, network-uri, parallel
+     , pretty, process, random, terminfo, time, transformers-compat
+     , unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
-       version = "3.10";
-       sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv";
-       revision = "3";
-       editedCabalFile = "1c6gv692pz1xf41ajdji62xs41l8yy35nlcn6x7rs7symgx1v1bg";
+       version = "3.11";
+       sha256 = "18fx0kba86hyyimrahvgs7jsd5g718psis4drmxmxmx3bdvxj3bd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
-         haskeline httpd-shed json mtl network network-uri parallel pretty
-         process random terminfo time time-compat unix utf8-string
+         ghc-prim haskeline httpd-shed json mtl network network-uri parallel
+         pretty process random terminfo time transformers-compat unix
+         utf8-string
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
@@ -101590,7 +101894,7 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "ghc-api-compat" = callPackage
+  "ghc-api-compat_8_6" = callPackage
     ({ mkDerivation, ghc }:
      mkDerivation {
        pname = "ghc-api-compat";
@@ -101602,6 +101906,19 @@ self: {
        doHaddock = false;
        description = "GHC-API compatibility helpers";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
+  "ghc-api-compat" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "ghc-api-compat";
+       version = "8.10.5";
+       sha256 = "09g04k7zvzjs312yn9hhk8bk3l6k2vbb8qrdpnlr12a6az4adq3s";
+       libraryHaskellDepends = [ base ghc ];
+       doHaddock = false;
+       description = "GHC-API compatibility helpers";
+       license = lib.licenses.bsd3;
      }) {};
 
   "ghc-bignum" = callPackage
@@ -102596,8 +102913,8 @@ self: {
     ({ mkDerivation, base, filepath, optparse-applicative, process }:
      mkDerivation {
        pname = "ghc-prof-flamegraph";
-       version = "0.2.0.0";
-       sha256 = "1jvn243v0fhckqk3yjw2qf3zj3smhk2wjxqbj389gpxh790183cd";
+       version = "0.2.0.1";
+       sha256 = "11d9p9rb4z2ysmx5z076vaw0hr5y0h7bszwwx24vylkfddawv7v5";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103070,8 +103387,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghci-dap";
-       version = "0.0.15.0";
-       sha256 = "1m4ypd2d9bjdkdqrnqijc1na5g14mmjrcr5msgr7spsnskhzi4yg";
+       version = "0.0.16.0";
+       sha256 = "1ywlk4bf7m868vvd07vmzpv7d7xmw9haa16p13rx3kdf5rqc7wcv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103261,6 +103578,8 @@ self: {
        pname = "ghcide";
        version = "1.4.0.3";
        sha256 = "1znf54l3g44cskx5blfaibf1frgyhy5z7906rdvyzb0dqfmkbzpw";
+       revision = "1";
+       editedCabalFile = "1qm3zj7c8qkc0ncm9bl57zj5nj7jm8c4lg2wzjrgmz3vvfmsd11c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103991,6 +104310,21 @@ self: {
        license = lib.licenses.lgpl21Only;
      }) {inherit (pkgs) glib;};
 
+  "gi-gio-hs-list-model" = callPackage
+    ({ mkDerivation, base, containers, gi-gio, gi-gobject
+     , haskell-gi-base
+     }:
+     mkDerivation {
+       pname = "gi-gio-hs-list-model";
+       version = "0.1.0.1";
+       sha256 = "03gyr2fj8jaqrb6r7j14ylw1za7aqdblw0aihp6nr9s8hvqr80c2";
+       libraryHaskellDepends = [
+         base containers gi-gio gi-gobject haskell-gi-base
+       ];
+       description = "Haskell implementation of GListModel interface from gi-gio";
+       license = lib.licenses.lgpl21Only;
+     }) {};
+
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
@@ -105990,14 +106324,14 @@ self: {
      , hslogger, HStringTemplate, HTTP, http-client-tls, http-conduit
      , json, mtl, network, network-bsd, network-uri, old-locale
      , old-time, pandoc, pandoc-types, parsec, pretty, process, random
-     , recaptcha, safe, SHA, skylighting, split, syb, tagsoup, text
-     , time, uri-bytestring, url, utf8-string, uuid, xhtml, xml
+     , recaptcha, safe, SHA, skylighting, split, syb, tagsoup, temporary
+     , text, time, uri-bytestring, url, utf8-string, uuid, xhtml, xml
      , xml-conduit, xml-types, xss-sanitize, zlib
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.13.0.0";
-       sha256 = "1d9vfjhr38xxpm0fq0b6dy581a1qacqg643njp8z2fz37rma3z15";
+       version = "0.15.0.0";
+       sha256 = "05kz7dxmiabp0gkivn5ngmn3xah3h7a14a421qw6nx2ld1cr9vgf";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -106008,8 +106342,8 @@ self: {
          http-client-tls http-conduit json mtl network network-bsd
          network-uri old-locale old-time pandoc pandoc-types parsec pretty
          process random recaptcha safe SHA skylighting split syb tagsoup
-         text time uri-bytestring url utf8-string uuid xhtml xml xml-conduit
-         xml-types xss-sanitize zlib
+         temporary text time uri-bytestring url utf8-string uuid xhtml xml
+         xml-conduit xml-types xss-sanitize zlib
        ];
        executableHaskellDepends = [
          base bytestring directory filepath hslogger HTTP mtl network
@@ -119433,8 +119767,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-debug-adapter";
-       version = "0.0.34.0";
-       sha256 = "00z9yhs2c34rdki404gcwf938a2lshr0a7mrvzpknk70n1a0gall";
+       version = "0.0.35.0";
+       sha256 = "1n8v7wgx5lqqw150lj9p8nzzxnmnjm2ksdvm7gcgb85shii7r2nf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120399,8 +120733,8 @@ self: {
        pname = "haskell-src";
        version = "1.0.3.1";
        sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746";
-       revision = "3";
-       editedCabalFile = "0hjridmgm95lrb9qs972zicipsqcfwpr35gwkzxncpgwcm0vn0b6";
+       revision = "4";
+       editedCabalFile = "0cyqdw77clzz7mq0b4c0jg2d1kdz9xii41268w2psmqmfpyn29pc";
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
@@ -121815,20 +122149,20 @@ self: {
   "hasklepias" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log
      , containers, flow, ghc-prim, hspec, interval-algebra, lens
-     , lens-aeson, mtl, nonempty-containers, process, QuickCheck, safe
+     , lens-aeson, mtl, nonempty-containers, QuickCheck, safe
      , semiring-simple, tasty, tasty-hspec, tasty-hunit, text, time
      , unordered-containers, vector, witherable
      }:
      mkDerivation {
        pname = "hasklepias";
-       version = "0.13.1";
-       sha256 = "1fhlw490bwyblsgjrzgms4lzkv0zd8bhsvl2ywlpz0flhdd999zr";
+       version = "0.15.1";
+       sha256 = "00n9fan0g3xdl9k0f0rw32xgrwzxb8x85vrj98yyk1dk490pgfhm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cmdargs co-log containers flow ghc-prim
-         interval-algebra lens lens-aeson mtl nonempty-containers process
-         QuickCheck safe semiring-simple tasty tasty-hunit text time
+         interval-algebra lens lens-aeson mtl nonempty-containers QuickCheck
+         safe semiring-simple tasty tasty-hunit text time
          unordered-containers vector witherable
        ];
        testHaskellDepends = [
@@ -121970,8 +122304,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.17.12";
-       sha256 = "0jb1ypscy5hgvbw5jrd5qjl7mdi2qgc7h3amyi50zh2m3lhmgjnv";
+       version = "0.17.14";
+       sha256 = "0a8lmap19gj2f6xyzz7mk4jdb8rc8vvzrri4jsb10n8xl5g9c2jj";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra containers
          data-default hashable haskoin-core monad-logger mtl network nqe
@@ -122053,8 +122387,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.53.8";
-       sha256 = "1djlq58v6wm3kr8jsvr612qxaxz1k03mfxvywd6ia45f761ry1ks";
+       version = "0.53.10";
+       sha256 = "0a20808l907wvgcdvbv7jvkpphpfj64x9cm7a07hpldsi2r3c26p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122099,8 +122433,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store-data";
-       version = "0.53.8";
-       sha256 = "06q9h1n9c8gz6fycc8nsjxp98c98zin1f7y7qiyy80cddhcj1jzf";
+       version = "0.53.10";
+       sha256 = "0rnqa294j909s06nadg58vdblfvswb6si04m6gyf4k3ihmd1nj39";
        libraryHaskellDepends = [
          aeson base binary bytes bytestring cereal containers data-default
          deepseq hashable haskoin-core http-client http-types lens mtl
@@ -126087,10 +126421,10 @@ self: {
      }:
      mkDerivation {
        pname = "helf";
-       version = "0.2016.12.25";
-       sha256 = "03hslws4v8md2m89ppawh9gfqri7f2rjjiklgc5nvc8nfyxvg5kx";
+       version = "0.2021.8.12";
+       sha256 = "020ri4yjlascjmj4ywc2hji05673bszsb3q5frg1a66nbadzbi2h";
        revision = "1";
-       editedCabalFile = "11a3k59ig549dm3pg5wh2brrdiss1ln0yw3j0j4mgcvqi7kzzmd3";
+       editedCabalFile = "1573q8d39hgb4jq1bwpb7glxcv5bxv9vi27smhngk2wxxby9l4w3";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -126099,8 +126433,7 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
-       license = "unknown";
-       hydraPlatforms = lib.platforms.none;
+       license = lib.licenses.mit;
      }) {};
 
   "helics" = callPackage
@@ -127128,16 +127461,16 @@ self: {
      }:
      mkDerivation {
        pname = "hevm";
-       version = "0.47.0";
-       sha256 = "1rhs3vyf7kwzlyyc0xjp696vh11wm3jz8k27w01blniris5kch9l";
+       version = "0.48.0";
+       sha256 = "12clxkhkap4j0xkn5s2i6cphkhri8vccalg92znlm5drjpbmf457";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         abstract-par aeson ansi-wl-pprint base base16-bytestring binary
-         brick bytestring cereal containers cryptonite data-dword Decimal
-         deepseq directory fgl filepath free haskeline here lens lens-aeson
-         megaparsec memory monad-par mtl multiset operational
+         abstract-par aeson ansi-wl-pprint async base base16-bytestring
+         binary brick bytestring cereal containers cryptonite data-dword
+         Decimal deepseq directory fgl filepath free haskeline here lens
+         lens-aeson megaparsec memory monad-par mtl multiset operational
          optparse-generic process QuickCheck quickcheck-text regex-tdfa
          restless-git rosezipper s-cargot sbv scientific semver-range
          temporary text text-format time transformers tree-view
@@ -130602,6 +130935,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.3.15";
        sha256 = "1jnym3jfixyrldl83jjy3syx6n411gd8dr2jh69lx5wbq8qddpfm";
+       revision = "1";
+       editedCabalFile = "1vyvnk64397kmlhflq1vp9rswhxbcywdw20738z3wq1pig2hqf7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130641,6 +130976,24 @@ self: {
        maintainers = with lib.maintainers; [ peti ];
      }) {};
 
+  "hledger-interest_1_6_2" = callPackage
+    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time
+     }:
+     mkDerivation {
+       pname = "hledger-interest";
+       version = "1.6.2";
+       sha256 = "06gx19vld2lqq5w15hj7amcn1yi7rx8dxrb32hb05aari8b9qdzz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib mtl text time
+       ];
+       description = "computes interest for a given account";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ peti ];
+     }) {};
+
   "hledger-irr" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, Decimal
      , hledger-lib, math-functions, text, time
@@ -131154,8 +131507,8 @@ self: {
        pname = "hlrdb";
        version = "0.3.2.0";
        sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p";
-       revision = "1";
-       editedCabalFile = "1ypb0197v5x6a5zkj7qqrr7lam3sxvvi3wbgk5imvdppq2rj7hqz";
+       revision = "2";
+       editedCabalFile = "15z6f2qqis3qi1cfq43hhcqgcsinx58ha3bghh0pfybqysvbjmmd";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptonite hashable hedis
          hlrdb-core memory random store time unordered-containers zstd
@@ -131434,6 +131787,8 @@ self: {
        pname = "hls-plugin-api";
        version = "1.1.0.2";
        sha256 = "1x49h8087x3fynagm4na72lyqyy58bb33kcrzkfcpbr3lsb8k455";
+       revision = "1";
+       editedCabalFile = "0pgicyph7zz2c7pbcair4wp4x5vvkmigbxxzrsxsgmvavki8r904";
        libraryHaskellDepends = [
          aeson base containers data-default dependent-map dependent-sum Diff
          dlist ghc ghc-api-compat hashable hls-graph hslogger lens lsp
@@ -134379,6 +134734,37 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hpack-dhall_0_5_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+     , dhall, dhall-json, Diff, directory, filepath, hlint, hpack
+     , megaparsec, microlens, optparse-applicative, prettyprinter, tasty
+     , tasty-golden, text, transformers, utf8-string, yaml
+     }:
+     mkDerivation {
+       pname = "hpack-dhall";
+       version = "0.5.3";
+       sha256 = "1prpk9lppz8h5bp6slhl7lm28jw6jf746py9vras0m0g6mrcc3l7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+         megaparsec microlens prettyprinter text transformers yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+         megaparsec microlens optparse-applicative prettyprinter text
+         transformers yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff
+         directory filepath hlint hpack megaparsec microlens prettyprinter
+         tasty tasty-golden text transformers utf8-string yaml
+       ];
+       description = "hpack's dhalling";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hpaco" = callPackage
     ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict
      , utf8-string, yaml
@@ -134521,14 +134907,14 @@ self: {
 
   "hpath-directory" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hpath-filepath
-     , hpath-posix, hspec, HUnit, IfElse, process, safe-exceptions
-     , streamly, streamly-bytestring, streamly-posix, time, transformers
-     , unix, unix-bytestring, utf8-string
+     , hpath-posix, hspec, hspec-discover, HUnit, IfElse, process
+     , safe-exceptions, streamly, streamly-bytestring, streamly-posix
+     , time, transformers, unix, unix-bytestring, utf8-string
      }:
      mkDerivation {
        pname = "hpath-directory";
-       version = "0.14.2";
-       sha256 = "04lkan37v8i1clw459csn8jvkzasz0p8ik8q8slqb9g3a5j68hjy";
+       version = "0.14.2.2";
+       sha256 = "0541pd1ac47wyxwz07yvk8yg1ldbfwzgfaq6rfl8pf182p607a6m";
        libraryHaskellDepends = [
          base bytestring exceptions hpath-filepath hpath-posix IfElse
          safe-exceptions streamly streamly-bytestring streamly-posix time
@@ -134538,6 +134924,7 @@ self: {
          base bytestring hpath-filepath hpath-posix hspec HUnit IfElse
          process time unix unix-bytestring utf8-string
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Alternative to 'directory' package with ByteString based filepaths";
        license = lib.licenses.bsd3;
      }) {};
@@ -138689,14 +139076,14 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hspec_2_8_2" = callPackage
+  "hspec_2_8_3" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.8.2";
-       sha256 = "1s03c1928ndl8bqi3n9fb8a5adr0lycl9qs3x1i6aprzr851myh5";
+       version = "2.8.3";
+       sha256 = "1ryv1qad2rw40ak6n7agfd0sib1xk2iyqpz0qhgyxwp3kkjhrn49";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
@@ -138787,7 +139174,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_8_2" = callPackage
+  "hspec-core_2_8_3" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -138795,8 +139182,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.8.2";
-       sha256 = "0id4c70hq46y2s623y4zsj9pycqp90a3ig991shrhxxd6836c4cx";
+       version = "2.8.3";
+       sha256 = "0khq0xa6agqcvbngzlxnvd9xwh7dmp4rsb2nzvfwsaknw2674i0k";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -138852,19 +139239,20 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_8_2" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+  "hspec-discover_2_8_3" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, mockery
+     , QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.8.2";
-       sha256 = "0bmdph9q4rg5rgr6s65h7si2l5rxyyqv80j5rri6zb4d1n9ih6hs";
+       version = "2.8.3";
+       sha256 = "09rjrq289si08cza48gcp29780rv21rs0b12xglkmbd6vfqzp6cs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base directory filepath hspec-meta QuickCheck
+         base directory filepath hspec-meta mockery QuickCheck
        ];
        testToolDepends = [ hspec-meta ];
        description = "Automatically discover and run Hspec tests";
@@ -140739,6 +141127,27 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "html-conduit_1_3_2_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text
+     , transformers, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "html-conduit";
+       version = "1.3.2.2";
+       sha256 = "09bwrdam3y47kqllgg6w098ghqb8jb10dp4wxirsvx5ddpx9zpi6";
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit conduit-extra containers
+         resourcet text transformers xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq hspec HUnit text xml-conduit
+       ];
+       description = "Parse HTML documents using xml-conduit datatypes";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "html-email-validate" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck
      , regex-pcre-builtin, text
@@ -142854,6 +143263,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_2_0_0_5" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "2.0.0.5";
+       sha256 = "0pbsbj70a2m7zvk25wa8mi0ymxv4c49g2vgg8819wpjcrxw8sy64";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
+       description = "Deja Fu support for the HUnit test framework";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -143243,8 +143664,8 @@ self: {
     ({ mkDerivation, base, hvega, text }:
      mkDerivation {
        pname = "hvega-theme";
-       version = "0.2.0.4";
-       sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv";
+       version = "0.2.0.5";
+       sha256 = "19pkrv92wr0bzalrzz15fmz74ylzcab8klqppnjzpdmym43zd0rm";
        libraryHaskellDepends = [ base hvega text ];
        description = "Theme for hvega";
        license = lib.licenses.gpl3Only;
@@ -149894,8 +150315,8 @@ self: {
      }:
      mkDerivation {
        pname = "interval-algebra";
-       version = "0.8.6";
-       sha256 = "1k9x1c7hrbrq6zgj82k8w28ak1jp1v9iq19bicl5355r4p2wiqsa";
+       version = "0.10.0";
+       sha256 = "1b1a78rssxaqiw42hbb1zqmlq4lmxkxxkhrm3ybqpmrqk492mckv";
        libraryHaskellDepends = [
          base containers foldl QuickCheck safe time witherable
        ];
@@ -150958,6 +151379,28 @@ self: {
        maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
+  "irc-client_1_1_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.1.2.2";
+       sha256 = "0hhaf7xhy3q48gkp2j01jjiiz0ww9mwwjh8brbqs8phlal03ks70";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-chans text time tls transformers x509
+         x509-store x509-validation
+       ];
+       description = "An IRC client library";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ sternenseemann ];
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -150987,6 +151430,25 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_3_0_5" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
+     , time, tls, transformers, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.3.0.5";
+       sha256 = "02ziqjzqdyaizhrrzlbq4ddkfjfjf58jvwqfzrbf0mf0f5scv9cz";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra connection irc irc-ctcp
+         network-conduit-tls profunctors text time tls transformers
+         x509-validation
+       ];
+       description = "Streaming IRC message library using conduits";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , hashable, HUnit, primitive, text, time, vector
@@ -151016,6 +151478,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "irc-ctcp_0_1_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, text }:
+     mkDerivation {
+       pname = "irc-ctcp";
+       version = "0.1.3.1";
+       sha256 = "1ckdbxnjv96bpyhcpdi0vj6pjjq8wm4zyh75fps57wi1j61c4v2n";
+       libraryHaskellDepends = [ base bytestring text ];
+       description = "A CTCP encoding and decoding library for IRC clients";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "irc-dcc" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
      , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network
@@ -152928,18 +153402,18 @@ self: {
 
   "jenkinsPlugins2nix" = callPackage
     ({ mkDerivation, attoparsec, base, bimap, bytestring, containers
-     , cryptohash, hnix, http-conduit, mtl, optparse-applicative
+     , cryptonite, hnix, http-conduit, mtl, optparse-applicative
      , prettyprinter, prettyprinter-ansi-terminal, tasty-hspec, text
      , zip-archive
      }:
      mkDerivation {
        pname = "jenkinsPlugins2nix";
-       version = "0.4.0.0";
-       sha256 = "0s2k4irml4hahnv9qzsw1vvlqc651gmwgiscz97pcgb25v5slmcz";
+       version = "0.5.0.0";
+       sha256 = "15nalymjgvzsv6pyhy4fx70cdnffd1kamhl94w0xg0vrzrqq17rc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers cryptohash hnix http-conduit
+         attoparsec base bytestring containers cryptonite hnix http-conduit
          mtl prettyprinter text zip-archive
        ];
        executableHaskellDepends = [
@@ -153364,6 +153838,37 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
+  "jose_0_8_4_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, concise, containers, cryptonite, hspec, lens, memory
+     , monad-time, mtl, network-uri, pem, QuickCheck
+     , quickcheck-instances, safe, tasty, tasty-hspec, tasty-quickcheck
+     , template-haskell, text, time, unordered-containers, vector, x509
+     }:
+     mkDerivation {
+       pname = "jose";
+       version = "0.8.4.1";
+       sha256 = "0zwac71gqxf2wz840gfwnpv0ax7c4wpiwkcxqwcfil7fn4bqjlpw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe template-haskell text time
+         unordered-containers vector x509
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite hspec lens memory monad-time mtl network-uri
+         pem QuickCheck quickcheck-instances safe tasty tasty-hspec
+         tasty-quickcheck template-haskell text time unordered-containers
+         vector x509
+       ];
+       description = "Javascript Object Signing and Encryption and JSON Web Token library";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, hspec, HUnit, memory, mtl
@@ -158531,8 +159036,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.3.0.1";
-       sha256 = "0jkp4qr2d37pd0nr074fzrvjn95jg7x7zjwnddsqw5m4m2l1iqsr";
+       version = "5.3.0.2";
+       sha256 = "0c5qwgzisvqxlyh378bbnabb9lbinknwvcf46sjpm6355krcw3g7";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -158570,6 +159075,32 @@ self: {
        license = "GPL";
      }) {};
 
+  "lambdabot-core_5_3_0_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , dependent-map, dependent-sum, dependent-sum-template, directory
+     , edit-distance, exceptions, filepath, haskeline, hslogger, HTTP
+     , lifted-base, monad-control, mtl, network, network-bsd, parsec
+     , prim-uniq, random, random-fu, random-source, regex-tdfa
+     , SafeSemaphore, split, syb, template-haskell, time, transformers
+     , transformers-base, unix, utf8-string, zlib
+     }:
+     mkDerivation {
+       pname = "lambdabot-core";
+       version = "5.3.0.2";
+       sha256 = "1i375kiw98j5gd4pixh59lcqk0lakwmrgxzpkr0431a48kxffq7r";
+       libraryHaskellDepends = [
+         base binary bytestring containers dependent-map dependent-sum
+         dependent-sum-template directory edit-distance exceptions filepath
+         haskeline hslogger HTTP lifted-base monad-control mtl network
+         network-bsd parsec prim-uniq random random-fu random-source
+         regex-tdfa SafeSemaphore split syb template-haskell time
+         transformers transformers-base unix utf8-string zlib
+       ];
+       description = "Lambdabot core functionality";
+       license = "GPL";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "lambdabot-haskell-plugins" = callPackage
     ({ mkDerivation, array, arrows, base, bytestring, containers
      , data-memocombinators, directory, filepath
@@ -158581,8 +159112,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.3";
-       sha256 = "1vlyjkz0dammzf5v8i9sfyswbnpfv0vpwpxybc1dhzm1qv04vbwh";
+       version = "5.3.0.2";
+       sha256 = "1h2f86dw3356n66n1nfcqi5hsnj6kvlc1px8s4nrw3zvjlkangzq";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
@@ -158602,8 +159133,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-irc-plugins";
-       version = "5.3";
-       sha256 = "0dm5bsr8hly43hzfja8h6i3n3jai38ln9629p4dlsr8s1himcjbm";
+       version = "5.3.0.2";
+       sha256 = "1pwl77dh474sqvhd4nfqcqvzicz36xww13sw49qs5wd2fkp50zqi";
        libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
@@ -158621,8 +159152,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-misc-plugins";
-       version = "5.3";
-       sha256 = "03cj8bzmg7q6b66mblmxv39aw5jd586w1w90zyl632rff4j5f0bh";
+       version = "5.3.0.2";
+       sha256 = "0m2rarvcmmas78ghzvzjf1flicj2sf4d14i7y5cxfpc5l3zcyqwq";
        libraryHaskellDepends = [
          base bytestring containers filepath lambdabot-core lifted-base mtl
          network network-uri parsec process random random-fu random-source
@@ -158640,8 +159171,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
-       version = "5.3";
-       sha256 = "0f7frjj41wpkhzvzi2xz7hsv8cr0fg653iqf8gqxlprk4k1sag5n";
+       version = "5.3.0.2";
+       sha256 = "09rqshkh1k7536b9zw4rga370l35v47vf28xdlnrh7knwh88yr70";
        libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -158657,8 +159188,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-reference-plugins";
-       version = "5.3";
-       sha256 = "0xg8cpd25d01a35y2qmrhp402iphhdjb8sld5lnwc8rzyn6nd7gb";
+       version = "5.3.0.2";
+       sha256 = "1n9r29gmllmad2nr83gnbafka7gp99qji1pj0hhcr7gb31asz2xl";
        libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -158673,8 +159204,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-social-plugins";
-       version = "5.3";
-       sha256 = "0gncll1z2x26v4g874vbwpg8yh9kang6wcvb4ywmfmlrs7kqw9fn";
+       version = "5.3.0.2";
+       sha256 = "10yl1z562cnnx0ml343c7psaw5zsil66zrbsgvij6cy2b2p2d3m2";
        libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
@@ -158686,8 +159217,8 @@ self: {
     ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
      mkDerivation {
        pname = "lambdabot-trusted";
-       version = "5.3";
-       sha256 = "0847bxdnwh15szrhjb42y9nrb6qbaq6qyylwbmk1hkavp1baw77b";
+       version = "5.3.0.2";
+       sha256 = "1mwgamd75llraiafk7s43j6qz495j96s1dprckrisww37gv3nn8d";
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        description = "Lambdabot trusted code";
        license = "GPL";
@@ -160668,6 +161199,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "lapack-hmatrix" = callPackage
+    ({ mkDerivation, base, comfort-array, hmatrix, lapack, netlib-ffi
+     , transformers, utility-ht, vector
+     }:
+     mkDerivation {
+       pname = "lapack-hmatrix";
+       version = "0.0";
+       sha256 = "024lfbj5v4rgxvfs4cgfr6xajf3svdlxv7sl9wkyzwi7dk1zh9pr";
+       libraryHaskellDepends = [
+         base comfort-array hmatrix lapack netlib-ffi transformers
+         utility-ht vector
+       ];
+       description = "Conversion of objects between 'lapack' and 'hmatrix'";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "large-hashable" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
      , bytestring, cereal, containers, cryptohash, deepseq, hashable
@@ -169286,8 +169833,8 @@ self: {
      }:
      mkDerivation {
        pname = "lti13";
-       version = "0.2.0.2";
-       sha256 = "1a8ag4ny61rjyy15fa4mihrgqkinipzj5cvpasscl9yw8jik9s1i";
+       version = "0.2.0.3";
+       sha256 = "1ls1hfyivmx5yi9i15m95j9j12agyrmfiwza3w9dfa23c210fcxh";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-types jose-jwt
          oidc-client safe-exceptions text
@@ -180441,8 +180988,8 @@ self: {
      }:
      mkDerivation {
        pname = "monomer";
-       version = "1.0.0.0";
-       sha256 = "136ja518hybhdl336772pyl5gfpvq7bzbm4gka53fmw3f42a1gkw";
+       version = "1.0.0.1";
+       sha256 = "1ns4zm1vny8r49k0iq77b75s17gqmzxjv3kj70a4k5j4jx5s70fr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184150,6 +184697,31 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "mwc-random_0_15_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, gauge, math-functions
+     , mersenne-random, primitive, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, time, vector
+     }:
+     mkDerivation {
+       pname = "mwc-random";
+       version = "0.15.0.2";
+       sha256 = "0ny2mw4am24d6ykrm8rbcjnrq6p2cjmzjb4m6qfk54wfdxflvmim";
+       libraryHaskellDepends = [
+         base math-functions primitive random time vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest primitive QuickCheck random tasty
+         tasty-hunit tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base gauge mersenne-random random vector
+       ];
+       doCheck = false;
+       description = "Fast, high quality pseudo random number generation";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mwc-random-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, mwc-random }:
      mkDerivation {
@@ -185238,19 +185810,18 @@ self: {
      }) {};
 
   "nanovg" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, glew
-     , hspec, inline-c, libGL, libGLU, QuickCheck, text, vector
+    ({ mkDerivation, base, bytestring, c2hs, containers, freetype, GLEW
+     , glew, hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text
+     , vector
      }:
      mkDerivation {
        pname = "nanovg";
-       version = "0.6.0.0";
-       sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3";
-       revision = "1";
-       editedCabalFile = "1lhfsq50r9bdby7mfscw8ih3wsz2m19lr2a2z9b6diaf5kz76vij";
+       version = "0.7.0.0";
+       sha256 = "1mrn5dy05nl5kkxw5vfgf57wifllq7jnv0akd1wi9wnlgvvqjnqz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
-       librarySystemDepends = [ GLEW libGL libGLU ];
+       librarySystemDepends = [ freetype GLEW libGL libGLU libX11 ];
        libraryPkgconfigDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
@@ -185258,8 +185829,9 @@ self: {
        license = lib.licenses.isc;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
-         inherit (pkgs) libGLU;};
+     }) {GLEW = null; inherit (pkgs) freetype; inherit (pkgs) glew; 
+         inherit (pkgs) libGL; inherit (pkgs) libGLU; 
+         inherit (pkgs.xorg) libX11;};
 
   "nanovg-simple" = callPackage
     ({ mkDerivation, base, GLFW-b, monad-loops, nanovg, OpenGL
@@ -194758,8 +195330,8 @@ self: {
        pname = "optparse-generic";
        version = "1.4.4";
        sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74";
-       revision = "2";
-       editedCabalFile = "172x8990wx4jhyb7yp9k18nd6q4sis8km09x2afr238siqviclrc";
+       revision = "3";
+       editedCabalFile = "1y5m84d72z2fhnzznlyq4hj4hfg04hgszng3ps4dz4s1wd565m1s";
        libraryHaskellDepends = [
          base bytestring Only optparse-applicative system-filepath text time
          transformers void
@@ -196367,8 +196939,8 @@ self: {
        pname = "palette";
        version = "0.3.0.2";
        sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i";
-       revision = "1";
-       editedCabalFile = "0x536r15zzxlkf5p5a2x64qr5szdf9yh04vaiiwfhsm232qb6fjq";
+       revision = "2";
+       editedCabalFile = "134w4bm1p6piyx594dx4hncf3adycqld4935bs2wbrq634w7ngxg";
        libraryHaskellDepends = [
          array base colour containers MonadRandom
        ];
@@ -198788,16 +199360,14 @@ self: {
      }:
      mkDerivation {
        pname = "parsley";
-       version = "1.0.0.1";
-       sha256 = "0z4w6hwa0yj34xsqp63kqy3wkk51k343fv8ijbk0s4w4hdx7d7jb";
-       revision = "1";
-       editedCabalFile = "0bv13k090bn5jy1qi3palrp7sri1xbd6xvh7ymhd9l0431yfzadv";
+       version = "1.0.0.2";
+       sha256 = "06rc8zcgp5zyvf17pgzf1nqlc3avdl8rmbwabkggk4v4x9rxwkjx";
        libraryHaskellDepends = [
          base parsley-core template-haskell text
        ];
        testHaskellDepends = [
-         base deepseq parsley-garnish tasty tasty-hunit tasty-quickcheck
-         template-haskell th-test-utils
+         base deepseq parsley-core parsley-garnish tasty tasty-hunit
+         tasty-quickcheck template-haskell th-test-utils
        ];
        benchmarkHaskellDepends = [
          array attoparsec base bytestring containers criterion deepseq
@@ -198813,18 +199383,22 @@ self: {
   "parsley-core" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, cpphs
      , dependent-map, dependent-sum, ghc-prim, hashable, mtl
-     , pretty-terminal, template-haskell, text, unordered-containers
+     , pretty-terminal, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, unordered-containers
      }:
      mkDerivation {
        pname = "parsley-core";
-       version = "1.4.0.0";
-       sha256 = "1w9pilgaajaycxr0nvjwdzk5fjf7pg4spnwh2197gbpqhbkj75q3";
+       version = "1.6.0.0";
+       sha256 = "1hjsnwh3gxwk1jmc0xylvjpsa3shzvjb5sn1imypgnnb887iabv6";
        libraryHaskellDepends = [
          array base bytestring containers dependent-map dependent-sum
          ghc-prim hashable mtl pretty-terminal template-haskell text
          unordered-containers
        ];
        libraryToolDepends = [ cpphs ];
+       testHaskellDepends = [
+         base containers tasty tasty-hunit tasty-quickcheck
+       ];
        description = "A fast parser combinator library backed by Typed Template Haskell";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
@@ -202958,8 +203532,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "phonetic-languages-rhythmicity";
-       version = "0.6.0.1";
-       sha256 = "0rhn5xsqy4b330y17saa78v72dc7lq24y2k5p5r3xfbw621plwba";
+       version = "0.9.0.0";
+       sha256 = "1xymd8r5lp4jn0qb4p1dyzbhdyb3nsnvphx7f9nvf46kjbz18670";
        libraryHaskellDepends = [ base ];
        description = "Allows to estimate the rhythmicity properties for the text";
        license = lib.licenses.mit;
@@ -203003,13 +203577,13 @@ self: {
      , phonetic-languages-simplified-base
      , phonetic-languages-simplified-examples-common
      , phonetic-languages-simplified-properties-array
-     , phonetic-languages-ukrainian-array, subG
+     , phonetic-languages-ukrainian-array, string-interpreter, subG
      , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.7.0.0";
-       sha256 = "13v2wizjrnpwi7x42c9aqgsa5yr2x3blpmyqv9jkqxx7ksx0fbfg";
+       version = "0.10.0.0";
+       sha256 = "0m7p4iddilaf0v81kjya41m6rczplhw8cl3gq4axwq5lw0x5nppf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203020,7 +203594,7 @@ self: {
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
          phonetic-languages-simplified-examples-common
          phonetic-languages-simplified-properties-array
-         phonetic-languages-ukrainian-array subG
+         phonetic-languages-ukrainian-array string-interpreter subG
          ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
        ];
        executableHaskellDepends = [
@@ -203031,7 +203605,7 @@ self: {
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
          phonetic-languages-simplified-examples-common
          phonetic-languages-simplified-properties-array
-         phonetic-languages-ukrainian-array subG
+         phonetic-languages-ukrainian-array string-interpreter subG
          ukrainian-phonetics-basic-array uniqueness-periods-vector-stats
        ];
        description = "Helps to create Ukrainian texts with the given phonetic properties";
@@ -203066,12 +203640,12 @@ self: {
      , phonetic-languages-simplified-base
      , phonetic-languages-simplified-generalized-examples-common
      , phonetic-languages-simplified-generalized-properties-array
-     , process, subG
+     , process, string-interpreter, subG
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-examples-array";
-       version = "0.7.0.0";
-       sha256 = "1qy4j61mkrkpa5451bzqg92jcbr77djn1jpvdd008pmvzijhnwqr";
+       version = "0.10.0.0";
+       sha256 = "169ln5g5gz4lshsk2qfmj6h25x3xch0ar4mm0i9wn07wa7g1yyvj";
        libraryHaskellDepends = [
          base heaps mmsyn2-array mmsyn3 parallel
          phonetic-languages-constraints-array
@@ -203081,7 +203655,7 @@ self: {
          phonetic-languages-simplified-base
          phonetic-languages-simplified-generalized-examples-common
          phonetic-languages-simplified-generalized-properties-array process
-         subG
+         string-interpreter subG
        ];
        description = "Helps to create texts with the given phonetic properties (e. g. poetic).";
        license = lib.licenses.mit;
@@ -203109,8 +203683,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-properties-array";
-       version = "0.5.0.0";
-       sha256 = "0hxlii3d522ikh6czh720p1x97ixjh3b4s16zr6a2vk3h6pkvqw4";
+       version = "0.8.0.0";
+       sha256 = "0fi76agkx6i55121pcj3wxrfw4ymqyqb5l8sa8vm78nvx5r54nsd";
        libraryHaskellDepends = [
          base phonetic-languages-phonetics-basics
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
@@ -203161,8 +203735,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-properties-array";
-       version = "0.5.0.0";
-       sha256 = "1zv3ax3idvlhvaspmsalrrw1816rf3w1sza3yscdv221yn1783g7";
+       version = "0.8.0.0";
+       sha256 = "1h32g5cqib72j2ib26ch6b1r50j506arx0pz6zfxl968095vmcan";
        libraryHaskellDepends = [
          base phonetic-languages-rhythmicity
          phonetic-languages-simplified-base ukrainian-phonetics-basic-array
@@ -207327,8 +207901,8 @@ self: {
        pname = "polysemy-methodology";
        version = "0.2.1.0";
        sha256 = "17md6l5smy1ssn99kij6rnb42bx3fx8h49z85cm9sf41k6lb5k1g";
-       revision = "1";
-       editedCabalFile = "1sn9447cxpxmw1jkijbv2039xv3ya08mdgd7kmrwp8ljzj1922ni";
+       revision = "2";
+       editedCabalFile = "0dpancn85f8j3pxhk43lik6fbznp502cc68rkhqkan791kh1bbc7";
        libraryHaskellDepends = [
          base polysemy polysemy-kvstore polysemy-several
        ];
@@ -207363,8 +207937,8 @@ self: {
        pname = "polysemy-methodology-composite";
        version = "0.1.4.0";
        sha256 = "014kfaxxi24n99gvrvf9c6c8cx8csbb9a8fbfb2md5g2d2q4v08g";
-       revision = "1";
-       editedCabalFile = "1vf5l2c3k370x0rl4js2hfrc0z434zzkgbkgnhjixbkbqcq2ig2p";
+       revision = "2";
+       editedCabalFile = "0sz200c83xjj22ifx9babvps0cnqk9gz42h081m5wb6s1w58dnib";
        libraryHaskellDepends = [
          base composite-base polysemy polysemy-extra polysemy-methodology
          polysemy-vinyl vinyl
@@ -207524,8 +208098,8 @@ self: {
        pname = "polysemy-several";
        version = "0.1.0.0";
        sha256 = "1mw6a6fz3879yqnpq6h0221i8b8f05j90b1zydhzr57nsbklxzps";
-       revision = "1";
-       editedCabalFile = "0d0632ayig8f66604ncad7y4gjlxsss9awlscxd5hsa2r49l4m7q";
+       revision = "3";
+       editedCabalFile = "0ig9jqrv9dqasgjhshapcxjqp4vdpl1p09q0fy34847vchg5jgpb";
        libraryHaskellDepends = [ base polysemy ];
        description = "Run several effects at once, taken from the polysemy-zoo";
        license = lib.licenses.mit;
@@ -207618,8 +208192,8 @@ self: {
        pname = "polysemy-video";
        version = "0.2.0.1";
        sha256 = "1lbjjq6q3i6v41ssqy69p4iwvybidrmxcxwjzddbxcrmymr0rmlc";
-       revision = "1";
-       editedCabalFile = "0bz6zb6zn1q4swj2szzrjakjm8qfmzasin6fgpz01g5m2payfc3c";
+       revision = "2";
+       editedCabalFile = "1jjwn6ysygc3dz963zqhlmcqvhv79ll7kp6mbpm73fhad4jbrfvs";
        libraryHaskellDepends = [
          base formatting path path-formatting polysemy
          simple-media-timestamp simple-media-timestamp-formatting text
@@ -216778,8 +217352,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-state-machine";
-       version = "0.7.0";
-       sha256 = "053fc1hxkpfpmwn5dq5x5vd094g978hwc145qpzknwbk6hrc28ka";
+       version = "0.7.1";
+       sha256 = "0s6j3y0fkbbhmid0skqxx2m3mpbphz6npw9fvim5kx7w4i6jrvfz";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers directory exceptions filepath
          generic-data graphviz markov-chain-usage-model matrix mtl
@@ -219156,6 +219730,28 @@ self: {
        broken = true;
      }) {};
 
+  "rattletrap_11_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , containers, filepath, http-client, http-client-tls, HUnit, text
+     }:
+     mkDerivation {
+       pname = "rattletrap";
+       version = "11.2.1";
+       sha256 = "0kmr3178rilifbqs2zkifx47fdq279n4wzxbcr6kn71450xi5xyx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty array base bytestring containers filepath
+         http-client http-client-tls text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring filepath HUnit ];
+       description = "Parse and generate Rocket League replays";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "raven-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
      , network, random, resourcet, text, time, unordered-containers
@@ -220213,9 +220809,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "realworldhaskell";
-       version = "0.0.1.0";
-       sha256 = "0695y4af42vm50njpldx3i03ia4bws0lx3yhw6p2rv032jhmp5w6";
+       version = "0.0.1.1";
+       sha256 = "1gys7lcpl50nza5jgbmacw7n42c6s4f0jk7ga351w1g4z4ysrblg";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "The Real World Haskell Book";
        license = lib.licenses.publicDomain;
      }) {};
@@ -220494,6 +221091,17 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "record-operations" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "record-operations";
+       version = "0.0.1";
+       sha256 = "07wasqlzl1flrm16429mg5wcryd3p1sj1w7q8h59y31rm2ap643j";
+       libraryHaskellDepends = [ base ];
+       description = "polymorphic record operations";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "record-preprocessor" = callPackage
     ({ mkDerivation, base, base-prelude, basic-lens, conversion
      , conversion-text, record, record-syntax, text
@@ -222309,6 +222917,8 @@ self: {
        pname = "regex-base";
        version = "0.94.0.1";
        sha256 = "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi";
+       revision = "1";
+       editedCabalFile = "19rzll80mpr4licfzz6qfy4i9xbmhxy4r7n1d523db73q09jvzrm";
        libraryHaskellDepends = [
          array base bytestring containers mtl text
        ];
@@ -222322,6 +222932,8 @@ self: {
        pname = "regex-compat";
        version = "0.95.2.1";
        sha256 = "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg";
+       revision = "1";
+       editedCabalFile = "1r9gvk0lifppydlns81zh8052941saaaahydvbcgnrz0jwn1di9j";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Replaces/enhances \"Text.Regex\"";
        license = lib.licenses.bsd3;
@@ -222503,8 +223115,8 @@ self: {
        pname = "regex-pcre";
        version = "0.95.0.0";
        sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n";
-       revision = "2";
-       editedCabalFile = "0bvpy3rswyawv23s14nbxvgz5761s61g0shcj7p032i95iq7dj6d";
+       revision = "3";
+       editedCabalFile = "1mxy2y7dmv37hhsasm17x2mb9dhmzza13pc7jfrk77inpig78ib8";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -222614,6 +223226,8 @@ self: {
        pname = "regex-tdfa";
        version = "1.3.1.1";
        sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi";
+       revision = "1";
+       editedCabalFile = "02gwf740vs0jy3l6dgw72r8c04yggshia6w16n140ncpsici8c4r";
        libraryHaskellDepends = [
          array base bytestring containers mtl parsec regex-base text
        ];
@@ -226734,8 +227348,8 @@ self: {
      }:
      mkDerivation {
        pname = "risc386";
-       version = "0.0.20210125";
-       sha256 = "0fc551nvmqgl1sj3c45bwjzc9ksqbwg17dzkipyyzdrgi1shawn2";
+       version = "0.0.20210812";
+       sha256 = "0fxwmah8f4jhs480hrvbvchkmxgfmnsswg0d5zlbdgsiqfln42qv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl pretty ];
@@ -234207,13 +234821,16 @@ self: {
      }) {};
 
   "sequence" = callPackage
-    ({ mkDerivation, base, containers, transformers }:
+    ({ mkDerivation, base, containers, QuickCheck, tasty
+     , tasty-quickcheck, transformers
+     }:
      mkDerivation {
        pname = "sequence";
-       version = "0.9.8";
-       sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
+       version = "0.9.9.0";
+       sha256 = "17jklfz4w73i7k4w22czc81wll8bi614wh513ra6hcnd06ba70rs";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A type class for sequences and various sequence data structures";
        license = lib.licenses.bsd3;
      }) {};
@@ -236863,6 +237480,29 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "servant-streamly" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, http-client, resourcet
+     , servant, servant-client, servant-server, streamly
+     , streamly-bytestring, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-streamly";
+       version = "0.1.0.0";
+       sha256 = "10f0pqhaypdk46v5gkpv3001k14v7ppfffv89x25lqlls9yrqfvf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base resourcet servant streamly ];
+       executableHaskellDepends = [
+         base bytestring http-client resourcet servant servant-client
+         servant-server streamly streamly-bytestring wai warp
+       ];
+       testHaskellDepends = [
+         base hspec resourcet servant servant-server streamly
+       ];
+       description = "Servant Stream support for streamly";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "servant-subscriber" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, filepath
@@ -238453,10 +239093,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-cabal";
-       version = "0.2.2.1";
-       sha256 = "1vyz95qa5f6k0lqf24w60dmlszs1sv0sqv2p0sncn8ll7g785sx1";
-       revision = "1";
-       editedCabalFile = "04b9kd2jaim8qsgpji4xv7c9kmbfw089zla877qr67kvfwp6qy6m";
+       version = "0.2.2.2";
+       sha256 = "1z1l4mah7nmpa6ycx9f5ynr9rn24irs1w44nq1j3ck25b408g460";
        libraryHaskellDepends = [
          base binary Cabal composition-prelude deepseq directory filepath
          hashable shake
@@ -245317,17 +245955,19 @@ self: {
 
   "snowchecked" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq, hedgehog
-     , time, wide-word
+     , text, text-conversions, time, wide-word
      }:
      mkDerivation {
        pname = "snowchecked";
-       version = "0.0.0.3";
-       sha256 = "08a4v3i3ky4vbllag7wmmf4qbnf6dan93h7ipcngxk9vhx9wh4vh";
+       version = "0.0.1.0";
+       sha256 = "1128b0a4q7vnzz07ddalp6rjcmyvg98r8z77pzj573scrp214abn";
        libraryHaskellDepends = [
-         base bytestring data-default deepseq time wide-word
+         base bytestring data-default deepseq text text-conversions time
+         wide-word
        ];
        testHaskellDepends = [
-         base bytestring data-default deepseq hedgehog time wide-word
+         base bytestring data-default deepseq hedgehog text text-conversions
+         time wide-word
        ];
        description = "A checksummed variation on Twitter's Snowflake UID generation algorithm";
        license = lib.licenses.asl20;
@@ -251279,6 +251919,55 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "store_0_7_12" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
+     , clock, containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, nats, network, primitive, resourcet, safe
+     , smallcheck, store-core, syb, template-haskell, text, th-lift
+     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+     , transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.7.12";
+       sha256 = "1r6wajaxjlh38bivzmcdx8p0x89g04p6alddlibpa356drzl3jbp";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring containers contravariant cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable nats network primitive
+         resourcet safe smallcheck store-core syb template-haskell text
+         th-lift th-lift-instances th-orphans th-reify-many th-utilities
+         time transformers unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring clock containers contravariant cryptohash deepseq
+         directory filepath free ghc-prim hashable hspec hspec-smallcheck
+         integer-gmp lifted-base monad-control mono-traversable nats network
+         primitive resourcet safe smallcheck store-core syb template-haskell
+         text th-lift th-lift-instances th-orphans th-reify-many
+         th-utilities time transformers unordered-containers vector void
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring cereal cereal-vector containers contravariant criterion
+         cryptohash deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable nats network primitive resourcet safe smallcheck
+         store-core syb template-haskell text th-lift th-lift-instances
+         th-orphans th-reify-many th-utilities time transformers
+         unordered-containers vector vector-binary-instances void weigh
+       ];
+       description = "Fast binary serialization";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
      , transformers
@@ -252368,8 +253057,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly-posix";
-       version = "0.1.0.1";
-       sha256 = "1z6hmnhgglr5zwsaakn7c6d0cgq32pwcdds8fkn28y9p3yc89bvv";
+       version = "0.1.0.2";
+       sha256 = "14ncn4k0nd05rgbyf0apy4lk2w4lzsz4cbhykvfwxgf871yxd9lf";
        libraryHaskellDepends = [
          base bytestring hpath-posix safe-exceptions streamly
          streamly-bytestring transformers unix word8
@@ -252931,6 +253620,17 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "string-interpreter" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "string-interpreter";
+       version = "0.2.0.0";
+       sha256 = "1bwdfbpmlfqixfwc02jxdyyv0pkiysh24pnmna12cwpvb9582f6n";
+       libraryHaskellDepends = [ base ];
+       description = "Is used in the recursive mode for phonetic languages approach";
+       license = lib.licenses.mit;
+     }) {};
+
   "string-isos" = callPackage
     ({ mkDerivation, base, bytestring, mono-traversable, safe, text
      , type-iso
@@ -258698,8 +259398,8 @@ self: {
      }:
      mkDerivation {
        pname = "taskell";
-       version = "1.11.2";
-       sha256 = "0ycv054gh28c5llyfjvsdbyq1w5jhj25b9zphj2kya0jnvpkmm81";
+       version = "1.11.3";
+       sha256 = "1wymiy9cp8d3h17nbk6qfb1visdr30c6ivrygm6dwxrbambarvd8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -258875,8 +259575,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-checklist";
-       version = "1.0.2.0";
-       sha256 = "0smd93c1zs44nwiz0dk87izg0c9cyvx2klzy126w0p0xcxwwbhlr";
+       version = "1.0.3.0";
+       sha256 = "0vlhpc50w8gzdix1ys42cgpdv8rnkffal2zn283pccf1lfbimbjk";
        libraryHaskellDepends = [
          base exceptions parameterized-utils text
        ];
@@ -258901,6 +259601,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_2_0_0_8" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "2.0.0.8";
+       sha256 = "0v0vkbj8nr4jg62a5c0qygj1pjkz1vnssiicafv87qis02j36myx";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       description = "Deja Fu support for the Tasty test framework";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -262174,6 +262886,29 @@ self: {
        license = lib.licenses.gpl2Only;
      }) {};
 
+  "texmath_0_12_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.12.3.1";
+       sha256 = "1qyiihb9h7w7074p495yd4s8dj9adz0dy865gyp822z69jvmkcki";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec split syb text xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process temporary text
+         utf8-string xml
+       ];
+       description = "Conversion between formats used to represent mathematics";
+       license = lib.licenses.gpl2Only;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, semigroups, temporary
@@ -272137,6 +272872,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "typed-process_0_2_6_1" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+     , process, stm, temporary, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.2.6.1";
+       sha256 = "0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws";
+       libraryHaskellDepends = [
+         async base bytestring process stm transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring hspec process stm temporary
+         transformers unliftio-core
+       ];
+       description = "Run external processes, with strong typing of streams";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -274859,6 +275614,8 @@ self: {
        pname = "universum";
        version = "1.7.2";
        sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb";
+       revision = "1";
+       editedCabalFile = "17w3zpbv5ap9as506fn43xlnh6sqxni8mmczlp5l86hvn7zd8y6z";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable microlens
          microlens-mtl mtl safe-exceptions stm text transformers
@@ -280309,8 +281066,8 @@ self: {
      }:
      mkDerivation {
        pname = "vulkan";
-       version = "3.11.5";
-       sha256 = "18g8ckarjqz4nws1gihx3wpywqwkiwg88qq071sjs7wvsnwbjf2s";
+       version = "3.12.1";
+       sha256 = "0y9ykv0dx5hvh2683yyn8mdl3jxqk9zaf2a1rkyr5zgc43wsbm05";
        libraryHaskellDepends = [ base bytestring transformers vector ];
        libraryPkgconfigDepends = [ vulkan ];
        testHaskellDepends = [
@@ -280342,8 +281099,8 @@ self: {
      }:
      mkDerivation {
        pname = "vulkan-utils";
-       version = "0.5.1";
-       sha256 = "1552vk9nzvcpkgh5b9lln9gl6rxg1jr8z7blgp3sss3pjsvi3s11";
+       version = "0.5.2";
+       sha256 = "05h54dzci8ahnxshrcd7l6bpg1q8llnrwycgpbpn12cf6ddmdc59";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring containers dependent-map dependent-sum extra
@@ -284409,6 +285166,20 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "wgpu-raw-hs" = callPackage
+    ({ mkDerivation, base, GLFW-b, unix }:
+     mkDerivation {
+       pname = "wgpu-raw-hs";
+       version = "0.1.0.2";
+       sha256 = "1hagn99jdmwjcyz2afmmd9ws31dncas9fssv6lx75kshar6x4rah";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base GLFW-b unix ];
+       executableHaskellDepends = [ base GLFW-b ];
+       description = "WGPU Raw";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "what4" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized
      , bytestring, config-value, containers, contravariant
@@ -288562,8 +289333,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.38";
-       sha256 = "1h7y5bnrsxc9k92zn5pfyimpdvm9245b93rxf0ff1avssnp1i31s";
+       version = "0.39";
+       sha256 = "1k1n3ff0ikdmfq0mi8r2vpqg1iq6hsw1drvxps6k98rvvn87pws6";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -291017,19 +291788,19 @@ self: {
   "yesod-auth-lti13" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bytestring, containers, cryptonite, http-client, http-conduit
-     , jose-jwt, load-env, lti13, microlens, oidc-client, random
+     , jose-jwt, load-env, lti13, microlens, oidc-client
      , safe-exceptions, text, time, warp, yesod, yesod-auth, yesod-core
      }:
      mkDerivation {
        pname = "yesod-auth-lti13";
-       version = "0.2.0.2";
-       sha256 = "19x8a3jfwrsrizg8lj8wrc9k2b0p4lga3q5fqqa60jjsr6lm73j3";
+       version = "0.2.0.3";
+       sha256 = "06xlpdirr7s4l9a9sxydn7vj0z9dy600yn6nmccv042awkdg5l0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring containers
          cryptonite http-client http-conduit jose-jwt load-env lti13
-         microlens oidc-client random safe-exceptions text time warp yesod
+         microlens oidc-client safe-exceptions text time warp yesod
          yesod-auth yesod-core
        ];
        description = "A yesod-auth plugin for LTI 1.3";
@@ -293459,8 +294230,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.7.1";
-       sha256 = "0clvfkdrmw7lmrcyn8cilgf0k7438c384vwvjx256pyl46y3ym5m";
+       version = "0.7.1.2";
+       sha256 = "1wg1vvf7wna5pv2mgs66c82rjan0ig4vv6vv2vlsnxzbpkn7vvf5";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -293470,7 +294241,7 @@ self: {
          split text time unordered-containers yaml
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
-       license = "GPL";
+       license = lib.licenses.gpl2Plus;
        hydraPlatforms = lib.platforms.none;
        broken = true;
      }) {};

From a8241df6278debce25586d588aced3089ac9a743 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 10:22:01 +0200
Subject: [PATCH 10/20] haskellPackages.gitit: Remove obsolete patch

---
 .../haskell-modules/configuration-common.nix           | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0c08f188d09..e54a745e2df6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1149,14 +1149,8 @@ self: super: {
   # $HOME, which we don't have in our build sandbox.
   cabal-install-parsers = dontCheck super.cabal-install-parsers;
 
-  # jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies.
-  # can both be removed at the next release (current is 0.13.0.0)
-  gitit = doJailbreak (appendPatch super.gitit
-    (pkgs.fetchpatch {
-      url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch";
-      sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1";
-      includes = [ "src/**" ];
-    }));
+  # 2021-08-18: Erroneously  claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.
+  gitit = doJailbreak super.gitit;
 
   # Test suite requires database
   persistent-mysql = dontCheck super.persistent-mysql;

From 1bf1a3556a74fdb8f2cb9afae3bcfaee04536062 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 10:22:35 +0200
Subject: [PATCH 11/20] haskellPackages.streamly-posix: jailbreak to fix tests

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e54a745e2df6..59e95dcc3d77 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1939,4 +1939,7 @@ EOT
   # ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
   ghc-api-compat = doJailbreak super.ghc-api-compat;
 
+  # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
+  streamly-posix = doJailbreak super.streamly-posix;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 0544ee558e31a39cf21ff0ef0547b119d4316625 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 11:34:15 +0200
Subject: [PATCH 12/20] haskellPackages.hls-pragmas-plugin: dontCheck on darwin

---
 pkgs/development/haskell-modules/configuration-darwin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 754f036b29d2..583ba2648b57 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -194,6 +194,7 @@ self: super: {
   hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
   hls-splice-plugin = dontCheck super.hls-splice-plugin;
   hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
+  hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
 
   # We are lacking pure pgrep at the moment for tests to work
   tmp-postgres = dontCheck super.tmp-postgres;

From 31b0b7f6541a82e7f4dbada55b81a08030496165 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 11:43:02 +0200
Subject: [PATCH 13/20] haskellPackages.hls-haddock-comments-plugin

---
 pkgs/development/haskell-modules/configuration-darwin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 583ba2648b57..f23abbd167dc 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -195,6 +195,7 @@ self: super: {
   hls-splice-plugin = dontCheck super.hls-splice-plugin;
   hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
   hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
+  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
 
   # We are lacking pure pgrep at the moment for tests to work
   tmp-postgres = dontCheck super.tmp-postgres;

From 5ebd941b75a8a680caaa5e014b7aced43643f47f Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 18 Aug 2021 18:48:18 +0200
Subject: [PATCH 14/20] haskellPackages: mark builds failing on hydra as broken

This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
---
 .../configuration-hackage2nix/broken.yaml     | 18 ++++++
 .../transitive-broken.yaml                    | 24 ++++++++
 .../haskell-modules/hackage-packages.nix      | 57 +++++++++++++++++++
 3 files changed, 99 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index e7b0aeb2224b..3a3033406e13 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -121,6 +121,7 @@ broken-packages:
   - alto
   - alure
   - amazon-emailer
+  - amazonka-contrib-rds-utils
   - amazonka-s3-streaming
   - amazon-products
   - amby
@@ -180,6 +181,7 @@ broken-packages:
   - argparser
   - arguedit
   - arion
+  - arith-encode
   - armada
   - arpa
   - arpack
@@ -467,6 +469,7 @@ broken-packages:
   - butter
   - buttplug-hs-core
   - bv-sized
+  - byline
   - bytable
   - bytearray-parsing
   - bytestring-arbitrary
@@ -793,12 +796,14 @@ broken-packages:
   - consul-haskell
   - Consumer
   - containers-benchmark
+  - containers-unicode-symbols
   - containers-verified
   - ContArrow
   - content-store
   - ContextAlgebra
   - context-free-grammar
   - context-stack
+  - contiguous
   - contiguous-checked
   - continue
   - Contract
@@ -2183,6 +2188,7 @@ broken-packages:
   - HOpenCV
   - hopfield
   - hops
+  - hoq
   - ho-rewriting
   - horizon
   - horname
@@ -2276,6 +2282,7 @@ broken-packages:
   - hsmodetweaks
   - Hsmtlib
   - hsmtpclient
+  - hsnock
   - hs-nombre-generator
   - hsns
   - hsnsq
@@ -2388,6 +2395,7 @@ broken-packages:
   - hunspell-hs
   - hup
   - hurriyet
+  - husky
   - hutton
   - huttons-razor
   - hVOIDP
@@ -2654,6 +2662,7 @@ broken-packages:
   - lagrangian
   - lambda2js
   - lambdaBase
+  - lambdabot-social-plugins
   - lambdabot-utils
   - lambda-bridge
   - lambda-canvas
@@ -3009,6 +3018,7 @@ broken-packages:
   - miku
   - milena
   - mime-directory
+  - miniforth
   - minilens
   - minilight
   - minions
@@ -3025,6 +3035,7 @@ broken-packages:
   - mit-3qvpPyAi6mH
   - mix-arrows
   - mixpanel-client
+  - mkcabal
   - mltool
   - ml-w
   - mm2
@@ -3663,6 +3674,7 @@ broken-packages:
   - polysemy
   - polysemy-zoo
   - polytypeable
+  - pomaps
   - pomohoro
   - ponder
   - pong-server
@@ -3831,6 +3843,7 @@ broken-packages:
   - quarantimer
   - qudb
   - quenya-verb
+  - questioner
   - QuickAnnotate
   - quickbooks
   - quickcheck-property-comb
@@ -3899,6 +3912,7 @@ broken-packages:
   - read-bounded
   - read-ctags
   - read-io
+  - readline-statevar
   - readme-lhs
   - readshp
   - really-simple-xml-parser
@@ -4248,6 +4262,7 @@ broken-packages:
   - shadower
   - shake-bindist
   - shakebook
+  - shake-cabal
   - shake-cabal-build
   - shake-dhall
   - shake-extras
@@ -4605,6 +4620,7 @@ broken-packages:
   - svndump
   - swagger-petstore
   - swagger-test
+  - swearjure
   - swf
   - swift-lda
   - swiss-ephemeris
@@ -4919,6 +4935,7 @@ broken-packages:
   - twilio
   - twine
   - twirp
+  - twitter
   - twitter-feed
   - tx
   - txtblk
@@ -5377,6 +5394,7 @@ broken-packages:
   - yi-solarized
   - yi-spolsky
   - yoda
+  - Yogurt
   - yst
   - yu-core
   - yu-tool
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 1c74de902d63..b0548975db78 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -370,6 +370,7 @@ dont-distribute-packages:
  - XSaiga
  - YACPong
  - Yablog
+ - Yogurt-Standalone
  - Z-Botan
  - Z-IO
  - Z-MessagePack
@@ -467,8 +468,10 @@ dont-distribute-packages:
  - atomic-primops-foreign
  - atp
  - attoparsec-enumerator
+ - attoparsec-ip
  - attoparsec-iteratee
  - attoparsec-text-enumerator
+ - attoparsec-uri
  - atuin
  - audiovisual
  - aura
@@ -626,6 +629,7 @@ dont-distribute-packages:
  - bv-sized-lens
  - bytehash
  - bytelog
+ - bytesmith
  - bytestring-read
  - c0check
  - cabal-bounds
@@ -708,7 +712,9 @@ dont-distribute-packages:
  - claferwiki
  - clash
  - clash-ghc
+ - clash-ghc_1_4_3
  - clash-lib
+ - clash-lib_1_4_3
  - clash-multisignal
  - clash-prelude-quickcheck
  - clash-systemverilog
@@ -790,6 +796,7 @@ dont-distribute-packages:
  - consumers
  - container
  - containers-accelerate
+ - contiguous-fft
  - continuum
  - continuum-client
  - control
@@ -1011,6 +1018,7 @@ dont-distribute-packages:
  - entangle
  - enumerate
  - enumerate-function
+ - enumeration
  - enumerator-fd
  - enumerator-tf
  - ephemeral
@@ -1732,6 +1740,7 @@ dont-distribute-packages:
  - intset
  - invertible-hlist
  - ion
+ - ip
  - ipatch
  - ipc
  - ipld-cid
@@ -1858,6 +1867,8 @@ dont-distribute-packages:
  - lambda-options
  - lambdaFeed
  - lambdaLit
+ - lambdabot
+ - lambdabot-xmpp
  - lambdabot-zulip
  - lambdacms-media
  - lambdacube
@@ -1885,6 +1896,7 @@ dont-distribute-packages:
  - lapack-carray
  - lapack-comfort-array
  - lapack-comfort-array_0_0_1
+ - lapack-hmatrix
  - lapack_0_4
  - lat
  - latex-formulae-hakyll
@@ -2038,6 +2050,7 @@ dont-distribute-packages:
  - markdown-pap
  - markdown2svg
  - markov-processes
+ - markup
  - marmalade-upload
  - marquise
  - marvin
@@ -2395,6 +2408,8 @@ dont-distribute-packages:
  - prednote-test
  - presto-hdbc
  - preview
+ - primitive-containers
+ - primitive-sort
  - primula-board
  - primula-bot
  - proc
@@ -2589,6 +2604,7 @@ dont-distribute-packages:
  - ribosome-root
  - ribosome-test
  - ridley-extras
+ - ring-buffers
  - rio-process-pool
  - riot
  - ripple
@@ -2662,6 +2678,7 @@ dont-distribute-packages:
  - scholdoc
  - scholdoc-citeproc
  - scholdoc-texmath
+ - scientific-notation
  - scion
  - scion-browser
  - scope
@@ -2722,6 +2739,7 @@ dont-distribute-packages:
  - sgf
  - sgrep
  - sha1
+ - shake-ats
  - shake-minify-css
  - shaker
  - shapefile
@@ -2760,6 +2778,7 @@ dont-distribute-packages:
  - smallstring
  - smartword
  - smcdel
+ - smith
  - smith-cli
  - smith-client
  - smtlib2-debug
@@ -3088,6 +3107,8 @@ dont-distribute-packages:
  - urembed
  - uri-enumerator
  - uri-enumerator-file
+ - url-bytes
+ - urlpath
  - usb
  - usb-enumerator
  - usb-hid
@@ -3099,6 +3120,7 @@ dont-distribute-packages:
  - uu-cco-examples
  - uu-cco-hut-parsing
  - uu-cco-uu-parsinglib
+ - uuid-bytes
  - uuid-crypto
  - uvector-algorithms
  - v4l2
@@ -3146,6 +3168,7 @@ dont-distribute-packages:
  - wai-middleware-cache
  - wai-middleware-cache-redis
  - wai-middleware-consul
+ - wai-middleware-content-type
  - wai-middleware-rollbar
  - wai-middleware-route
  - wai-session-tokyocabinet
@@ -3187,6 +3210,7 @@ dont-distribute-packages:
  - wrecker-ui
  - wright
  - writer-cps-full
+ - ws
  - wss-client
  - wtk-gtk
  - wu-wei
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 84cecb6bdb01..ea1da650ab68 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21957,6 +21957,8 @@ self: {
        ];
        description = "A MUD client library";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -21976,6 +21978,7 @@ self: {
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {inherit (pkgs) readline;};
 
   "Z-Botan" = callPackage
@@ -27941,6 +27944,8 @@ self: {
        ];
        description = "A Haskell equivalent of \"aws rds generate-db-auth-token\"";
        license = lib.licenses.mpl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazonka-core" = callPackage
@@ -32962,6 +32967,8 @@ self: {
        ];
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "arithmatic" = callPackage
@@ -35382,6 +35389,7 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -35518,6 +35526,7 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -47631,6 +47640,8 @@ self: {
        ];
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytable" = callPackage
@@ -47887,6 +47898,7 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring_0_11_1_0" = callPackage
@@ -63712,6 +63724,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "containers-verified" = callPackage
@@ -63902,6 +63916,8 @@ self: {
        ];
        description = "Unified interface for primitive arrays";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "contiguous-checked" = callPackage
@@ -63926,6 +63942,7 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "continue" = callPackage
@@ -85160,6 +85177,7 @@ self: {
        testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "enumerator" = callPackage
@@ -134227,6 +134245,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
        license = lib.licenses.gpl2Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hora" = callPackage
@@ -138854,6 +138874,8 @@ self: {
        ];
        description = "Nock 5K interpreter";
        license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsnoise" = callPackage
@@ -143578,6 +143600,8 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "hutton" = callPackage
@@ -150994,6 +151018,7 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ip-quoter" = callPackage
@@ -159048,6 +159073,7 @@ self: {
        ];
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -159211,6 +159237,8 @@ self: {
        ];
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -161213,6 +161241,7 @@ self: {
        ];
        description = "Conversion of objects between 'lapack' and 'hmatrix'";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "large-hashable" = callPackage
@@ -172648,6 +172677,7 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -177067,6 +177097,8 @@ self: {
        ];
        description = "Miniature FORTH-like interpreter";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "minilens" = callPackage
@@ -177918,6 +177950,8 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "ml-w" = callPackage
@@ -208364,6 +208398,8 @@ self: {
        ];
        description = "Maps and sets of partial orders";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "pomodoro" = callPackage
@@ -212076,6 +212112,7 @@ self: {
        ];
        description = "containers backed by arrays";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "primitive-convenience" = callPackage
@@ -212228,6 +212265,7 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "primitive-stablename" = callPackage
@@ -216929,6 +216967,8 @@ self: {
        ];
        description = "A package for prompting values from the command-line";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "queue" = callPackage
@@ -220718,6 +220758,8 @@ self: {
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "readme-lhs" = callPackage
@@ -227107,6 +227149,7 @@ self: {
        testHaskellDepends = [ base HUnit primitive QuickCheck ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "rings" = callPackage
@@ -232220,6 +232263,7 @@ self: {
        ];
        description = "Scientific notation intended for tokenization";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -239040,6 +239084,7 @@ self: {
        ];
        description = "Utilities for building ATS projects with shake";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "shake-bench" = callPackage
@@ -239101,6 +239146,8 @@ self: {
        ];
        description = "Shake library for use with cabal";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-cabal-build" = callPackage
@@ -244068,6 +244115,7 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "smith-cli" = callPackage
@@ -255938,6 +255986,8 @@ self: {
        ];
        description = "Clojure without alphanumerics";
        license = lib.licenses.lgpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "sweet-egison" = callPackage
@@ -271744,6 +271794,8 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -276919,6 +276971,7 @@ self: {
        ];
        description = "Memory efficient url type and parser";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "url-decoders" = callPackage
@@ -277039,6 +277092,7 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -277815,6 +277869,7 @@ self: {
        ];
        description = "UUID parsing using byteverse packages";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "uuid-crypto" = callPackage
@@ -282207,6 +282262,7 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -287206,6 +287262,7 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ws-chans" = callPackage

From b5c2212cdfceb727b072223e460eb7dcefbc4062 Mon Sep 17 00:00:00 2001
From: Jade <software@lfcode.ca>
Date: Thu, 19 Aug 2021 00:34:01 -0700
Subject: [PATCH 15/20] haskellPackages.oidc-client: mark unbroken and disable
 spec

Their spec tests OpenID Connect against google.com, which does not work.
---
 .../haskell-modules/configuration-hackage2nix/broken.yaml       | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix          | 1 +
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 3a3033406e13..94345e60295d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3341,7 +3341,6 @@ broken-packages:
   - OGL
   - ogmarkup
   - oi
-  - oidc-client
   - om-actor
   - omaketex
   - ombra
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 7a820af6b574..97a751a2e43c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -167,6 +167,7 @@ self: super: builtins.intersectAttrs super {
   mongoDB = dontCheck super.mongoDB;
   network-transport-tcp = dontCheck super.network-transport-tcp;
   network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
+  oidc-client = dontCheck super.oidc-client;            # the spec runs openid against google.com
   pipes-mongodb = dontCheck super.pipes-mongodb;        # http://hydra.cryp.to/build/926195/log/raw
   pixiv = dontCheck super.pixiv;
   raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ea1da650ab68..1d546f13d9a2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -192799,8 +192799,6 @@ self: {
        ];
        description = "OpenID Connect 1.0 library for RP";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "ois-input-manager" = callPackage

From af115b860978ca7eb9bbcb776e07bd67a7e8af39 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 17 Aug 2021 08:58:54 +0200
Subject: [PATCH 16/20] haskellPackages.graphql-engine: 2.0.5 -> 2.0.7

---
 .../haskell-modules/configuration-common.nix  | 17 ++++--
 .../haskell-modules/non-hackage-packages.nix  | 14 ++---
 .../patches/graphql-engine-mapkeys.patch      | 38 +++++++++---
 .../misc/haskell/hasura/ekg-core.nix          | 33 ++++++++++
 .../misc/haskell/hasura/ekg-json.nix          | 21 +++++++
 .../misc/haskell/hasura/graphql-engine.nix    | 60 +++++++++----------
 .../development/misc/haskell/hasura/update.sh | 20 ++++++-
 7 files changed, 148 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/development/misc/haskell/hasura/ekg-core.nix
 create mode 100644 pkgs/development/misc/haskell/hasura/ekg-json.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 59e95dcc3d77..e6104f1e18e7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1288,14 +1288,23 @@ self: super: {
   Spock-core = dontCheck super.Spock-core;
 
   # hasura packages need some extra care
-  graphql-engine = overrideCabal (super.graphql-engine.override {
+  graphql-engine = overrideCabal (super.graphql-engine.overrideScope (self: super: {
     immortal = self.immortal_0_2_2_1;
-  }) (drv: {
+    resource-pool = self.hasura-resource-pool;
+    ekg-core = self.hasura-ekg-core;
+    ekg-json = self.hasura-ekg-json;
+    hspec = dontCheck self.hspec_2_8_3;
+    hspec-core = dontCheck self.hspec-core_2_8_3;
+    hspec-discover = dontCheck super.hspec-discover_2_8_3;
+    tasty-hspec = self.tasty-hspec_1_2;
+  })) (drv: {
     patches = [ ./patches/graphql-engine-mapkeys.patch ];
     doHaddock = false;
-    version = "2.0.5";
+    version = "2.0.7";
   });
-  pg-client = overrideCabal super.pg-client (drv: {
+  pg-client = overrideCabal (super.pg-client.override {
+    resource-pool = self.hasura-resource-pool;
+  }) (drv: {
     librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
     # wants a running DB to check against
     doCheck = false;
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 48ee2ee3a474..4aead5d18800 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -28,17 +28,13 @@ self: super: {
 
   # hasura graphql-engine is not released to hackage.
   # https://github.com/hasura/graphql-engine/issues/7391
-  #
-  # pg-client and graphql-engine depend on a hasura fork of resource-pool
-  # which is provided by pool.nix
   ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {};
-  pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {
-    resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
-  };
+  pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {};
   graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {};
-  graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {
-    resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
-  };
+  graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {};
+  hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
+  hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {};
+  hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {};
 
   # 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
diff --git a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
index 5fcf408b2b0e..9035185dc2d5 100644
--- a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
+++ b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
@@ -1,13 +1,33 @@
 diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs
-index eaff0dfba..5047a0e9d 100644
+index eaff0dfba..9902cadd0 100644
 --- a/src-lib/Data/HashMap/Strict/Extended.hs
 +++ b/src-lib/Data/HashMap/Strict/Extended.hs
-@@ -17,7 +17,7 @@ import qualified Data.Align          as A
- import qualified Data.Foldable       as F
+@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended
+   , groupOnNE
+   , differenceOn
+   , lpadZip
+-  , mapKeys
+   , unionsWith
+   ) where
  
- import           Data.Function
--import           Data.HashMap.Strict as M
-+import           Data.HashMap.Strict as M hiding (mapKeys)
- import           Data.Hashable
- import           Data.List.NonEmpty  (NonEmpty (..))
- import           Data.These
+@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case
+   That    b -> Just (Nothing, b)
+   These a b -> Just (Just a,  b)
+ 
+--- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@.
+---
+--- The size of the result may be smaller if @f@ maps two or more distinct
+--- keys to the same new key.  In this case the value at the greatest of the
+--- original keys is retained.
+---
+--- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")])                        == fromList [(4, "b"), (6, "a")]
+--- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c"
+--- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c"
+---
+--- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys
+-mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a
+-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) []
+-
+ -- | The union of a list of maps, with a combining operation:
+ --   (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@).
+ --
diff --git a/pkgs/development/misc/haskell/hasura/ekg-core.nix b/pkgs/development/misc/haskell/hasura/ekg-core.nix
new file mode 100644
index 000000000000..5fa8a21aa4ec
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/ekg-core.nix
@@ -0,0 +1,33 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
+{ mkDerivation, async, atomic-primops, base, containers, criterion
+, fetchgit, generic-random, ghc-prim, hashable, hspec
+, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit
+, primitive, QuickCheck, smallcheck, text, unordered-containers
+}:
+mkDerivation {
+  pname = "ekg-core";
+  version = "0.1.1.7";
+  src = fetchgit {
+    url = "https://github.com/hasura/ekg-core.git";
+    sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys";
+    rev = "9fc8f94685c149a909b66bad4167455d8ae1002c";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [
+    atomic-primops base containers ghc-prim hashable inspection-testing
+    primitive text unordered-containers
+  ];
+  testHaskellDepends = [
+    async atomic-primops base containers generic-random ghc-prim
+    hashable hspec hspec-smallcheck HUnit inspection-testing
+    markdown-unlit primitive QuickCheck smallcheck text
+    unordered-containers
+  ];
+  testToolDepends = [ markdown-unlit ];
+  benchmarkHaskellDepends = [ base criterion ];
+  doHaddock = false;
+  homepage = "https://github.com/tibbe/ekg-core";
+  description = "Tracking of system metrics";
+  license = lib.licenses.bsd3;
+}
diff --git a/pkgs/development/misc/haskell/hasura/ekg-json.nix b/pkgs/development/misc/haskell/hasura/ekg-json.nix
new file mode 100644
index 000000000000..0225ee6e7832
--- /dev/null
+++ b/pkgs/development/misc/haskell/hasura/ekg-json.nix
@@ -0,0 +1,21 @@
+# This has been automatically generated by the script
+# ./update.sh.  This should not be changed by hand.
+{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text
+, unordered-containers, vector
+}:
+mkDerivation {
+  pname = "ekg-json";
+  version = "0.1.0.7";
+  src = fetchgit {
+    url = "https://github.com/hasura/ekg-json.git";
+    sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v";
+    rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13";
+    fetchSubmodules = true;
+  };
+  libraryHaskellDepends = [
+    aeson base ekg-core text unordered-containers vector
+  ];
+  homepage = "https://github.com/tibbe/ekg-json";
+  description = "JSON encoding of ekg metrics";
+  license = lib.licenses.bsd3;
+}
diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
index 285094874e99..d8faf1714510 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
@@ -6,32 +6,32 @@
 , bytestring, case-insensitive, ci-info, containers, cron
 , cryptonite, data-has, deepseq, dependent-map, dependent-sum
 , directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit
-, file-embed, filepath, generic-arbitrary, ghc-heap-view
-, graphql-parser, hashable, hashable-time, hspec, hspec-core
-, hspec-expectations, hspec-expectations-lifted, http-api-data
-, http-client, http-client-tls, http-conduit, http-types, immortal
+, file-embed, filepath, ghc-heap-view, graphql-parser, hashable
+, hashable-time, hspec, hspec-core, hspec-expectations
+, hspec-expectations-lifted, http-api-data, http-client
+, http-client-tls, http-conduit, http-types, immortal
 , insert-ordered-containers, jose, kan-extensions, lens, lens-aeson
 , lib, lifted-async, lifted-base, list-t, memory, mime-types
 , mmorph, monad-control, monad-loops, monad-validate, mtl, mustache
 , mysql, mysql-simple, natural-transformation, network, network-uri
 , odbc, optparse-applicative, pem, pg-client, postgresql-binary
-, postgresql-libpq, process, profunctors, psqueues, QuickCheck
-, quickcheck-instances, random, regex-tdfa, resource-pool, retry
-, safe, safe-exceptions, scientific, semialign, semigroups, semver
-, shakespeare, some, split, Spock-core, stm, stm-containers, tagged
-, template-haskell, text, text-builder, text-conversions, these
-, time, transformers, transformers-base, unix, unordered-containers
-, uri-encode, utf8-string, uuid, validation, vector
-, vector-instances, wai, warp, websockets, wreq, x509, x509-store
-, yaml, zlib
+, postgresql-libpq, pretty-simple, process, profunctors, psqueues
+, QuickCheck, quickcheck-instances, random, regex-tdfa
+, resource-pool, retry, safe, safe-exceptions, scientific
+, semialign, semigroups, semver, shakespeare, some, split
+, Spock-core, stm, stm-containers, tagged, template-haskell, text
+, text-builder, text-conversions, these, time, transformers
+, transformers-base, unix, unordered-containers, uri-encode
+, utf8-string, uuid, validation, vector, vector-instances, wai
+, warp, websockets, wreq, x509, x509-store, yaml, zlib
 }:
 mkDerivation {
   pname = "graphql-engine";
   version = "1.0.0";
   src = fetchgit {
     url = "https://github.com/hasura/graphql-engine.git";
-    sha256 = "0sw7jwj3ixr0nnh3i9yagiqjsvf83w79jd7ac9vdvm410jfjcnxf";
-    rev = "5990ca403bf6e7dd66081720c329e513f0624fb6";
+    sha256 = "04s8rczvm0l5dbh14g2vav2wbqb4fg51471fncqf36s59img14b7";
+    rev = "cf6f3edc1f6df7843dfb91be6dcb0fd7cc94d133";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
@@ -50,14 +50,14 @@ mkDerivation {
     memory mime-types mmorph monad-control monad-loops monad-validate
     mtl mustache mysql mysql-simple network network-uri odbc
     optparse-applicative pem pg-client postgresql-binary
-    postgresql-libpq process profunctors psqueues QuickCheck
-    quickcheck-instances random regex-tdfa resource-pool retry
-    safe-exceptions scientific semialign semigroups semver shakespeare
-    some split Spock-core stm stm-containers tagged template-haskell
-    text text-builder text-conversions these time transformers
-    transformers-base unix unordered-containers uri-encode utf8-string
-    uuid validation vector vector-instances wai warp websockets wreq
-    x509 x509-store yaml zlib
+    postgresql-libpq pretty-simple process profunctors psqueues
+    QuickCheck quickcheck-instances random regex-tdfa resource-pool
+    retry safe-exceptions scientific semialign semigroups semver
+    shakespeare some split Spock-core stm stm-containers tagged
+    template-haskell text text-builder text-conversions these time
+    transformers transformers-base unix unordered-containers uri-encode
+    utf8-string uuid validation vector vector-instances wai warp
+    websockets wreq x509 x509-store yaml zlib
   ];
   executableHaskellDepends = [
     base bytestring ekg-core kan-extensions pg-client text
@@ -65,13 +65,13 @@ mkDerivation {
   ];
   testHaskellDepends = [
     aeson base bytestring containers cron dependent-map dependent-sum
-    generic-arbitrary graphql-parser hspec hspec-core
-    hspec-expectations hspec-expectations-lifted http-client
-    http-client-tls http-types insert-ordered-containers jose
-    kan-extensions lens lifted-base mmorph monad-control mtl
-    natural-transformation network-uri optparse-applicative pg-client
-    process QuickCheck safe scientific split template-haskell text time
-    transformers-base unordered-containers vector
+    graphql-parser hspec hspec-core hspec-expectations
+    hspec-expectations-lifted http-client http-client-tls http-types
+    insert-ordered-containers jose kan-extensions lens lifted-base
+    mmorph monad-control mtl natural-transformation network-uri
+    optparse-applicative pg-client process QuickCheck safe scientific
+    split template-haskell text time transformers-base
+    unordered-containers vector
   ];
   doCheck = false;
   homepage = "https://www.hasura.io";
diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh
index 227d3229ebe3..c1744d5fdbfc 100755
--- a/pkgs/development/misc/haskell/hasura/update.sh
+++ b/pkgs/development/misc/haskell/hasura/update.sh
@@ -19,6 +19,8 @@ parser_derivation_file="${script_dir}/graphql-parser.nix"
 ciinfo_derivation_file="${script_dir}/ci-info.nix"
 pgclient_derivation_file="${script_dir}/pg-client.nix"
 pool_derivation_file="${script_dir}/pool.nix"
+ekgcore_derivation_file="${script_dir}/ekg-core.nix"
+ekgjson_derivation_file="${script_dir}/ekg-json.nix"
 
 # TODO: get current revision of graphql-engine in Nixpkgs.
 # old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")"
@@ -31,9 +33,7 @@ echo "Running cabal2nix and outputting to ${engine_derivation_file}..."
 echo "# This has been automatically generated by the script" > "$engine_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$engine_derivation_file"
 
-# 2.0.5 hardcoded for now, because 2.0.6 failed to build. should be removed when updating
-# cabal2nix --revision "$new_version" --subpath server --maintainer lassulus "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
-cabal2nix --revision "v2.0.5" --subpath server --maintainer lassulus --no-check "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
+cabal2nix --revision "$new_version" --subpath server --maintainer lassulus --no-check "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
 
 echo "Running cabal2nix and outputting to ${parser_derivation_file}..."
 
@@ -63,6 +63,20 @@ echo "# ./update.sh.  This should not be changed by hand." >> "$pool_derivation_
 
 cabal2nix "https://github.com/hasura/pool.git" >> "$pool_derivation_file"
 
+echo "Running cabal2nix and outputting to ${ekgcore_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$ekgcore_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$ekgcore_derivation_file"
+
+cabal2nix "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file"
+
+echo "Running cabal2nix and outputting to ${ekgjson_derivation_file}..."
+
+echo "# This has been automatically generated by the script" > "$ekgjson_derivation_file"
+echo "# ./update.sh.  This should not be changed by hand." >> "$ekgjson_derivation_file"
+
+cabal2nix "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file"
+
 echo "###################"
 echo "please update pkgs/servers/hasura/cli.nix vendorSha256"
 echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version"

From 6a84c24d5a7aec57f195996deb48a974e4108ef9 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 21 Aug 2021 17:43:35 +0200
Subject: [PATCH 17/20] haskellPackages.cabal2nix-unstable: 2021-07-29 ->
 2021-08-21

---
 .../haskell-modules/cabal2nix-unstable.nix    |  6 ++--
 .../haskell-modules/hackage-packages.nix      | 31 +++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index c8bb4591b3ae..0e8fc7c69cf9 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2021-07-29";
+  version = "unstable-2021-08-21";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz";
-    sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc";
+    url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz";
+    sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1d546f13d9a2..2125e9341f0a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -138745,7 +138745,7 @@ self: {
 
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
-     , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
+     , freetype, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
      , pretty, process, tiff, wmflite, zlib
      }:
      mkDerivation {
@@ -138759,18 +138759,16 @@ self: {
        librarySystemDepends = [
          bzip2 jasper libjpeg libpng tiff wmflite zlib
        ];
-       libraryPkgconfigDepends = [
-         freetype2 GraphicsMagick lcms libxml2
-       ];
+       libraryPkgconfigDepends = [ freetype GraphicsMagick lcms libxml2 ];
        description = "FFI bindings for the GraphicsMagick library";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
-         inherit (pkgs) jasper; inherit (pkgs) lcms; 
-         inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
-         inherit (pkgs) libxml2; tiff = null; wmflite = null; 
-         inherit (pkgs) zlib;};
+     }) {GraphicsMagick = null; inherit (pkgs) bzip2; 
+         inherit (pkgs) freetype; inherit (pkgs) jasper; 
+         inherit (pkgs) lcms; inherit (pkgs) libjpeg; 
+         inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; 
+         wmflite = null; inherit (pkgs) zlib;};
 
   "hsmisc" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec
@@ -181014,7 +181012,7 @@ self: {
   "monomer" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , bytestring-to-vector, c2hs, containers, data-default, directory
-     , exceptions, extra, formatting, GLEW, hspec, http-client, HUnit
+     , exceptions, extra, formatting, glew, hspec, http-client, HUnit
      , JuicyPixels, lens, mtl, nanovg, OpenGL, process, random, safe
      , scientific, sdl2, silently, stm, text, text-show, time
      , transformers, unordered-containers, vector, websockets, wreq
@@ -181032,7 +181030,7 @@ self: {
          lens mtl nanovg OpenGL process safe sdl2 stm text text-show time
          transformers unordered-containers vector wreq
        ];
-       librarySystemDepends = [ GLEW ];
+       librarySystemDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [
          aeson async attoparsec base bytestring bytestring-to-vector
@@ -181051,7 +181049,7 @@ self: {
        description = "A GUI library for writing native Haskell applications";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-     }) {GLEW = null;};
+     }) {inherit (pkgs) glew;};
 
   "monomorphic" = callPackage
     ({ mkDerivation, base }:
@@ -185844,9 +185842,8 @@ self: {
      }) {};
 
   "nanovg" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, freetype, GLEW
-     , glew, hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text
-     , vector
+    ({ mkDerivation, base, bytestring, c2hs, containers, freetype, glew
+     , hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "nanovg";
@@ -185855,7 +185852,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
-       librarySystemDepends = [ freetype GLEW libGL libGLU libX11 ];
+       librarySystemDepends = [ freetype glew libGL libGLU libX11 ];
        libraryPkgconfigDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
@@ -185863,7 +185860,7 @@ self: {
        license = lib.licenses.isc;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {GLEW = null; inherit (pkgs) freetype; inherit (pkgs) glew; 
+     }) {inherit (pkgs) freetype; inherit (pkgs) glew; 
          inherit (pkgs) libGL; inherit (pkgs) libGLU; 
          inherit (pkgs.xorg) libX11;};
 

From 13f70bfa7a1836c09b9e9de2e32b418bc91ceb99 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 21 Aug 2021 19:26:53 +0200
Subject: [PATCH 18/20] haskellPackages.tophat: remove now unnecessary override

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e6104f1e18e7..e39efa48b307 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1888,10 +1888,6 @@ EOT
   # https://github.com/google/proto-lens/issues/413
   proto-lens = doJailbreak super.proto-lens;
 
-  # Too strict bounds on profunctors
-  # https://github.com/jcranch/tophat/issues/1
-  tophat = doJailbreak super.tophat;
-
   # 2021-06-20: Outdated upper bounds
   # https://github.com/Porges/email-validate-hs/issues/58
   email-validate = doJailbreak super.email-validate;

From c091b809cac3f099d01c9d01d6031c8b180d4d9d Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sun, 22 Aug 2021 10:24:21 +0900
Subject: [PATCH 19/20] haskellPackages.hasura-ekg-core: unbreak by adding
 overrides

This also similarly fixes haskellPackages.hasura-ekg-core.
---
 .../haskell-modules/configuration-common.nix          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e39efa48b307..8f45269c3008 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1302,6 +1302,17 @@ self: super: {
     doHaddock = false;
     version = "2.0.7";
   });
+  hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
+    hspec = dontCheck self.hspec_2_8_3;
+    hspec-core = dontCheck self.hspec-core_2_8_3;
+    hspec-discover = dontCheck super.hspec-discover_2_8_3;
+  });
+  hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
+    ekg-core = self.hasura-ekg-core;
+    hspec = dontCheck self.hspec_2_8_3;
+    hspec-core = dontCheck self.hspec-core_2_8_3;
+    hspec-discover = dontCheck super.hspec-discover_2_8_3;
+  });
   pg-client = overrideCabal (super.pg-client.override {
     resource-pool = self.hasura-resource-pool;
   }) (drv: {

From d72da4088431070c917a13bea2ac0b31f06a4afa Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sun, 22 Aug 2021 10:25:09 +0900
Subject: [PATCH 20/20] hasura-graphql-engine: add lassulus as maintainer for
 all dependencies

---
 pkgs/development/misc/haskell/hasura/ci-info.nix     |  1 +
 pkgs/development/misc/haskell/hasura/ekg-core.nix    |  1 +
 pkgs/development/misc/haskell/hasura/ekg-json.nix    |  1 +
 .../misc/haskell/hasura/graphql-parser.nix           |  1 +
 pkgs/development/misc/haskell/hasura/pg-client.nix   |  1 +
 pkgs/development/misc/haskell/hasura/pool.nix        |  1 +
 pkgs/development/misc/haskell/hasura/update.sh       | 12 ++++++------
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/misc/haskell/hasura/ci-info.nix b/pkgs/development/misc/haskell/hasura/ci-info.nix
index ce16c9c17f0a..21b78ca76b34 100644
--- a/pkgs/development/misc/haskell/hasura/ci-info.nix
+++ b/pkgs/development/misc/haskell/hasura/ci-info.nix
@@ -21,4 +21,5 @@ mkDerivation {
   prePatch = "hpack";
   homepage = "https://github.com/hasura/ci-info-hs#readme";
   license = lib.licenses.mit;
+  maintainers = with lib.maintainers; [ lassulus ];
 }
diff --git a/pkgs/development/misc/haskell/hasura/ekg-core.nix b/pkgs/development/misc/haskell/hasura/ekg-core.nix
index 5fa8a21aa4ec..6a9b1157021e 100644
--- a/pkgs/development/misc/haskell/hasura/ekg-core.nix
+++ b/pkgs/development/misc/haskell/hasura/ekg-core.nix
@@ -30,4 +30,5 @@ mkDerivation {
   homepage = "https://github.com/tibbe/ekg-core";
   description = "Tracking of system metrics";
   license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lassulus ];
 }
diff --git a/pkgs/development/misc/haskell/hasura/ekg-json.nix b/pkgs/development/misc/haskell/hasura/ekg-json.nix
index 0225ee6e7832..e115e2c40b9d 100644
--- a/pkgs/development/misc/haskell/hasura/ekg-json.nix
+++ b/pkgs/development/misc/haskell/hasura/ekg-json.nix
@@ -18,4 +18,5 @@ mkDerivation {
   homepage = "https://github.com/tibbe/ekg-json";
   description = "JSON encoding of ekg metrics";
   license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lassulus ];
 }
diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
index f8cee5fe2c10..0033584a1593 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
@@ -29,4 +29,5 @@ mkDerivation {
   homepage = "https://github.com/hasura/graphql-parser-hs";
   description = "A native Haskell GraphQL parser";
   license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lassulus ];
 }
diff --git a/pkgs/development/misc/haskell/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client.nix
index 0f1d9a8cf943..d1eb5e156e6c 100644
--- a/pkgs/development/misc/haskell/hasura/pg-client.nix
+++ b/pkgs/development/misc/haskell/hasura/pg-client.nix
@@ -32,4 +32,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/hasura/platform";
   license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lassulus ];
 }
diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix
index 72127ad8d326..a12d61f0fe21 100644
--- a/pkgs/development/misc/haskell/hasura/pool.nix
+++ b/pkgs/development/misc/haskell/hasura/pool.nix
@@ -20,4 +20,5 @@ mkDerivation {
   homepage = "http://github.com/bos/pool";
   description = "A high-performance striped resource pooling implementation";
   license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ lassulus ];
 }
diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh
index c1744d5fdbfc..77a5d5fc6dea 100755
--- a/pkgs/development/misc/haskell/hasura/update.sh
+++ b/pkgs/development/misc/haskell/hasura/update.sh
@@ -40,42 +40,42 @@ echo "Running cabal2nix and outputting to ${parser_derivation_file}..."
 echo "# This has been automatically generated by the script" > "$parser_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$parser_derivation_file"
 
-cabal2nix "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file"
+cabal2nix --maintainer lassulus "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file"
 
 echo "Running cabal2nix and outputting to ${ciinfo_derivation_file}..."
 
 echo "# This has been automatically generated by the script" > "$ciinfo_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$ciinfo_derivation_file"
 
-cabal2nix "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file"
+cabal2nix --maintainer lassulus "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file"
 
 echo "Running cabal2nix and outputting to ${pgclient_derivation_file}..."
 
 echo "# This has been automatically generated by the script" > "$pgclient_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$pgclient_derivation_file"
 
-cabal2nix "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file"
+cabal2nix --maintainer lassulus "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file"
 
 echo "Running cabal2nix and outputting to ${pool_derivation_file}..."
 
 echo "# This has been automatically generated by the script" > "$pool_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$pool_derivation_file"
 
-cabal2nix "https://github.com/hasura/pool.git" >> "$pool_derivation_file"
+cabal2nix --maintainer lassulus "https://github.com/hasura/pool.git" >> "$pool_derivation_file"
 
 echo "Running cabal2nix and outputting to ${ekgcore_derivation_file}..."
 
 echo "# This has been automatically generated by the script" > "$ekgcore_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$ekgcore_derivation_file"
 
-cabal2nix "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file"
+cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file"
 
 echo "Running cabal2nix and outputting to ${ekgjson_derivation_file}..."
 
 echo "# This has been automatically generated by the script" > "$ekgjson_derivation_file"
 echo "# ./update.sh.  This should not be changed by hand." >> "$ekgjson_derivation_file"
 
-cabal2nix "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file"
+cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file"
 
 echo "###################"
 echo "please update pkgs/servers/hasura/cli.nix vendorSha256"